fmt-patch: Support --attach

[git.git] / builtin-log.c

diff --git a/builtin-log.c b/builtin-log.c
index 576703c..c8feb0f 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -11,6 +11,9 @@
 #include "log-tree.h"
 #include "builtin.h"
 
+/* this is in builtin-diff.c */
+void add_head(struct rev_info *revs);
+
 static int cmd_log_wc(int argc, const char **argv, char **envp,
                      struct rev_info *rev)
 {
@@ -20,6 +23,13 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
        rev->commit_format = CMIT_FMT_DEFAULT;
        rev->verbose_header = 1;
        argc = setup_revisions(argc, argv, rev, "HEAD");
+       if (rev->always_show_header) {
+               if (rev->diffopt.pickaxe || rev->diffopt.filter) {
+                       rev->always_show_header = 0;
+                       if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
+                               rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
+               }
+       }
 
        if (argc > 1)
                die("unrecognized argument: %s", argv[1]);
@@ -75,14 +85,23 @@ static int istitlechar(char c)
                (c >= '0' && c <= '9') || c == '.' || c == '_';
 }
 
-static void reopen_stdout(struct commit *commit, int nr)
+static FILE *realstdout = NULL;
+static char *output_directory = NULL;
+
+static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
 {
        char filename[1024];
        char *sol;
-       int len;
+       int len = 0;
 
+       if (output_directory) {
+               strncpy(filename, output_directory, 1010);
+               len = strlen(filename);
+               if (filename[len - 1] != '/')
+                       filename[len++] = '/';
+       }
 
-       sprintf(filename, "%04d", nr);
+       sprintf(filename + len, "%04d", nr);
        len = strlen(filename);
 
        sol = strstr(commit->buffer, "\n\n");
@@ -91,7 +110,7 @@ static void reopen_stdout(struct commit *commit, int nr)
 
                sol += 2;
                /* strip [PATCH] or [PATCH blabla] */
-               if (!strncmp(sol, "[PATCH", 6)) {
+               if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
                        char *eos = strchr(sol + 6, ']');
                        if (eos) {
                                while (isspace(*eos))
@@ -117,7 +136,7 @@ static void reopen_stdout(struct commit *commit, int nr)
                        len--;
        }
        strcpy(filename + len, ".txt");
-       fprintf(stderr, "%s\n", filename);
+       fprintf(realstdout, "%s\n", filename);
        freopen(filename, "w", stdout);
 }
 
@@ -126,8 +145,10 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        struct commit *commit;
        struct commit **list = NULL;
        struct rev_info rev;
-       int nr = 0, total;
+       int nr = 0, total, i, j;
        int use_stdout = 0;
+       int numbered = 0;
+       int keep_subject = 0;
 
        init_revisions(&rev);
        rev.commit_format = CMIT_FMT_EMAIL;
@@ -138,16 +159,54 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        rev.combine_merges = 0;
        rev.ignore_merges = 1;
        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
-       argc = setup_revisions(argc, argv, &rev, "HEAD");
 
-       while (argc > 1) {
-               if (!strcmp(argv[1], "--stdout"))
+       /*
+        * Parse the arguments before setup_revisions(), or something
+        * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
+        * possibly a valid SHA1.
+        */
+       for (i = 1, j = 1; i < argc; i++) {
+               if (!strcmp(argv[i], "--stdout"))
                        use_stdout = 1;
+               else if (!strcmp(argv[i], "-n") ||
+                               !strcmp(argv[i], "--numbered"))
+                       numbered = 1;
+               else if (!strcmp(argv[i], "-k") ||
+                               !strcmp(argv[i], "--keep-subject")) {
+                       keep_subject = 1;
+                       rev.total = -1;
+               } else if (!strcmp(argv[i], "-o")) {
+                       if (argc < 3)
+                               die ("Which directory?");
+                       if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
+                               die("Could not create directory %s",
+                                               argv[i + 1]);
+                       output_directory = strdup(argv[i + 1]);
+                       i++;
+               }
+               else if (!strcmp(argv[i], "--attach"))
+                       rev.mime_boundary = git_version_string;
+               else if (!strncmp(argv[i], "--attach=", 9))
+                       rev.mime_boundary = argv[i] + 9;
                else
-                       die ("unrecognized argument: %s", argv[1]);
-               argc--;
-               argv++;
+                       argv[j++] = argv[i];
        }
+       argc = j;
+
+       if (numbered && keep_subject < 0)
+               die ("-n and -k are mutually exclusive.");
+
+       argc = setup_revisions(argc, argv, &rev, "HEAD");
+       if (argc > 1)
+               die ("unrecognized argument: %s", argv[1]);
+
+       if (rev.pending_objects && rev.pending_objects->next == NULL) {
+               rev.pending_objects->item->flags |= UNINTERESTING;
+               add_head(&rev);
+       }
+
+       if (!use_stdout)
+               realstdout = fdopen(dup(1), "w");
 
        prepare_revision_walk(&rev);
        while ((commit = get_revision(&rev)) != NULL) {
@@ -159,19 +218,30 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
                list[nr - 1] = commit;
        }
        total = nr;
+       if (numbered)
+               rev.total = total;
        while (0 <= --nr) {
                int shown;
                commit = list[nr];
+               rev.nr = total - nr;
                if (!use_stdout)
-                       reopen_stdout(commit, total - nr);
+                       reopen_stdout(commit, rev.nr, keep_subject);
                shown = log_tree_commit(&rev, commit);
                free(commit->buffer);
                commit->buffer = NULL;
-               if (shown)
-                       printf("-- \n%s\n\n", git_version_string);
+               if (shown) {
+                       if (rev.mime_boundary)
+                               printf("\n--%s%s--\n\n\n",
+                                      mime_boundary_leader,
+                                      rev.mime_boundary);
+                       else
+                               printf("-- \n%s\n\n", git_version_string);
+               }
                if (!use_stdout)
                        fclose(stdout);
        }
+       if (output_directory)
+               free(output_directory);
        free(list);
        return 0;
 }