git.oblomov.eu Git - git/blob - builtin-log.c

   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 #include <time.h>
  14 #include <sys/time.h>
  15
  16 /* this is in builtin-diff.c */
  17 void add_head(struct rev_info *revs);
  18
  19 static void cmd_log_init(int argc, const char **argv, char **envp,
  20                       struct rev_info *rev)
  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->diffopt.pickaxe || rev->diffopt.filter)
  27                 rev->always_show_header = 0;
  28         if (argc > 1)
  29                 die("unrecognized argument: %s", argv[1]);
  30 }
  31
  32 static int cmd_log_walk(struct rev_info *rev)
  33 {
  34         struct commit *commit;
  35
  36         prepare_revision_walk(rev);
  37         setup_pager();
  38         while ((commit = get_revision(rev)) != NULL) {
  39                 log_tree_commit(rev, commit);
  40                 free(commit->buffer);
  41                 commit->buffer = NULL;
  42                 free_commit_list(commit->parents);
  43                 commit->parents = NULL;
  44         }
  45         return 0;
  46 }
  47
  48 int cmd_whatchanged(int argc, const char **argv, char **envp)
  49 {
  50         struct rev_info rev;
  51         const char *prefix = setup_git_directory();
  52
  53         git_config(git_diff_ui_config);
  54         init_revisions(&rev, prefix);
  55         rev.diff = 1;
  56         rev.diffopt.recursive = 1;
  57         rev.simplify_history = 0;
  58         cmd_log_init(argc, argv, envp, &rev);
  59         if (!rev.diffopt.output_format)
  60                 rev.diffopt.output_format = DIFF_FORMAT_RAW;
  61         return cmd_log_walk(&rev);
  62 }
  63
  64 int cmd_show(int argc, const char **argv, char **envp)
  65 {
  66         struct rev_info rev;
  67         const char *prefix = setup_git_directory();
  68
  69         git_config(git_diff_ui_config);
  70         init_revisions(&rev, prefix);
  71         rev.diff = 1;
  72         rev.diffopt.recursive = 1;
  73         rev.combine_merges = 1;
  74         rev.dense_combined_merges = 1;
  75         rev.always_show_header = 1;
  76         rev.ignore_merges = 0;
  77         rev.no_walk = 1;
  78         cmd_log_init(argc, argv, envp, &rev);
  79         return cmd_log_walk(&rev);
  80 }
  81
  82 int cmd_log(int argc, const char **argv, char **envp)
  83 {
  84         struct rev_info rev;
  85         const char *prefix = setup_git_directory();
  86
  87         git_config(git_diff_ui_config);
  88         init_revisions(&rev, prefix);
  89         rev.always_show_header = 1;
  90         cmd_log_init(argc, argv, envp, &rev);
  91         return cmd_log_walk(&rev);
  92 }
  93
  94 static int istitlechar(char c)
  95 {
  96         return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
  97                 (c >= '0' && c <= '9') || c == '.' || c == '_';
  98 }
  99
 100 static char *extra_headers = NULL;
 101 static int extra_headers_size = 0;
 102
 103 static int git_format_config(const char *var, const char *value)
 104 {
 105         if (!strcmp(var, "format.headers")) {
 106                 int len = strlen(value);
 107                 extra_headers_size += len + 1;
 108                 extra_headers = realloc(extra_headers, extra_headers_size);
 109                 extra_headers[extra_headers_size - len - 1] = 0;
 110                 strcat(extra_headers, value);
 111                 return 0;
 112         }
 113         if (!strcmp(var, "diff.color")) {
 114                 return 0;
 115         }
 116         return git_diff_ui_config(var, value);
 117 }
 118
 119
 120 static FILE *realstdout = NULL;
 121 static const char *output_directory = NULL;
 122
 123 static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
 124 {
 125         char filename[1024];
 126         char *sol;
 127         int len = 0;
 128
 129         if (output_directory) {
 130                 strlcpy(filename, output_directory, 1010);
 131                 len = strlen(filename);
 132                 if (filename[len - 1] != '/')
 133                         filename[len++] = '/';
 134         }
 135
 136         sprintf(filename + len, "%04d", nr);
 137         len = strlen(filename);
 138
 139         sol = strstr(commit->buffer, "\n\n");
 140         if (sol) {
 141                 int j, space = 1;
 142
 143                 sol += 2;
 144                 /* strip [PATCH] or [PATCH blabla] */
 145                 if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
 146                         char *eos = strchr(sol + 6, ']');
 147                         if (eos) {
 148                                 while (isspace(*eos))
 149                                         eos++;
 150                                 sol = eos;
 151                         }
 152                 }
 153
 154                 for (j = 0; len < 1024 - 6 && sol[j] && sol[j] != '\n'; j++) {
 155                         if (istitlechar(sol[j])) {
 156                                 if (space) {
 157                                         filename[len++] = '-';
 158                                         space = 0;
 159                                 }
 160                                 filename[len++] = sol[j];
 161                                 if (sol[j] == '.')
 162                                         while (sol[j + 1] == '.')
 163                                                 j++;
 164                         } else
 165                                 space = 1;
 166                 }
 167                 while (filename[len - 1] == '.' || filename[len - 1] == '-')
 168                         len--;
 169         }
 170         strcpy(filename + len, ".txt");
 171         fprintf(realstdout, "%s\n", filename);
 172         freopen(filename, "w", stdout);
 173 }
 174
 175 static int get_patch_id(struct commit *commit, struct diff_options *options,
 176                 unsigned char *sha1)
 177 {
 178         diff_tree_sha1(commit->parents->item->object.sha1, commit->object.sha1,
 179                         "", options);
 180         diffcore_std(options);
 181         return diff_flush_patch_id(options, sha1);
 182 }
 183
 184 static void get_patch_ids(struct rev_info *rev, struct diff_options *options)
 185 {
 186         struct rev_info check_rev;
 187         struct commit *commit;
 188         struct object *o1, *o2;
 189         unsigned flags1, flags2;
 190         unsigned char sha1[20];
 191         const char *prefix = setup_git_directory();
 192
 193         if (rev->pending.nr != 2)
 194                 die("Need exactly one range.");
 195
 196         o1 = rev->pending.objects[0].item;
 197         flags1 = o1->flags;
 198         o2 = rev->pending.objects[1].item;
 199         flags2 = o2->flags;
 200
 201         if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
 202                 die("Not a range.");
 203
 204         diff_setup(options);
 205         options->recursive = 1;
 206         if (diff_setup_done(options) < 0)
 207                 die("diff_setup_done failed");
 208
 209         /* given a range a..b get all patch ids for b..a */
 210         init_revisions(&check_rev, prefix);
 211         o1->flags ^= UNINTERESTING;
 212         o2->flags ^= UNINTERESTING;
 213         add_pending_object(&check_rev, o1, "o1");
 214         add_pending_object(&check_rev, o2, "o2");
 215         prepare_revision_walk(&check_rev);
 216
 217         while ((commit = get_revision(&check_rev)) != NULL) {
 218                 /* ignore merges */
 219                 if (commit->parents && commit->parents->next)
 220                         continue;
 221
 222                 if (!get_patch_id(commit, options, sha1))
 223                         created_object(sha1, xcalloc(1, sizeof(struct object)));
 224         }
 225
 226         /* reset for next revision walk */
 227         clear_commit_marks((struct commit *)o1,
 228                         SEEN | UNINTERESTING | SHOWN | ADDED);
 229         clear_commit_marks((struct commit *)o2,
 230                         SEEN | UNINTERESTING | SHOWN | ADDED);
 231         o1->flags = flags1;
 232         o2->flags = flags2;
 233 }
 234
 235 static void gen_message_id(char *dest, unsigned int length, char *base)
 236 {
 237         const char *committer = git_committer_info(1);
 238         const char *email_start = strrchr(committer, '<');
 239         const char *email_end = strrchr(committer, '>');
 240         if(!email_start || !email_end || email_start > email_end - 1)
 241                 die("Could not extract email from committer identity.");
 242         snprintf(dest, length, "%s.%lu.git.%.*s", base,
 243                  (unsigned long) time(NULL),
 244                  (int)(email_end - email_start - 1), email_start + 1);
 245 }
 246
 247 int cmd_format_patch(int argc, const char **argv, char **envp)
 248 {
 249         struct commit *commit;
 250         struct commit **list = NULL;
 251         struct rev_info rev;
 252         int nr = 0, total, i, j;
 253         int use_stdout = 0;
 254         int numbered = 0;
 255         int start_number = -1;
 256         int keep_subject = 0;
 257         int ignore_if_in_upstream = 0;
 258         int thread = 0;
 259         const char *in_reply_to = NULL;
 260         struct diff_options patch_id_opts;
 261         char *add_signoff = NULL;
 262         char message_id[1024];
 263         char ref_message_id[1024];
 264         const char *prefix = setup_git_directory();
 265
 266         git_config(git_format_config);
 267         init_revisions(&rev, prefix);
 268         rev.commit_format = CMIT_FMT_EMAIL;
 269         rev.verbose_header = 1;
 270         rev.diff = 1;
 271         rev.combine_merges = 0;
 272         rev.ignore_merges = 1;
 273         rev.diffopt.msg_sep = "";
 274         rev.diffopt.recursive = 1;
 275
 276         rev.extra_headers = extra_headers;
 277
 278         /*
 279          * Parse the arguments before setup_revisions(), or something
 280          * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
 281          * possibly a valid SHA1.
 282          */
 283         for (i = 1, j = 1; i < argc; i++) {
 284                 if (!strcmp(argv[i], "--stdout"))
 285                         use_stdout = 1;
 286                 else if (!strcmp(argv[i], "-n") ||
 287                                 !strcmp(argv[i], "--numbered"))
 288                         numbered = 1;
 289                 else if (!strncmp(argv[i], "--start-number=", 15))
 290                         start_number = strtol(argv[i] + 15, NULL, 10);
 291                 else if (!strcmp(argv[i], "--start-number")) {
 292                         i++;
 293                         if (i == argc)
 294                                 die("Need a number for --start-number");
 295                         start_number = strtol(argv[i], NULL, 10);
 296                 }
 297                 else if (!strcmp(argv[i], "-k") ||
 298                                 !strcmp(argv[i], "--keep-subject")) {
 299                         keep_subject = 1;
 300                         rev.total = -1;
 301                 }
 302                 else if (!strcmp(argv[i], "--output-directory") ||
 303                          !strcmp(argv[i], "-o")) {
 304                         i++;
 305                         if (argc <= i)
 306                                 die("Which directory?");
 307                         if (output_directory)
 308                                 die("Two output directories?");
 309                         output_directory = argv[i];
 310                 }
 311                 else if (!strcmp(argv[i], "--signoff") ||
 312                          !strcmp(argv[i], "-s")) {
 313                         const char *committer;
 314                         const char *endpos;
 315                         setup_ident();
 316                         committer = git_committer_info(1);
 317                         endpos = strchr(committer, '>');
 318                         if (!endpos)
 319                                 die("bogos committer info %s\n", committer);
 320                         add_signoff = xmalloc(endpos - committer + 2);
 321                         memcpy(add_signoff, committer, endpos - committer + 1);
 322                         add_signoff[endpos - committer + 1] = 0;
 323                 }
 324                 else if (!strcmp(argv[i], "--attach"))
 325                         rev.mime_boundary = git_version_string;
 326                 else if (!strncmp(argv[i], "--attach=", 9))
 327                         rev.mime_boundary = argv[i] + 9;
 328                 else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
 329                         ignore_if_in_upstream = 1;
 330                 else if (!strcmp(argv[i], "--thread"))
 331                         thread = 1;
 332                 else if (!strncmp(argv[i], "--in-reply-to=", 14))
 333                         in_reply_to = argv[i] + 14;
 334                 else if (!strcmp(argv[i], "--in-reply-to")) {
 335                         i++;
 336                         if (i == argc)
 337                                 die("Need a Message-Id for --in-reply-to");
 338                         in_reply_to = argv[i];
 339                 }
 340                 else
 341                         argv[j++] = argv[i];
 342         }
 343         argc = j;
 344
 345         if (start_number < 0)
 346                 start_number = 1;
 347         if (numbered && keep_subject)
 348                 die ("-n and -k are mutually exclusive.");
 349
 350         argc = setup_revisions(argc, argv, &rev, "HEAD");
 351         if (argc > 1)
 352                 die ("unrecognized argument: %s", argv[1]);
 353
 354         if (!rev.diffopt.output_format)
 355                 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
 356
 357         if (output_directory) {
 358                 if (use_stdout)
 359                         die("standard output, or directory, which one?");
 360                 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
 361                         die("Could not create directory %s",
 362                             output_directory);
 363         }
 364
 365         if (rev.pending.nr == 1) {
 366                 rev.pending.objects[0].item->flags |= UNINTERESTING;
 367                 add_head(&rev);
 368         }
 369
 370         if (ignore_if_in_upstream)
 371                 get_patch_ids(&rev, &patch_id_opts);
 372
 373         if (!use_stdout)
 374                 realstdout = fdopen(dup(1), "w");
 375
 376         prepare_revision_walk(&rev);
 377         while ((commit = get_revision(&rev)) != NULL) {
 378                 unsigned char sha1[20];
 379
 380                 /* ignore merges */
 381                 if (commit->parents && commit->parents->next)
 382                         continue;
 383
 384                 if (ignore_if_in_upstream &&
 385                                 !get_patch_id(commit, &patch_id_opts, sha1) &&
 386                                 lookup_object(sha1))
 387                         continue;
 388
 389                 nr++;
 390                 list = realloc(list, nr * sizeof(list[0]));
 391                 list[nr - 1] = commit;
 392         }
 393         total = nr;
 394         if (numbered)
 395                 rev.total = total + start_number - 1;
 396         rev.add_signoff = add_signoff;
 397         rev.ref_message_id = in_reply_to;
 398         while (0 <= --nr) {
 399                 int shown;
 400                 commit = list[nr];
 401                 rev.nr = total - nr + (start_number - 1);
 402                 /* Make the second and subsequent mails replies to the first */
 403                 if (thread) {
 404                         if (nr == (total - 2)) {
 405                                 strncpy(ref_message_id, message_id,
 406                                         sizeof(ref_message_id));
 407                                 ref_message_id[sizeof(ref_message_id)-1]='\0';
 408                                 rev.ref_message_id = ref_message_id;
 409                         }
 410                         gen_message_id(message_id, sizeof(message_id),
 411                                        sha1_to_hex(commit->object.sha1));
 412                         rev.message_id = message_id;
 413                 }
 414                 if (!use_stdout)
 415                         reopen_stdout(commit, rev.nr, keep_subject);
 416                 shown = log_tree_commit(&rev, commit);
 417                 free(commit->buffer);
 418                 commit->buffer = NULL;
 419
 420                 /* We put one extra blank line between formatted
 421                  * patches and this flag is used by log-tree code
 422                  * to see if it needs to emit a LF before showing
 423                  * the log; when using one file per patch, we do
 424                  * not want the extra blank line.
 425                  */
 426                 if (!use_stdout)
 427                         rev.shown_one = 0;
 428                 if (shown) {
 429                         if (rev.mime_boundary)
 430                                 printf("\n--%s%s--\n\n\n",
 431                                        mime_boundary_leader,
 432                                        rev.mime_boundary);
 433                         else
 434                                 printf("-- \n%s\n\n", git_version_string);
 435                 }
 436                 if (!use_stdout)
 437                         fclose(stdout);
 438         }
 439         free(list);
 440         return 0;
 441 }
 442