builtin-log.con commit Merge branch 'master' into next (15cee32)
   1/*
   2 * Builtin "git log" and related commands (show, whatchanged)
   3 *
   4 * (C) Copyright 2006 Linus Torvalds
   5 *               2006 Junio Hamano
   6 */
   7#include "cache.h"
   8#include "commit.h"
   9#include "diff.h"
  10#include "revision.h"
  11#include "log-tree.h"
  12#include "builtin.h"
  13
  14/* this is in builtin-diff.c */
  15void add_head(struct rev_info *revs);
  16
  17static int cmd_log_wc(int argc, const char **argv, char **envp,
  18                      struct rev_info *rev)
  19{
  20        struct commit *commit;
  21
  22        rev->abbrev = DEFAULT_ABBREV;
  23        rev->commit_format = CMIT_FMT_DEFAULT;
  24        rev->verbose_header = 1;
  25        argc = setup_revisions(argc, argv, rev, "HEAD");
  26        if (rev->always_show_header) {
  27                if (rev->diffopt.pickaxe || rev->diffopt.filter) {
  28                        rev->always_show_header = 0;
  29                        if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
  30                                rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
  31                }
  32        }
  33
  34        if (argc > 1)
  35                die("unrecognized argument: %s", argv[1]);
  36
  37        prepare_revision_walk(rev);
  38        setup_pager();
  39        while ((commit = get_revision(rev)) != NULL) {
  40                log_tree_commit(rev, commit);
  41                free(commit->buffer);
  42                commit->buffer = NULL;
  43        }
  44        return 0;
  45}
  46
  47int cmd_whatchanged(int argc, const char **argv, char **envp)
  48{
  49        struct rev_info rev;
  50
  51        init_revisions(&rev);
  52        rev.diff = 1;
  53        rev.diffopt.recursive = 1;
  54        return cmd_log_wc(argc, argv, envp, &rev);
  55}
  56
  57int cmd_show(int argc, const char **argv, char **envp)
  58{
  59        struct rev_info rev;
  60
  61        init_revisions(&rev);
  62        rev.diff = 1;
  63        rev.diffopt.recursive = 1;
  64        rev.combine_merges = 1;
  65        rev.dense_combined_merges = 1;
  66        rev.always_show_header = 1;
  67        rev.ignore_merges = 0;
  68        rev.no_walk = 1;
  69        return cmd_log_wc(argc, argv, envp, &rev);
  70}
  71
  72int cmd_log(int argc, const char **argv, char **envp)
  73{
  74        struct rev_info rev;
  75
  76        init_revisions(&rev);
  77        rev.always_show_header = 1;
  78        rev.diffopt.recursive = 1;
  79        return cmd_log_wc(argc, argv, envp, &rev);
  80}
  81
  82static int istitlechar(char c)
  83{
  84        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
  85                (c >= '0' && c <= '9') || c == '.' || c == '_';
  86}
  87
  88static FILE *realstdout = NULL;
  89static char *output_directory = NULL;
  90
  91static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
  92{
  93        char filename[1024];
  94        char *sol;
  95        int len = 0;
  96
  97        if (output_directory) {
  98                strncpy(filename, output_directory, 1010);
  99                len = strlen(filename);
 100                if (filename[len - 1] != '/')
 101                        filename[len++] = '/';
 102        }
 103
 104        sprintf(filename + len, "%04d", nr);
 105        len = strlen(filename);
 106
 107        sol = strstr(commit->buffer, "\n\n");
 108        if (sol) {
 109                int j, space = 1;
 110
 111                sol += 2;
 112                /* strip [PATCH] or [PATCH blabla] */
 113                if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
 114                        char *eos = strchr(sol + 6, ']');
 115                        if (eos) {
 116                                while (isspace(*eos))
 117                                        eos++;
 118                                sol = eos;
 119                        }
 120                }
 121
 122                for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
 123                        if (istitlechar(sol[j])) {
 124                                if (space) {
 125                                        filename[len++] = '-';
 126                                        space = 0;
 127                                }
 128                                filename[len++] = sol[j];
 129                                if (sol[j] == '.')
 130                                        while (sol[j + 1] == '.')
 131                                                j++;
 132                        } else
 133                                space = 1;
 134                }
 135                while (filename[len - 1] == '.' || filename[len - 1] == '-')
 136                        len--;
 137        }
 138        strcpy(filename + len, ".txt");
 139        fprintf(realstdout, "%s\n", filename);
 140        freopen(filename, "w", stdout);
 141}
 142
 143int cmd_format_patch(int argc, const char **argv, char **envp)
 144{
 145        struct commit *commit;
 146        struct commit **list = NULL;
 147        struct rev_info rev;
 148        int nr = 0, total, i, j;
 149        int use_stdout = 0;
 150        int numbered = 0;
 151        int start_number = -1;
 152        int keep_subject = 0;
 153
 154        init_revisions(&rev);
 155        rev.commit_format = CMIT_FMT_EMAIL;
 156        rev.verbose_header = 1;
 157        rev.diff = 1;
 158        rev.diffopt.with_raw = 0;
 159        rev.diffopt.with_stat = 1;
 160        rev.combine_merges = 0;
 161        rev.ignore_merges = 1;
 162        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 163
 164        /*
 165         * Parse the arguments before setup_revisions(), or something
 166         * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
 167         * possibly a valid SHA1.
 168         */
 169        for (i = 1, j = 1; i < argc; i++) {
 170                if (!strcmp(argv[i], "--stdout"))
 171                        use_stdout = 1;
 172                else if (!strcmp(argv[i], "-n") ||
 173                                !strcmp(argv[i], "--numbered"))
 174                        numbered = 1;
 175                else if (!strncmp(argv[i], "--start-number=", 15))
 176                        start_number = strtol(argv[i] + 15, NULL, 10);
 177                else if (!strcmp(argv[i], "--start-number")) {
 178                        i++;
 179                        if (i == argc)
 180                                die("Need a number for --start-number");
 181                        start_number = strtol(argv[i], NULL, 10);
 182                } else if (!strcmp(argv[i], "-k") ||
 183                                !strcmp(argv[i], "--keep-subject")) {
 184                        keep_subject = 1;
 185                        rev.total = -1;
 186                } else if (!strcmp(argv[i], "-o")) {
 187                        if (argc < 3)
 188                                die ("Which directory?");
 189                        if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
 190                                die("Could not create directory %s",
 191                                                argv[i + 1]);
 192                        output_directory = strdup(argv[i + 1]);
 193                        i++;
 194                }
 195                else if (!strcmp(argv[i], "--attach"))
 196                        rev.mime_boundary = git_version_string;
 197                else if (!strncmp(argv[i], "--attach=", 9))
 198                        rev.mime_boundary = argv[i] + 9;
 199                else
 200                        argv[j++] = argv[i];
 201        }
 202        argc = j;
 203
 204        if (start_number < 0)
 205                start_number = 1;
 206        if (numbered && keep_subject)
 207                die ("-n and -k are mutually exclusive.");
 208
 209        argc = setup_revisions(argc, argv, &rev, "HEAD");
 210        if (argc > 1)
 211                die ("unrecognized argument: %s", argv[1]);
 212
 213        if (rev.pending_objects && rev.pending_objects->next == NULL) {
 214                rev.pending_objects->item->flags |= UNINTERESTING;
 215                add_head(&rev);
 216        }
 217
 218        if (!use_stdout)
 219                realstdout = fdopen(dup(1), "w");
 220
 221        prepare_revision_walk(&rev);
 222        while ((commit = get_revision(&rev)) != NULL) {
 223                /* ignore merges */
 224                if (commit->parents && commit->parents->next)
 225                        continue;
 226                nr++;
 227                list = realloc(list, nr * sizeof(list[0]));
 228                list[nr - 1] = commit;
 229        }
 230        total = nr;
 231        if (numbered)
 232                rev.total = total + start_number - 1;
 233        while (0 <= --nr) {
 234                int shown;
 235                commit = list[nr];
 236                rev.nr = total - nr + (start_number - 1);
 237                if (!use_stdout)
 238                        reopen_stdout(commit, rev.nr, keep_subject);
 239                shown = log_tree_commit(&rev, commit);
 240                free(commit->buffer);
 241                commit->buffer = NULL;
 242
 243                /* We put one extra blank line between formatted
 244                 * patches and this flag is used by log-tree code
 245                 * to see if it needs to emit a LF before showing
 246                 * the log; when using one file per patch, we do
 247                 * not want the extra blank line.
 248                 */
 249                if (!use_stdout)
 250                        rev.shown_one = 0;
 251                if (shown) {
 252                        if (rev.mime_boundary)
 253                                printf("\n--%s%s--\n\n\n",
 254                                       mime_boundary_leader,
 255                                       rev.mime_boundary);
 256                        else
 257                                printf("-- \n%s\n\n", git_version_string);
 258                }
 259                if (!use_stdout)
 260                        fclose(stdout);
 261        }
 262        if (output_directory)
 263                free(output_directory);
 264        free(list);
 265        return 0;
 266}
 267