Andrew's git - gitweb.git/blob

   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 char *extra_headers = NULL;
  89static int extra_headers_size = 0;
  90
  91static int git_format_config(const char *var, const char *value)
  92{
  93        if (!strcmp(var, "format.headers")) {
  94                int len = strlen(value);
  95                extra_headers_size += len + 1;
  96                extra_headers = realloc(extra_headers, extra_headers_size);
  97                extra_headers[extra_headers_size - len - 1] = 0;
  98                strcat(extra_headers, value);
  99                return 0;
 100        }
 101        return git_default_config(var, value);
 102}
 103
 104
 105static FILE *realstdout = NULL;
 106static char *output_directory = NULL;
 107
 108static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
 109{
 110        char filename[1024];
 111        char *sol;
 112        int len = 0;
 113
 114        if (output_directory) {
 115                strncpy(filename, output_directory, 1010);
 116                len = strlen(filename);
 117                if (filename[len - 1] != '/')
 118                        filename[len++] = '/';
 119        }
 120
 121        sprintf(filename + len, "%04d", nr);
 122        len = strlen(filename);
 123
 124        sol = strstr(commit->buffer, "\n\n");
 125        if (sol) {
 126                int j, space = 1;
 127
 128                sol += 2;
 129                /* strip [PATCH] or [PATCH blabla] */
 130                if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
 131                        char *eos = strchr(sol + 6, ']');
 132                        if (eos) {
 133                                while (isspace(*eos))
 134                                        eos++;
 135                                sol = eos;
 136                        }
 137                }
 138
 139                for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
 140                        if (istitlechar(sol[j])) {
 141                                if (space) {
 142                                        filename[len++] = '-';
 143                                        space = 0;
 144                                }
 145                                filename[len++] = sol[j];
 146                                if (sol[j] == '.')
 147                                        while (sol[j + 1] == '.')
 148                                                j++;
 149                        } else
 150                                space = 1;
 151                }
 152                while (filename[len - 1] == '.' || filename[len - 1] == '-')
 153                        len--;
 154        }
 155        strcpy(filename + len, ".txt");
 156        fprintf(realstdout, "%s\n", filename);
 157        freopen(filename, "w", stdout);
 158}
 159
 160int cmd_format_patch(int argc, const char **argv, char **envp)
 161{
 162        struct commit *commit;
 163        struct commit **list = NULL;
 164        struct rev_info rev;
 165        int nr = 0, total, i, j;
 166        int use_stdout = 0;
 167        int numbered = 0;
 168        int start_number = -1;
 169        int keep_subject = 0;
 170        char *add_signoff = NULL;
 171
 172        init_revisions(&rev);
 173        rev.commit_format = CMIT_FMT_EMAIL;
 174        rev.verbose_header = 1;
 175        rev.diff = 1;
 176        rev.diffopt.with_raw = 0;
 177        rev.diffopt.with_stat = 1;
 178        rev.combine_merges = 0;
 179        rev.ignore_merges = 1;
 180        rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 181
 182        git_config(git_format_config);
 183        rev.extra_headers = extra_headers;
 184
 185        /*
 186         * Parse the arguments before setup_revisions(), or something
 187         * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
 188         * possibly a valid SHA1.
 189         */
 190        for (i = 1, j = 1; i < argc; i++) {
 191                if (!strcmp(argv[i], "--stdout"))
 192                        use_stdout = 1;
 193                else if (!strcmp(argv[i], "-n") ||
 194                                !strcmp(argv[i], "--numbered"))
 195                        numbered = 1;
 196                else if (!strncmp(argv[i], "--start-number=", 15))
 197                        start_number = strtol(argv[i] + 15, NULL, 10);
 198                else if (!strcmp(argv[i], "--start-number")) {
 199                        i++;
 200                        if (i == argc)
 201                                die("Need a number for --start-number");
 202                        start_number = strtol(argv[i], NULL, 10);
 203                }
 204                else if (!strcmp(argv[i], "-k") ||
 205                                !strcmp(argv[i], "--keep-subject")) {
 206                        keep_subject = 1;
 207                        rev.total = -1;
 208                }
 209                else if (!strcmp(argv[i], "-o")) {
 210                        if (argc < 3)
 211                                die ("Which directory?");
 212                        if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
 213                                die("Could not create directory %s",
 214                                                argv[i + 1]);
 215                        output_directory = strdup(argv[i + 1]);
 216                        i++;
 217                }
 218                else if (!strcmp(argv[i], "--signoff") ||
 219                         !strcmp(argv[i], "-s")) {
 220                        const char *committer = git_committer_info(1);
 221                        const char *endpos = strchr(committer, '>');
 222                        if (!endpos)
 223                                die("bogos committer info %s\n", committer);
 224                        add_signoff = xmalloc(endpos - committer + 2);
 225                        memcpy(add_signoff, committer, endpos - committer + 1);
 226                        add_signoff[endpos - committer + 1] = 0;
 227                }
 228                else if (!strcmp(argv[i], "--attach"))
 229                        rev.mime_boundary = git_version_string;
 230                else if (!strncmp(argv[i], "--attach=", 9))
 231                        rev.mime_boundary = argv[i] + 9;
 232                else
 233                        argv[j++] = argv[i];
 234        }
 235        argc = j;
 236
 237        if (start_number < 0)
 238                start_number = 1;
 239        if (numbered && keep_subject)
 240                die ("-n and -k are mutually exclusive.");
 241
 242        argc = setup_revisions(argc, argv, &rev, "HEAD");
 243        if (argc > 1)
 244                die ("unrecognized argument: %s", argv[1]);
 245
 246        if (rev.pending_objects && rev.pending_objects->next == NULL) {
 247                rev.pending_objects->item->flags |= UNINTERESTING;
 248                add_head(&rev);
 249        }
 250
 251        if (!use_stdout)
 252                realstdout = fdopen(dup(1), "w");
 253
 254        prepare_revision_walk(&rev);
 255        while ((commit = get_revision(&rev)) != NULL) {
 256                /* ignore merges */
 257                if (commit->parents && commit->parents->next)
 258                        continue;
 259                nr++;
 260                list = realloc(list, nr * sizeof(list[0]));
 261                list[nr - 1] = commit;
 262        }
 263        total = nr;
 264        if (numbered)
 265                rev.total = total + start_number - 1;
 266        rev.add_signoff = add_signoff;
 267        while (0 <= --nr) {
 268                int shown;
 269                commit = list[nr];
 270                rev.nr = total - nr + (start_number - 1);
 271                if (!use_stdout)
 272                        reopen_stdout(commit, rev.nr, keep_subject);
 273                shown = log_tree_commit(&rev, commit);
 274                free(commit->buffer);
 275                commit->buffer = NULL;
 276
 277                /* We put one extra blank line between formatted
 278                 * patches and this flag is used by log-tree code
 279                 * to see if it needs to emit a LF before showing
 280                 * the log; when using one file per patch, we do
 281                 * not want the extra blank line.
 282                 */
 283                if (!use_stdout)
 284                        rev.shown_one = 0;
 285                if (shown) {
 286                        if (rev.mime_boundary)
 287                                printf("\n--%s%s--\n\n\n",
 288                                       mime_boundary_leader,
 289                                       rev.mime_boundary);
 290                        else
 291                                printf("-- \n%s\n\n", git_version_string);
 292                }
 293                if (!use_stdout)
 294                        fclose(stdout);
 295        }
 296        if (output_directory)
 297                free(output_directory);
 298        free(list);
 299        return 0;
 300}
 301