2005-06-13 19:06:50 +02:00
|
|
|
/*
|
|
|
|
* rev-parse.c
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
|
|
|
#include "cache.h"
|
2005-06-21 05:28:09 +02:00
|
|
|
#include "commit.h"
|
2005-07-03 22:07:52 +02:00
|
|
|
#include "refs.h"
|
2005-09-20 23:13:24 +02:00
|
|
|
#include "quote.h"
|
2005-06-21 05:28:09 +02:00
|
|
|
|
2005-08-24 23:30:04 +02:00
|
|
|
#define DO_REVS 1
|
|
|
|
#define DO_NOREV 2
|
|
|
|
#define DO_FLAGS 4
|
|
|
|
#define DO_NONFLAGS 8
|
|
|
|
static int filter = ~0;
|
|
|
|
|
2005-06-24 19:12:55 +02:00
|
|
|
static char *def = NULL;
|
|
|
|
|
2005-06-26 20:34:30 +02:00
|
|
|
#define NORMAL 0
|
|
|
|
#define REVERSED 1
|
|
|
|
static int show_type = NORMAL;
|
2005-08-24 23:30:04 +02:00
|
|
|
static int symbolic = 0;
|
|
|
|
static int output_sq = 0;
|
|
|
|
|
|
|
|
static int revs_count = 0;
|
2005-06-26 20:34:30 +02:00
|
|
|
|
2005-06-13 20:14:20 +02:00
|
|
|
/*
|
|
|
|
* Some arguments are relevant "revision" arguments,
|
|
|
|
* others are about output format or other details.
|
|
|
|
* This sorts it all out.
|
|
|
|
*/
|
|
|
|
static int is_rev_argument(const char *arg)
|
|
|
|
{
|
|
|
|
static const char *rev_args[] = {
|
2005-08-24 23:30:04 +02:00
|
|
|
"--bisect",
|
|
|
|
"--header",
|
2005-06-13 20:14:20 +02:00
|
|
|
"--max-age=",
|
2005-08-24 23:30:04 +02:00
|
|
|
"--max-count=",
|
2005-06-13 20:14:20 +02:00
|
|
|
"--merge-order",
|
2005-08-24 23:30:04 +02:00
|
|
|
"--min-age=",
|
2005-08-09 04:31:37 +02:00
|
|
|
"--no-merges",
|
2005-08-24 23:30:04 +02:00
|
|
|
"--objects",
|
|
|
|
"--parents",
|
|
|
|
"--pretty",
|
|
|
|
"--show-breaks",
|
|
|
|
"--topo-order",
|
|
|
|
"--unpacked",
|
2005-06-13 20:14:20 +02:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
const char **p = rev_args;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
const char *str = *p++;
|
|
|
|
int len;
|
|
|
|
if (!str)
|
|
|
|
return 0;
|
|
|
|
len = strlen(str);
|
2005-08-24 23:30:04 +02:00
|
|
|
if (!strcmp(arg, str) ||
|
|
|
|
(str[len-1] == '=' && !strncmp(arg, str, len)))
|
2005-06-13 20:14:20 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-24 23:30:04 +02:00
|
|
|
/* Output argument as a string, either SQ or normal */
|
[PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF
The git-rev-parse command uses LF to separate each argument it
parses, so its users at least need to set IFS to LF to be able
to handle filenames with embedded SPs and TABs. Some commands,
however, can take and do expect arguments with embedded LF,
notably, "-S" (pickaxe) of diff family, so even this workaround
does not work for them.
When --sq flag to git-rev-parse is given, instead of showing one
argument per line, it outputs arguments quoted for consumption
with "eval" by the caller, to remedy this situation.
As an example, this patch converts git-whatchanged to use this
new feature.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-23 04:08:32 +02:00
|
|
|
static void show(const char *arg)
|
|
|
|
{
|
|
|
|
if (output_sq) {
|
|
|
|
int sq = '\'', ch;
|
|
|
|
|
|
|
|
putchar(sq);
|
|
|
|
while ((ch = *arg++)) {
|
|
|
|
if (ch == sq)
|
|
|
|
fputs("'\\'", stdout);
|
|
|
|
putchar(ch);
|
|
|
|
}
|
|
|
|
putchar(sq);
|
|
|
|
putchar(' ');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
puts(arg);
|
|
|
|
}
|
|
|
|
|
2005-08-24 23:30:04 +02:00
|
|
|
/* Output a revision, only if filter allows it */
|
2005-08-16 21:36:46 +02:00
|
|
|
static void show_rev(int type, const unsigned char *sha1, const char *name)
|
2005-06-24 19:12:55 +02:00
|
|
|
{
|
2005-08-24 23:30:04 +02:00
|
|
|
if (!(filter & DO_REVS))
|
2005-06-24 19:12:55 +02:00
|
|
|
return;
|
2005-08-24 23:30:04 +02:00
|
|
|
def = NULL;
|
|
|
|
revs_count++;
|
[PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF
The git-rev-parse command uses LF to separate each argument it
parses, so its users at least need to set IFS to LF to be able
to handle filenames with embedded SPs and TABs. Some commands,
however, can take and do expect arguments with embedded LF,
notably, "-S" (pickaxe) of diff family, so even this workaround
does not work for them.
When --sq flag to git-rev-parse is given, instead of showing one
argument per line, it outputs arguments quoted for consumption
with "eval" by the caller, to remedy this situation.
As an example, this patch converts git-whatchanged to use this
new feature.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-23 04:08:32 +02:00
|
|
|
|
2005-08-16 21:36:46 +02:00
|
|
|
if (type != show_type)
|
|
|
|
putchar('^');
|
|
|
|
if (symbolic && name)
|
|
|
|
show(name);
|
|
|
|
else
|
|
|
|
show(sha1_to_hex(sha1));
|
2005-06-24 19:12:55 +02:00
|
|
|
}
|
|
|
|
|
2005-08-24 23:30:04 +02:00
|
|
|
/* Output a flag, only if filter allows it. */
|
|
|
|
static void show_flag(char *arg)
|
2005-06-24 19:12:55 +02:00
|
|
|
{
|
2005-08-24 23:30:04 +02:00
|
|
|
if (!(filter & DO_FLAGS))
|
2005-06-24 19:12:55 +02:00
|
|
|
return;
|
2005-08-24 23:30:04 +02:00
|
|
|
if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
|
2005-08-23 19:47:54 +02:00
|
|
|
show(arg);
|
2005-06-24 19:12:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void show_default(void)
|
|
|
|
{
|
|
|
|
char *s = def;
|
|
|
|
|
|
|
|
if (s) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
def = NULL;
|
2005-08-04 07:15:49 +02:00
|
|
|
if (!get_sha1(s, sha1)) {
|
2005-08-16 21:36:46 +02:00
|
|
|
show_rev(NORMAL, sha1, s);
|
2005-06-24 19:12:55 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-07-03 22:07:52 +02:00
|
|
|
static int show_reference(const char *refname, const unsigned char *sha1)
|
|
|
|
{
|
2005-08-16 21:36:46 +02:00
|
|
|
show_rev(NORMAL, sha1, refname);
|
2005-07-03 22:07:52 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-09-20 23:13:24 +02:00
|
|
|
static void show_datestring(const char *flag, const char *datestr)
|
|
|
|
{
|
|
|
|
FILE *date;
|
|
|
|
static char buffer[100];
|
|
|
|
static char cmd[1000];
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* date handling requires both flags and revs */
|
|
|
|
if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
|
|
|
|
return;
|
|
|
|
len = strlen(flag);
|
|
|
|
memcpy(buffer, flag, len);
|
|
|
|
|
|
|
|
snprintf(cmd, sizeof(cmd), "date --date=%s +%%s", sq_quote(datestr));
|
|
|
|
date = popen(cmd, "r");
|
|
|
|
if (!date || !fgets(buffer + len, sizeof(buffer) - len, date))
|
|
|
|
die("git-rev-list: bad date string");
|
|
|
|
pclose(date);
|
|
|
|
len = strlen(buffer);
|
|
|
|
if (buffer[len-1] == '\n')
|
|
|
|
buffer[--len] = 0;
|
|
|
|
show(buffer);
|
|
|
|
}
|
|
|
|
|
2005-06-13 19:06:50 +02:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
2005-08-24 23:30:04 +02:00
|
|
|
int i, as_is = 0, verify = 0;
|
2005-06-13 19:06:50 +02:00
|
|
|
unsigned char sha1[20];
|
2005-08-17 03:06:34 +02:00
|
|
|
const char *prefix = setup_git_directory();
|
|
|
|
|
2005-06-13 19:06:50 +02:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
char *arg = argv[i];
|
|
|
|
char *dotdot;
|
|
|
|
|
|
|
|
if (as_is) {
|
2005-08-24 23:30:04 +02:00
|
|
|
show(arg);
|
2005-06-13 19:06:50 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (*arg == '-') {
|
|
|
|
if (!strcmp(arg, "--")) {
|
|
|
|
as_is = 1;
|
2005-08-24 23:30:04 +02:00
|
|
|
continue;
|
2005-06-13 19:06:50 +02:00
|
|
|
}
|
|
|
|
if (!strcmp(arg, "--default")) {
|
|
|
|
def = argv[i+1];
|
|
|
|
i++;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-13 19:21:11 +02:00
|
|
|
if (!strcmp(arg, "--revs-only")) {
|
2005-08-24 23:30:04 +02:00
|
|
|
filter &= ~DO_NOREV;
|
2005-06-13 19:21:11 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(arg, "--no-revs")) {
|
2005-08-24 23:30:04 +02:00
|
|
|
filter &= ~DO_REVS;
|
2005-06-13 19:21:11 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-07-06 19:08:08 +02:00
|
|
|
if (!strcmp(arg, "--flags")) {
|
2005-08-24 23:30:04 +02:00
|
|
|
filter &= ~DO_NONFLAGS;
|
2005-07-06 19:08:08 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(arg, "--no-flags")) {
|
2005-08-24 23:30:04 +02:00
|
|
|
filter &= ~DO_FLAGS;
|
2005-07-06 19:08:08 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-06-24 19:12:55 +02:00
|
|
|
if (!strcmp(arg, "--verify")) {
|
2005-08-24 23:30:04 +02:00
|
|
|
filter &= ~(DO_FLAGS|DO_NOREV);
|
|
|
|
verify = 1;
|
2005-06-24 19:12:55 +02:00
|
|
|
continue;
|
2005-06-13 20:14:20 +02:00
|
|
|
}
|
[PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF
The git-rev-parse command uses LF to separate each argument it
parses, so its users at least need to set IFS to LF to be able
to handle filenames with embedded SPs and TABs. Some commands,
however, can take and do expect arguments with embedded LF,
notably, "-S" (pickaxe) of diff family, so even this workaround
does not work for them.
When --sq flag to git-rev-parse is given, instead of showing one
argument per line, it outputs arguments quoted for consumption
with "eval" by the caller, to remedy this situation.
As an example, this patch converts git-whatchanged to use this
new feature.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-23 04:08:32 +02:00
|
|
|
if (!strcmp(arg, "--sq")) {
|
|
|
|
output_sq = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-26 20:34:30 +02:00
|
|
|
if (!strcmp(arg, "--not")) {
|
|
|
|
show_type ^= REVERSED;
|
|
|
|
continue;
|
|
|
|
}
|
2005-08-16 21:36:46 +02:00
|
|
|
if (!strcmp(arg, "--symbolic")) {
|
|
|
|
symbolic = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-03 22:07:52 +02:00
|
|
|
if (!strcmp(arg, "--all")) {
|
|
|
|
for_each_ref(show_reference);
|
|
|
|
continue;
|
|
|
|
}
|
2005-08-17 03:06:34 +02:00
|
|
|
if (!strcmp(arg, "--show-prefix")) {
|
2005-08-24 23:30:04 +02:00
|
|
|
if (prefix)
|
|
|
|
puts(prefix);
|
2005-08-17 03:06:34 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-09-18 20:18:30 +02:00
|
|
|
if (!strcmp(arg, "--git-dir")) {
|
|
|
|
const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
|
|
|
|
static char cwd[PATH_MAX];
|
|
|
|
if (gitdir) {
|
|
|
|
puts(gitdir);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!prefix) {
|
|
|
|
puts(".git");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!getcwd(cwd, PATH_MAX))
|
|
|
|
die("unable to get current working directory");
|
|
|
|
printf("%s/.git\n", cwd);
|
|
|
|
continue;
|
|
|
|
}
|
2005-09-20 23:13:24 +02:00
|
|
|
if (!strncmp(arg, "--since=", 8)) {
|
|
|
|
show_datestring("--max-age=", arg+8);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strncmp(arg, "--after=", 8)) {
|
|
|
|
show_datestring("--max-age=", arg+8);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strncmp(arg, "--before=", 9)) {
|
|
|
|
show_datestring("--min-age=", arg+9);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strncmp(arg, "--until=", 8)) {
|
|
|
|
show_datestring("--min-age=", arg+8);
|
|
|
|
continue;
|
|
|
|
}
|
2005-08-24 23:30:04 +02:00
|
|
|
if (verify)
|
|
|
|
die("Needed a single revision");
|
|
|
|
show_flag(arg);
|
2005-06-13 19:06:50 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-08-24 23:30:04 +02:00
|
|
|
|
|
|
|
/* Not a flag argument */
|
2005-06-13 19:06:50 +02:00
|
|
|
dotdot = strstr(arg, "..");
|
|
|
|
if (dotdot) {
|
|
|
|
unsigned char end[20];
|
|
|
|
char *n = dotdot+2;
|
|
|
|
*dotdot = 0;
|
2005-08-04 07:15:49 +02:00
|
|
|
if (!get_sha1(arg, sha1)) {
|
2005-06-13 19:06:50 +02:00
|
|
|
if (!*n)
|
|
|
|
n = "HEAD";
|
2005-08-04 07:15:49 +02:00
|
|
|
if (!get_sha1(n, end)) {
|
2005-08-16 21:36:46 +02:00
|
|
|
show_rev(NORMAL, end, n);
|
|
|
|
show_rev(REVERSED, sha1, arg);
|
2005-06-13 19:06:50 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*dotdot = '.';
|
|
|
|
}
|
2005-08-04 07:15:49 +02:00
|
|
|
if (!get_sha1(arg, sha1)) {
|
2005-08-16 21:36:46 +02:00
|
|
|
show_rev(NORMAL, sha1, arg);
|
2005-06-20 17:29:13 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-08-04 07:15:49 +02:00
|
|
|
if (*arg == '^' && !get_sha1(arg+1, sha1)) {
|
2005-08-16 21:36:46 +02:00
|
|
|
show_rev(REVERSED, sha1, arg+1);
|
2005-06-20 17:29:13 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-08-24 23:30:04 +02:00
|
|
|
if (verify)
|
|
|
|
die("Needed a single revision");
|
|
|
|
if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
|
|
|
|
(DO_NONFLAGS|DO_NOREV))
|
|
|
|
show(arg);
|
2005-06-24 19:12:55 +02:00
|
|
|
}
|
|
|
|
show_default();
|
2005-08-24 23:30:04 +02:00
|
|
|
if (verify && revs_count != 1)
|
|
|
|
die("Needed a single revision");
|
2005-06-13 19:06:50 +02:00
|
|
|
return 0;
|
|
|
|
}
|