X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=f1f5163447e98f1afb65137fd7cc9db7ff793b29;hb=90a734dc7f37a7bd1f3beec4d33acad559360f6c;hp=40707ac6ca7258878b47ed72074b3cf7364d3a56;hpb=218e441daf24b9c3be0f5ec423ace5185389ca61;p=git.git diff --git a/rev-parse.c b/rev-parse.c index 40707ac6..f1f51634 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -5,8 +5,22 @@ */ #include "cache.h" #include "commit.h" +#include "refs.h" -static int get_extended_sha1(char *name, unsigned char *sha1); +static char *def = NULL; +static int no_revs = 0; +static int single_rev = 0; +static int revs_only = 0; +static int do_rev_argument = 1; +static int output_revs = 0; +static int flags_only = 0; +static int no_flags = 0; +static int output_sq = 0; +static int symbolic = 0; + +#define NORMAL 0 +#define REVERSED 1 +static int show_type = NORMAL; /* * Some arguments are relevant "revision" arguments, @@ -20,6 +34,9 @@ static int is_rev_argument(const char *arg) "--max-age=", "--min-age=", "--merge-order", + "--topo-order", + "--bisect", + "--no-merges", NULL }; const char **p = rev_args; @@ -35,83 +52,108 @@ static int is_rev_argument(const char *arg) } } -static int get_parent(char *name, unsigned char *result, int idx) +static void show(const char *arg) { - unsigned char sha1[20]; - int ret = get_extended_sha1(name, sha1); - struct commit *commit; - struct commit_list *p; - - if (ret) - return ret; - commit = lookup_commit_reference(sha1); - if (!commit) - return -1; - if (parse_commit(commit)) - return -1; - p = commit->parents; - while (p) { - if (!--idx) { - memcpy(result, p->item->object.sha1, 20); - return 0; + if (output_sq) { + int sq = '\'', ch; + + putchar(sq); + while ((ch = *arg++)) { + if (ch == sq) + fputs("'\\'", stdout); + putchar(ch); } - p = p->next; + putchar(sq); + putchar(' '); } - return -1; + else + puts(arg); } -/* - * This is like "get_sha1()", except it allows "sha1 expressions", - * notably "xyz^" for "parent of xyz" - */ -static int get_extended_sha1(char *name, unsigned char *sha1) +static void show_rev(int type, const unsigned char *sha1, const char *name) { - int parent; - int len = strlen(name); + if (no_revs) + return; + output_revs++; - parent = 1; - if (len > 2 && name[len-1] >= '1' && name[len-1] <= '9') { - parent = name[len-1] - '0'; - len--; - } - if (len > 1 && name[len-1] == '^') { - int ret; - name[len-1] = 0; - ret = get_parent(name, sha1, parent); - name[len-1] = '^'; - if (!ret) - return 0; + if (type != show_type) + putchar('^'); + if (symbolic && name) + show(name); + else + show(sha1_to_hex(sha1)); +} + +static void show_rev_arg(char *rev) +{ + if (no_revs) + return; + show(rev); +} + +static void show_norev(char *norev) +{ + if (flags_only) + return; + if (revs_only) + return; + show(norev); +} + +static void show_arg(char *arg) +{ + if (no_flags) + return; + if (do_rev_argument && is_rev_argument(arg)) + show_rev_arg(arg); + else + show_norev(arg); +} + +static void show_default(void) +{ + char *s = def; + + if (s) { + unsigned char sha1[20]; + + def = NULL; + if (!get_sha1(s, sha1)) { + show_rev(NORMAL, sha1, s); + return; + } + show_arg(s); } - return get_sha1(name, sha1); +} + +static int show_reference(const char *refname, const unsigned char *sha1) +{ + show_rev(NORMAL, sha1, refname); + return 0; } int main(int argc, char **argv) { - int i, as_is = 0, revs_only = 0, no_revs = 0; - char *def = NULL; + int i, as_is = 0; unsigned char sha1[20]; - + const char *prefix = setup_git_directory(); + for (i = 1; i < argc; i++) { char *arg = argv[i]; char *dotdot; if (as_is) { - printf("%s\n", arg); + show_norev(arg); continue; } if (*arg == '-') { if (!strcmp(arg, "--")) { - if (def) { - printf("%s\n", def); - def = NULL; - } + show_default(); if (revs_only) break; as_is = 1; } if (!strcmp(arg, "--default")) { - if (def) - printf("%s\n", def); def = argv[i+1]; i++; continue; @@ -124,11 +166,41 @@ int main(int argc, char **argv) no_revs = 1; continue; } - if (revs_only | no_revs) { - if (is_rev_argument(arg) != revs_only) - continue; + if (!strcmp(arg, "--flags")) { + flags_only = 1; + continue; + } + if (!strcmp(arg, "--no-flags")) { + no_flags = 1; + continue; + } + if (!strcmp(arg, "--verify")) { + revs_only = 1; + do_rev_argument = 0; + single_rev = 1; + continue; + } + if (!strcmp(arg, "--sq")) { + output_sq = 1; + continue; + } + if (!strcmp(arg, "--not")) { + show_type ^= REVERSED; + continue; + } + if (!strcmp(arg, "--symbolic")) { + symbolic = 1; + continue; + } + if (!strcmp(arg, "--all")) { + for_each_ref(show_reference); + continue; } - printf("%s\n", arg); + if (!strcmp(arg, "--show-prefix")) { + puts(prefix); + continue; + } + show_arg(arg); continue; } dotdot = strstr(arg, ".."); @@ -136,43 +208,41 @@ int main(int argc, char **argv) unsigned char end[20]; char *n = dotdot+2; *dotdot = 0; - if (!get_extended_sha1(arg, sha1)) { + if (!get_sha1(arg, sha1)) { if (!*n) n = "HEAD"; - if (!get_extended_sha1(n, end)) { + if (!get_sha1(n, end)) { if (no_revs) continue; def = NULL; - printf("%s\n", sha1_to_hex(end)); - printf("^%s\n", sha1_to_hex(sha1)); + show_rev(NORMAL, end, n); + show_rev(REVERSED, sha1, arg); continue; } } *dotdot = '.'; } - if (!get_extended_sha1(arg, sha1)) { + if (!get_sha1(arg, sha1)) { if (no_revs) continue; def = NULL; - printf("%s\n", sha1_to_hex(sha1)); + show_rev(NORMAL, sha1, arg); continue; } - if (*arg == '^' && !get_extended_sha1(arg+1, sha1)) { + if (*arg == '^' && !get_sha1(arg+1, sha1)) { if (no_revs) continue; def = NULL; - printf("^%s\n", sha1_to_hex(sha1)); + show_rev(REVERSED, sha1, arg+1); continue; } - if (def) { - printf("%s\n", def); - def = NULL; - } - if (revs_only) - continue; - printf("%s\n", arg); + show_default(); + show_norev(arg); + } + show_default(); + if (single_rev && output_revs != 1) { + fprintf(stderr, "Needed a single revision\n"); + exit(1); } - if (def) - printf("%s\n", def); return 0; }