[PATCH] possible memory leak in diff.c::diff_free_filepair()

[git.git] / rev-parse.c

diff --git a/rev-parse.c b/rev-parse.c
index 1f4f324..f1f5163 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -4,6 +4,23 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "commit.h"
+#include "refs.h"
+
+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,
@@ -17,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;
@@ -32,33 +52,108 @@ static int is_rev_argument(const char *arg)
        }
 }
 
+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);
+}
+
+static void show_rev(int type, const unsigned char *sha1, const char *name)
+{
+       if (no_revs)
+               return;
+       output_revs++;
+
+       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);
+       }
+}
+
+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;
@@ -71,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;
                        }
-                       printf("%s\n", arg);
+                       if (!strcmp(arg, "--all")) {
+                               for_each_ref(show_reference);
+                               continue;
+                       }
+                       if (!strcmp(arg, "--show-prefix")) {
+                               puts(prefix);
+                               continue;
+                       }
+                       show_arg(arg);
                        continue;
                }
                dotdot = strstr(arg, "..");
@@ -90,8 +215,8 @@ int main(int argc, char **argv)
                                        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;
                                }
                        }
@@ -101,22 +226,23 @@ int main(int argc, char **argv)
                        if (no_revs)
                                continue;
                        def = NULL;
-                       printf("%s\n", sha1_to_hex(sha1));
+                       show_rev(NORMAL, sha1, arg);
                        continue;
                }
                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 (revs_only)
-                       continue;
-               def = NULL;
-               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;
 }