Documentation: fix missing links to git(7)
[gitweb.git] / rev-parse.c
index 1965e90a8a0c3fa25c2fccfcc82f5da395a093bc..bb4949ad70364abdf7c3bbca357e5ebc42880614 100644 (file)
@@ -6,20 +6,23 @@
 #include "cache.h"
 #include "commit.h"
 #include "refs.h"
+#include "quote.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;
-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;
 
 #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,
@@ -29,10 +32,22 @@ static int show_type = NORMAL;
 static int is_rev_argument(const char *arg)
 {
        static const char *rev_args[] = {
-               "--max-count=",
+               "--all",
+               "--bisect",
+               "--dense",
+               "--header",
                "--max-age=",
-               "--min-age=",
+               "--max-count=",
                "--merge-order",
+               "--min-age=",
+               "--no-merges",
+               "--objects",
+               "--parents",
+               "--pretty",
+               "--show-breaks",
+               "--sparse",
+               "--topo-order",
+               "--unpacked",
                NULL
        };
        const char **p = rev_args;
@@ -43,11 +58,13 @@ static int is_rev_argument(const char *arg)
                if (!str)
                        return 0;
                len = strlen(str);
-               if (!strncmp(arg, str, len))
+               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) {
@@ -66,43 +83,29 @@ static void show(const char *arg)
                puts(arg);
 }
 
-static void show_rev(int type, const unsigned char *sha1)
+/* Output a revision, only if filter allows it */
+static void show_rev(int type, const unsigned char *sha1, const char *name)
 {
-       if (no_revs)
+       if (!(filter & DO_REVS))
                return;
-       output_revs++;
-
-       /* Hexadecimal string plus possibly a carret;
-        * this does not have to be quoted even under output_sq.
-        */
-       printf("%s%s%c", type == show_type ? "" : "^", sha1_to_hex(sha1),
-              output_sq ? ' ' : '\n');
-}
-
-static void show_rev_arg(char *rev)
-{
-       if (no_revs)
-               return;
-       show(rev);
-}
+       def = NULL;
+       revs_count++;
 
-static void show_norev(char *norev)
-{
-       if (flags_only)
-               return;
-       if (revs_only)
-               return;
-       show(norev);
+       if (type != show_type)
+               putchar('^');
+       if (symbolic && name)
+               show(name);
+       else
+               show(sha1_to_hex(sha1));
 }
 
-static void show_arg(char *arg)
+/* Output a flag, only if filter allows it. */
+static void show_flag(char *arg)
 {
-       if (no_flags)
+       if (!(filter & DO_FLAGS))
                return;
-       if (do_rev_argument && is_rev_argument(arg))
-               show_rev_arg(arg);
-       else
-               show_norev(arg);
+       if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
+               show(arg);
 }
 
 static void show_default(void)
@@ -114,38 +117,57 @@ static void show_default(void)
 
                def = NULL;
                if (!get_sha1(s, sha1)) {
-                       show_rev(NORMAL, sha1);
+                       show_rev(NORMAL, sha1, s);
                        return;
                }
-               show_arg(s);
        }
 }
 
 static int show_reference(const char *refname, const unsigned char *sha1)
 {
-       show_rev(NORMAL, sha1);
+       show_rev(NORMAL, sha1, refname);
        return 0;
 }
 
+static void show_datestring(const char *flag, const char *datestr)
+{
+       static char buffer[100];
+
+       /* date handling requires both flags and revs */
+       if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
+               return;
+       snprintf(buffer, sizeof(buffer), "%s%lu", flag, approxidate(datestr));
+       show(buffer);
+}
+
+static void show_file(const char *arg)
+{
+       show_default();
+       if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+               show(arg);
+}
+
 int main(int argc, char **argv)
 {
-       int i, as_is = 0;
+       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) {
-                       show_norev(arg);
+                       show_file(arg);
                        continue;
                }
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
-                               show_default();
-                               if (revs_only)
-                                       break;
                                as_is = 1;
+                               /* Pass on the "--" if we show anything but files.. */
+                               if (filter & (DO_FLAGS | DO_REVS))
+                                       show_file(arg);
+                               continue;
                        }
                        if (!strcmp(arg, "--default")) {
                                def = argv[i+1];
@@ -153,25 +175,24 @@ int main(int argc, char **argv)
                                continue;
                        }
                        if (!strcmp(arg, "--revs-only")) {
-                               revs_only = 1;
+                               filter &= ~DO_NOREV;
                                continue;
                        }
                        if (!strcmp(arg, "--no-revs")) {
-                               no_revs = 1;
+                               filter &= ~DO_REVS;
                                continue;
                        }
                        if (!strcmp(arg, "--flags")) {
-                               flags_only = 1;
+                               filter &= ~DO_NONFLAGS;
                                continue;
                        }
                        if (!strcmp(arg, "--no-flags")) {
-                               no_flags = 1;
+                               filter &= ~DO_FLAGS;
                                continue;
                        }
                        if (!strcmp(arg, "--verify")) {
-                               revs_only = 1;
-                               do_rev_argument = 0;
-                               single_rev = 1;
+                               filter &= ~(DO_FLAGS|DO_NOREV);
+                               verify = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--sq")) {
@@ -182,13 +203,58 @@ int main(int argc, char **argv)
                                show_type ^= REVERSED;
                                continue;
                        }
+                       if (!strcmp(arg, "--symbolic")) {
+                               symbolic = 1;
+                               continue;
+                       }
                        if (!strcmp(arg, "--all")) {
                                for_each_ref(show_reference);
                                continue;
                        }
-                       show_arg(arg);
+                       if (!strcmp(arg, "--show-prefix")) {
+                               if (prefix)
+                                       puts(prefix);
+                               continue;
+                       }
+                       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;
+                       }
+                       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;
+                       }
+                       if (verify)
+                               die("Needed a single revision");
+                       show_flag(arg);
                        continue;
                }
+
+               /* Not a flag argument */
                dotdot = strstr(arg, "..");
                if (dotdot) {
                        unsigned char end[20];
@@ -198,37 +264,28 @@ int main(int argc, char **argv)
                                if (!*n)
                                        n = "HEAD";
                                if (!get_sha1(n, end)) {
-                                       if (no_revs)
-                                               continue;
-                                       def = NULL;
-                                       show_rev(NORMAL, end);
-                                       show_rev(REVERSED, sha1);
+                                       show_rev(NORMAL, end, n);
+                                       show_rev(REVERSED, sha1, arg);
                                        continue;
                                }
                        }
                        *dotdot = '.';
                }
                if (!get_sha1(arg, sha1)) {
-                       if (no_revs)
-                               continue;
-                       def = NULL;
-                       show_rev(NORMAL, sha1);
+                       show_rev(NORMAL, sha1, arg);
                        continue;
                }
                if (*arg == '^' && !get_sha1(arg+1, sha1)) {
-                       if (no_revs)
-                               continue;
-                       def = NULL;
-                       show_rev(REVERSED, sha1);
+                       show_rev(REVERSED, sha1, arg+1);
                        continue;
                }
-               show_default();
-               show_norev(arg);
+               if (verify)
+                       die("Needed a single revision");
+               as_is = 1;
+               show_file(arg);
        }
        show_default();
-       if (single_rev && output_revs != 1) {
-               fprintf(stderr, "Needed a single revision\n");
-               exit(1);
-       }
+       if (verify && revs_count != 1)
+               die("Needed a single revision");
        return 0;
 }