Merge refs/heads/master from .
[gitweb.git] / rev-parse.c
index 69749f5b783bfc35c91b8aa4a98ff7adac3714c1..6d723f902aaff806431d5e47916dadba7af18a37 100644 (file)
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "commit.h"
+#include "refs.h"
+
+#define DO_REVS                1
+#define DO_NOREV       2
+#define DO_FLAGS       4
+#define DO_NONFLAGS    8
+static int filter = ~0;
+
+static char *def = NULL;
+
+#define NORMAL 0
+#define REVERSED 1
+static int show_type = NORMAL;
+static int symbolic = 0;
+static int output_sq = 0;
+
+static int revs_count = 0;
+
+/*
+ * 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[] = {
+               "--bisect",
+               "--header",
+               "--max-age=",
+               "--max-count=",
+               "--merge-order",
+               "--min-age=",
+               "--no-merges",
+               "--objects",
+               "--parents",
+               "--pretty",
+               "--show-breaks",
+               "--topo-order",
+               "--unpacked",
+               NULL
+       };
+       const char **p = rev_args;
+
+       for (;;) {
+               const char *str = *p++;
+               int len;
+               if (!str)
+                       return 0;
+               len = strlen(str);
+               if (!strcmp(arg, str) ||
+                   (str[len-1] == '=' && !strncmp(arg, str, len)))
+                       return 1;
+       }
+}
+
+/* Output argument as a string, either SQ or normal */
+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);
+}
+
+/* Output a revision, only if filter allows it */
+static void show_rev(int type, const unsigned char *sha1, const char *name)
+{
+       if (!(filter & DO_REVS))
+               return;
+       def = NULL;
+       revs_count++;
+
+       if (type != show_type)
+               putchar('^');
+       if (symbolic && name)
+               show(name);
+       else
+               show(sha1_to_hex(sha1));
+}
+
+/* Output a flag, only if filter allows it. */
+static void show_flag(char *arg)
+{
+       if (!(filter & DO_FLAGS))
+               return;
+       if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
+               show(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;
+               }
+       }
+}
+
+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;
-       char *def = NULL;
+       int i, as_is = 0, verify = 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(arg);
                        continue;
                }
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
-                               if (def) {
-                                       printf("%s\n", def);
-                                       def = NULL;
-                               }
                                as_is = 1;
+                               continue;
                        }
                        if (!strcmp(arg, "--default")) {
-                               if (def)
-                                       printf("%s\n", def);
                                def = argv[i+1];
                                i++;
                                continue;
                        }
-                       printf("%s\n", arg);
-                       continue;
-               }
-               def = NULL;
-               if (!get_sha1(arg, sha1)) {
-                       printf("%s\n", sha1_to_hex(sha1));
-                       continue;
-               }
-               if (*arg == '^' && !get_sha1(arg+1, sha1)) {
-                       printf("^%s\n", sha1_to_hex(sha1));
+                       if (!strcmp(arg, "--revs-only")) {
+                               filter &= ~DO_NOREV;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--no-revs")) {
+                               filter &= ~DO_REVS;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--flags")) {
+                               filter &= ~DO_NONFLAGS;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--no-flags")) {
+                               filter &= ~DO_FLAGS;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--verify")) {
+                               filter &= ~(DO_FLAGS|DO_NOREV);
+                               verify = 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;
+                       }
+                       if (!strcmp(arg, "--show-prefix")) {
+                               if (prefix)
+                                       puts(prefix);
+                               continue;
+                       }
+                       if (verify)
+                               die("Needed a single revision");
+                       show_flag(arg);
                        continue;
                }
+
+               /* Not a flag argument */
                dotdot = strstr(arg, "..");
                if (dotdot) {
                        unsigned char end[20];
@@ -55,16 +207,29 @@ int main(int argc, char **argv)
                                if (!*n)
                                        n = "HEAD";
                                if (!get_sha1(n, end)) {
-                                       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 = '.';
                }
-               printf("%s\n", arg);
+               if (!get_sha1(arg, sha1)) {
+                       show_rev(NORMAL, sha1, arg);
+                       continue;
+               }
+               if (*arg == '^' && !get_sha1(arg+1, sha1)) {
+                       show_rev(REVERSED, sha1, arg+1);
+                       continue;
+               }
+               if (verify)
+                       die("Needed a single revision");
+               if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
+                   (DO_NONFLAGS|DO_NOREV))
+                       show(arg);
        }
-       if (def)
-               printf("%s\n", def);
+       show_default();
+       if (verify && revs_count != 1)
+               die("Needed a single revision");
        return 0;
 }