Add "git" and "git-log-script" helper scripts.

diff --git a/diff-tree.c b/diff-tree.c
index c41cdd0d2ee96e43ac8fe16374a0a7ad87be3913..db37aa714f0d0a7b0b2437ffb5b04351642f1e00 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,6 +1,7 @@
 #include <ctype.h>
 #include "cache.h"
 #include "diff.h"
+#include "commit.h"
 
 static int show_root_diff = 0;
 static int verbose_header = 0;
@@ -13,6 +14,9 @@ static int detect_rename = 0;
 static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = NULL;
 static const char *header = NULL;
 static const char *header_prefix = "";
 
@@ -260,10 +264,11 @@ static void call_diff_setup(void)
 
 static int call_diff_flush(void)
 {
-       if (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe);
+       diffcore_std(0,
+                    detect_rename, diff_score_opt,
+                    pickaxe, pickaxe_opts,
+                    diff_break_opt,
+                    orderfile);
        if (diff_queue_is_empty()) {
                diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
                return 0;
@@ -307,38 +312,6 @@ static int diff_root_tree(const unsigned char *new, const char *base)
        return retval;
 }
 
-static int get_one_line(const char *msg, unsigned long len)
-{
-       int ret = 0;
-
-       while (len--) {
-               ret++;
-               if (*msg++ == '\n')
-                       break;
-       }
-       return ret;
-}
-
-static int add_author_info(char *buf, const char *line, int len)
-{
-       char *date;
-       unsigned int namelen;
-       unsigned long time;
-       int tz;
-
-       line += strlen("author ");
-       date = strchr(line, '>');
-       if (!date)
-               return 0;
-       namelen = ++date - line;
-       time = strtoul(date, &date, 10);
-       tz = strtol(date, NULL, 10);
-
-       return sprintf(buf, "Author: %.*s\nDate:   %s\n",
-               namelen, line,
-               show_date(time, tz));
-}
-
 static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
 {
        static char this_header[16384];
@@ -346,44 +319,9 @@ static char *generate_header(const char *commit, const char *parent, const char
 
        offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
        if (verbose_header) {
-               int hdr = 1;
-
-               for (;;) {
-                       const char *line = msg;
-                       int linelen = get_one_line(msg, len);
-
-                       if (!linelen)
-                               break;
-
-                       /*
-                        * We want some slop for indentation and a possible
-                        * final "...". Thus the "+ 20".
-                        */
-                       if (offset + linelen + 20 > sizeof(this_header)) {
-                               memcpy(this_header + offset, "    ...\n", 8);
-                               offset += 8;
-                               break;
-                       }
-
-                       msg += linelen;
-                       len -= linelen;
-                       if (linelen == 1)
-                               hdr = 0;
-                       if (hdr) {
-                               if (!memcmp(line, "author ", 7))
-                                       offset += add_author_info(this_header + offset, line, linelen);
-                               continue;
-                       }
-                       memset(this_header + offset, ' ', 4);
-                       memcpy(this_header + offset + 4, line, linelen);
-                       offset += linelen + 4;
-               }
-               /* Make sure there is an EOLN */
-               if (this_header[offset-1] != '\n')
-                       this_header[offset++] = '\n';
-               /* Add _another_ EOLN if we are doing diff output */
+               offset += pretty_print_commit(msg, len, this_header + offset, sizeof(this_header) - offset);
                this_header[offset++] = '\n';
-               this_header[offset] = 0;
+               this_header[offset++] = 0;
        }
 
        return this_header;
@@ -509,6 +447,14 @@ int main(int argc, const char **argv)
                        pickaxe = arg + 2;
                        continue;
                }
+               if (!strncmp(arg, "-O", 2)) {
+                       orderfile = arg + 2;
+                       continue;
+               }
+               if (!strcmp(arg, "--pickaxe-all")) {
+                       pickaxe_opts = DIFF_PICKAXE_ALL;
+                       continue;
+               }
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
                        diff_score_opt = diff_scoreopt_parse(arg);
@@ -519,6 +465,10 @@ int main(int argc, const char **argv)
                        diff_score_opt = diff_scoreopt_parse(arg);
                        continue;
                }
+               if (!strncmp(arg, "-B", 2)) {
+                       diff_break_opt = diff_scoreopt_parse(arg);
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
                        diff_output_format = DIFF_FORMAT_MACHINE;
                        continue;
@@ -573,6 +523,9 @@ int main(int argc, const char **argv)
        if (!read_stdin)
                return 0;
 
+       if (detect_rename)
+               diff_setup_opt |= (DIFF_SETUP_USE_SIZE_CACHE |
+                                  DIFF_SETUP_USE_CACHE);
        while (fgets(line, sizeof(line), stdin))
                diff_tree_stdin(line);