4 * Copyright (c) 2006, Junio C Hamano
12 #include "tree-walk.h"
17 #include "xdiff-interface.h"
18 #include "cache-tree.h"
19 #include "string-list.h"
21 #include "parse-options.h"
25 static char blame_usage[] = "git blame [options] [rev-opts] [rev] [--] file";
27 static const char *blame_opt_usage[] = {
30 "[rev-opts] are documented in git-rev-list(1)",
34 static int longest_file;
35 static int longest_author;
36 static int max_orig_digits;
37 static int max_digits;
38 static int max_score_digits;
41 static int blank_boundary;
42 static int incremental;
44 static int abbrev = -1;
46 static enum date_mode blame_date_mode = DATE_ISO8601;
47 static size_t blame_date_width;
49 static struct string_list mailmap;
56 static int num_read_blob;
57 static int num_get_patch;
58 static int num_commits;
60 #define PICKAXE_BLAME_MOVE 01
61 #define PICKAXE_BLAME_COPY 02
62 #define PICKAXE_BLAME_COPY_HARDER 04
63 #define PICKAXE_BLAME_COPY_HARDEST 010
66 * blame for a blame_entry with score lower than these thresholds
67 * is not passed to the parent using move/copy logic.
69 static unsigned blame_move_score;
70 static unsigned blame_copy_score;
71 #define BLAME_DEFAULT_MOVE_SCORE 20
72 #define BLAME_DEFAULT_COPY_SCORE 40
74 /* bits #0..7 in revision.h, #8..11 used for merge_bases() in commit.c */
75 #define METAINFO_SHOWN (1u<<12)
76 #define MORE_THAN_ONE_PATH (1u<<13)
79 * One blob in a commit that is being suspected
83 struct origin *previous;
84 struct commit *commit;
86 unsigned char blob_sha1[20];
88 char path[FLEX_ARRAY];
91 static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b, long ctxlen,
92 xdl_emit_hunk_consume_func_t hunk_func, void *cb_data)
95 xdemitconf_t xecfg = {0};
96 xdemitcb_t ecb = {NULL};
99 xecfg.ctxlen = ctxlen;
100 xecfg.hunk_func = hunk_func;
102 return xdi_diff(file_a, file_b, &xpp, &xecfg, &ecb);
106 * Prepare diff_filespec and convert it using diff textconv API
107 * if the textconv driver exists.
108 * Return 1 if the conversion succeeds, 0 otherwise.
110 int textconv_object(const char *path,
112 const unsigned char *sha1,
114 unsigned long *buf_size)
116 struct diff_filespec *df;
117 struct userdiff_driver *textconv;
119 df = alloc_filespec(path);
120 fill_filespec(df, sha1, mode);
121 textconv = get_textconv(df);
127 *buf_size = fill_textconv(textconv, df, buf);
133 * Given an origin, prepare mmfile_t structure to be used by the
136 static void fill_origin_blob(struct diff_options *opt,
137 struct origin *o, mmfile_t *file)
140 enum object_type type;
141 unsigned long file_size;
144 if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
145 textconv_object(o->path, o->mode, o->blob_sha1, &file->ptr, &file_size))
148 file->ptr = read_sha1_file(o->blob_sha1, &type, &file_size);
149 file->size = file_size;
152 die("Cannot read blob %s for path %s",
153 sha1_to_hex(o->blob_sha1),
162 * Origin is refcounted and usually we keep the blob contents to be
165 static inline struct origin *origin_incref(struct origin *o)
172 static void origin_decref(struct origin *o)
174 if (o && --o->refcnt <= 0) {
176 origin_decref(o->previous);
182 static void drop_origin_blob(struct origin *o)
191 * Each group of lines is described by a blame_entry; it can be split
192 * as we pass blame to the parents. They form a linked list in the
193 * scoreboard structure, sorted by the target line number.
196 struct blame_entry *prev;
197 struct blame_entry *next;
199 /* the first line of this group in the final image;
200 * internally all line numbers are 0 based.
204 /* how many lines this group has */
207 /* the commit that introduced this group into the final image */
208 struct origin *suspect;
210 /* true if the suspect is truly guilty; false while we have not
211 * checked if the group came from one of its parents.
215 /* true if the entry has been scanned for copies in the current parent
219 /* the line number of the first line of this group in the
220 * suspect's file; internally all line numbers are 0 based.
224 /* how significant this entry is -- cached to avoid
225 * scanning the lines over and over.
231 * The current state of the blame assignment.
234 /* the final commit (i.e. where we started digging from) */
235 struct commit *final;
236 struct rev_info *revs;
240 * The contents in the final image.
241 * Used by many functions to obtain contents of the nth line,
242 * indexed with scoreboard.lineno[blame_entry.lno].
244 const char *final_buf;
245 unsigned long final_buf_size;
247 /* linked list of blames */
248 struct blame_entry *ent;
250 /* look-up a line in the final buffer */
255 static inline int same_suspect(struct origin *a, struct origin *b)
259 if (a->commit != b->commit)
261 return !strcmp(a->path, b->path);
264 static void sanity_check_refcnt(struct scoreboard *);
267 * If two blame entries that are next to each other came from
268 * contiguous lines in the same origin (i.e. <commit, path> pair),
269 * merge them together.
271 static void coalesce(struct scoreboard *sb)
273 struct blame_entry *ent, *next;
275 for (ent = sb->ent; ent && (next = ent->next); ent = next) {
276 if (same_suspect(ent->suspect, next->suspect) &&
277 ent->guilty == next->guilty &&
278 ent->s_lno + ent->num_lines == next->s_lno) {
279 ent->num_lines += next->num_lines;
280 ent->next = next->next;
282 ent->next->prev = ent;
283 origin_decref(next->suspect);
286 next = ent; /* again */
290 if (DEBUG) /* sanity */
291 sanity_check_refcnt(sb);
295 * Given a commit and a path in it, create a new origin structure.
296 * The callers that add blame to the scoreboard should use
297 * get_origin() to obtain shared, refcounted copy instead of calling
298 * this function directly.
300 static struct origin *make_origin(struct commit *commit, const char *path)
303 o = xcalloc(1, sizeof(*o) + strlen(path) + 1);
306 strcpy(o->path, path);
311 * Locate an existing origin or create a new one.
313 static struct origin *get_origin(struct scoreboard *sb,
314 struct commit *commit,
317 struct blame_entry *e;
319 for (e = sb->ent; e; e = e->next) {
320 if (e->suspect->commit == commit &&
321 !strcmp(e->suspect->path, path))
322 return origin_incref(e->suspect);
324 return make_origin(commit, path);
328 * Fill the blob_sha1 field of an origin if it hasn't, so that later
329 * call to fill_origin_blob() can use it to locate the data. blob_sha1
330 * for an origin is also used to pass the blame for the entire file to
331 * the parent to detect the case where a child's blob is identical to
332 * that of its parent's.
334 * This also fills origin->mode for corresponding tree path.
336 static int fill_blob_sha1_and_mode(struct origin *origin)
338 if (!is_null_sha1(origin->blob_sha1))
340 if (get_tree_entry(origin->commit->object.sha1,
342 origin->blob_sha1, &origin->mode))
344 if (sha1_object_info(origin->blob_sha1, NULL) != OBJ_BLOB)
348 hashclr(origin->blob_sha1);
349 origin->mode = S_IFINVALID;
354 * We have an origin -- check if the same path exists in the
355 * parent and return an origin structure to represent it.
357 static struct origin *find_origin(struct scoreboard *sb,
358 struct commit *parent,
359 struct origin *origin)
361 struct origin *porigin = NULL;
362 struct diff_options diff_opts;
363 const char *paths[2];
367 * Each commit object can cache one origin in that
368 * commit. This is a freestanding copy of origin and
371 struct origin *cached = parent->util;
372 if (!strcmp(cached->path, origin->path)) {
374 * The same path between origin and its parent
375 * without renaming -- the most common case.
377 porigin = get_origin(sb, parent, cached->path);
380 * If the origin was newly created (i.e. get_origin
381 * would call make_origin if none is found in the
382 * scoreboard), it does not know the blob_sha1/mode,
383 * so copy it. Otherwise porigin was in the
384 * scoreboard and already knows blob_sha1/mode.
386 if (porigin->refcnt == 1) {
387 hashcpy(porigin->blob_sha1, cached->blob_sha1);
388 porigin->mode = cached->mode;
392 /* otherwise it was not very useful; free it */
397 /* See if the origin->path is different between parent
398 * and origin first. Most of the time they are the
399 * same and diff-tree is fairly efficient about this.
401 diff_setup(&diff_opts);
402 DIFF_OPT_SET(&diff_opts, RECURSIVE);
403 diff_opts.detect_rename = 0;
404 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
405 paths[0] = origin->path;
408 diff_tree_setup_paths(paths, &diff_opts);
409 diff_setup_done(&diff_opts);
411 if (is_null_sha1(origin->commit->object.sha1))
412 do_diff_cache(parent->tree->object.sha1, &diff_opts);
414 diff_tree_sha1(parent->tree->object.sha1,
415 origin->commit->tree->object.sha1,
417 diffcore_std(&diff_opts);
419 if (!diff_queued_diff.nr) {
420 /* The path is the same as parent */
421 porigin = get_origin(sb, parent, origin->path);
422 hashcpy(porigin->blob_sha1, origin->blob_sha1);
423 porigin->mode = origin->mode;
426 * Since origin->path is a pathspec, if the parent
427 * commit had it as a directory, we will see a whole
428 * bunch of deletion of files in the directory that we
432 struct diff_filepair *p = NULL;
433 for (i = 0; i < diff_queued_diff.nr; i++) {
435 p = diff_queued_diff.queue[i];
436 name = p->one->path ? p->one->path : p->two->path;
437 if (!strcmp(name, origin->path))
441 die("internal error in blame::find_origin");
444 die("internal error in blame::find_origin (%c)",
447 porigin = get_origin(sb, parent, origin->path);
448 hashcpy(porigin->blob_sha1, p->one->sha1);
449 porigin->mode = p->one->mode;
453 /* Did not exist in parent, or type changed */
457 diff_flush(&diff_opts);
458 diff_tree_release_paths(&diff_opts);
461 * Create a freestanding copy that is not part of
462 * the refcounted origin found in the scoreboard, and
463 * cache it in the commit.
465 struct origin *cached;
467 cached = make_origin(porigin->commit, porigin->path);
468 hashcpy(cached->blob_sha1, porigin->blob_sha1);
469 cached->mode = porigin->mode;
470 parent->util = cached;
476 * We have an origin -- find the path that corresponds to it in its
477 * parent and return an origin structure to represent it.
479 static struct origin *find_rename(struct scoreboard *sb,
480 struct commit *parent,
481 struct origin *origin)
483 struct origin *porigin = NULL;
484 struct diff_options diff_opts;
486 const char *paths[2];
488 diff_setup(&diff_opts);
489 DIFF_OPT_SET(&diff_opts, RECURSIVE);
490 diff_opts.detect_rename = DIFF_DETECT_RENAME;
491 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
492 diff_opts.single_follow = origin->path;
494 diff_tree_setup_paths(paths, &diff_opts);
495 diff_setup_done(&diff_opts);
497 if (is_null_sha1(origin->commit->object.sha1))
498 do_diff_cache(parent->tree->object.sha1, &diff_opts);
500 diff_tree_sha1(parent->tree->object.sha1,
501 origin->commit->tree->object.sha1,
503 diffcore_std(&diff_opts);
505 for (i = 0; i < diff_queued_diff.nr; i++) {
506 struct diff_filepair *p = diff_queued_diff.queue[i];
507 if ((p->status == 'R' || p->status == 'C') &&
508 !strcmp(p->two->path, origin->path)) {
509 porigin = get_origin(sb, parent, p->one->path);
510 hashcpy(porigin->blob_sha1, p->one->sha1);
511 porigin->mode = p->one->mode;
515 diff_flush(&diff_opts);
516 diff_tree_release_paths(&diff_opts);
521 * Link in a new blame entry to the scoreboard. Entries that cover the
522 * same line range have been removed from the scoreboard previously.
524 static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
526 struct blame_entry *ent, *prev = NULL;
528 origin_incref(e->suspect);
530 for (ent = sb->ent; ent && ent->lno < e->lno; ent = ent->next)
533 /* prev, if not NULL, is the last one that is below e */
536 e->next = prev->next;
548 * src typically is on-stack; we want to copy the information in it to
549 * a malloced blame_entry that is already on the linked list of the
550 * scoreboard. The origin of dst loses a refcnt while the origin of src
553 static void dup_entry(struct blame_entry *dst, struct blame_entry *src)
555 struct blame_entry *p, *n;
559 origin_incref(src->suspect);
560 origin_decref(dst->suspect);
561 memcpy(dst, src, sizeof(*src));
567 static const char *nth_line(struct scoreboard *sb, int lno)
569 return sb->final_buf + sb->lineno[lno];
573 * It is known that lines between tlno to same came from parent, and e
574 * has an overlap with that range. it also is known that parent's
575 * line plno corresponds to e's line tlno.
581 * <------------------>
583 * Split e into potentially three parts; before this chunk, the chunk
584 * to be blamed for the parent, and after that portion.
586 static void split_overlap(struct blame_entry *split,
587 struct blame_entry *e,
588 int tlno, int plno, int same,
589 struct origin *parent)
592 memset(split, 0, sizeof(struct blame_entry [3]));
594 if (e->s_lno < tlno) {
595 /* there is a pre-chunk part not blamed on parent */
596 split[0].suspect = origin_incref(e->suspect);
597 split[0].lno = e->lno;
598 split[0].s_lno = e->s_lno;
599 split[0].num_lines = tlno - e->s_lno;
600 split[1].lno = e->lno + tlno - e->s_lno;
601 split[1].s_lno = plno;
604 split[1].lno = e->lno;
605 split[1].s_lno = plno + (e->s_lno - tlno);
608 if (same < e->s_lno + e->num_lines) {
609 /* there is a post-chunk part not blamed on parent */
610 split[2].suspect = origin_incref(e->suspect);
611 split[2].lno = e->lno + (same - e->s_lno);
612 split[2].s_lno = e->s_lno + (same - e->s_lno);
613 split[2].num_lines = e->s_lno + e->num_lines - same;
614 chunk_end_lno = split[2].lno;
617 chunk_end_lno = e->lno + e->num_lines;
618 split[1].num_lines = chunk_end_lno - split[1].lno;
621 * if it turns out there is nothing to blame the parent for,
622 * forget about the splitting. !split[1].suspect signals this.
624 if (split[1].num_lines < 1)
626 split[1].suspect = origin_incref(parent);
630 * split_overlap() divided an existing blame e into up to three parts
631 * in split. Adjust the linked list of blames in the scoreboard to
634 static void split_blame(struct scoreboard *sb,
635 struct blame_entry *split,
636 struct blame_entry *e)
638 struct blame_entry *new_entry;
640 if (split[0].suspect && split[2].suspect) {
641 /* The first part (reuse storage for the existing entry e) */
642 dup_entry(e, &split[0]);
644 /* The last part -- me */
645 new_entry = xmalloc(sizeof(*new_entry));
646 memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
647 add_blame_entry(sb, new_entry);
649 /* ... and the middle part -- parent */
650 new_entry = xmalloc(sizeof(*new_entry));
651 memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
652 add_blame_entry(sb, new_entry);
654 else if (!split[0].suspect && !split[2].suspect)
656 * The parent covers the entire area; reuse storage for
657 * e and replace it with the parent.
659 dup_entry(e, &split[1]);
660 else if (split[0].suspect) {
661 /* me and then parent */
662 dup_entry(e, &split[0]);
664 new_entry = xmalloc(sizeof(*new_entry));
665 memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
666 add_blame_entry(sb, new_entry);
669 /* parent and then me */
670 dup_entry(e, &split[1]);
672 new_entry = xmalloc(sizeof(*new_entry));
673 memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
674 add_blame_entry(sb, new_entry);
677 if (DEBUG) { /* sanity */
678 struct blame_entry *ent;
679 int lno = sb->ent->lno, corrupt = 0;
681 for (ent = sb->ent; ent; ent = ent->next) {
686 lno += ent->num_lines;
690 for (ent = sb->ent; ent; ent = ent->next) {
691 printf("L %8d l %8d n %8d\n",
692 lno, ent->lno, ent->num_lines);
693 lno = ent->lno + ent->num_lines;
701 * After splitting the blame, the origins used by the
702 * on-stack blame_entry should lose one refcnt each.
704 static void decref_split(struct blame_entry *split)
708 for (i = 0; i < 3; i++)
709 origin_decref(split[i].suspect);
713 * Helper for blame_chunk(). blame_entry e is known to overlap with
714 * the patch hunk; split it and pass blame to the parent.
716 static void blame_overlap(struct scoreboard *sb, struct blame_entry *e,
717 int tlno, int plno, int same,
718 struct origin *parent)
720 struct blame_entry split[3];
722 split_overlap(split, e, tlno, plno, same, parent);
723 if (split[1].suspect)
724 split_blame(sb, split, e);
729 * Find the line number of the last line the target is suspected for.
731 static int find_last_in_target(struct scoreboard *sb, struct origin *target)
733 struct blame_entry *e;
734 int last_in_target = -1;
736 for (e = sb->ent; e; e = e->next) {
737 if (e->guilty || !same_suspect(e->suspect, target))
739 if (last_in_target < e->s_lno + e->num_lines)
740 last_in_target = e->s_lno + e->num_lines;
742 return last_in_target;
746 * Process one hunk from the patch between the current suspect for
747 * blame_entry e and its parent. Find and split the overlap, and
748 * pass blame to the overlapping part to the parent.
750 static void blame_chunk(struct scoreboard *sb,
751 int tlno, int plno, int same,
752 struct origin *target, struct origin *parent)
754 struct blame_entry *e;
756 for (e = sb->ent; e; e = e->next) {
757 if (e->guilty || !same_suspect(e->suspect, target))
759 if (same <= e->s_lno)
761 if (tlno < e->s_lno + e->num_lines)
762 blame_overlap(sb, e, tlno, plno, same, parent);
766 struct blame_chunk_cb_data {
767 struct scoreboard *sb;
768 struct origin *target;
769 struct origin *parent;
774 static int blame_chunk_cb(long start_a, long count_a,
775 long start_b, long count_b, void *data)
777 struct blame_chunk_cb_data *d = data;
778 blame_chunk(d->sb, d->tlno, d->plno, start_b, d->target, d->parent);
779 d->plno = start_a + count_a;
780 d->tlno = start_b + count_b;
785 * We are looking at the origin 'target' and aiming to pass blame
786 * for the lines it is suspected to its parent. Run diff to find
787 * which lines came from parent and pass blame for them.
789 static int pass_blame_to_parent(struct scoreboard *sb,
790 struct origin *target,
791 struct origin *parent)
794 mmfile_t file_p, file_o;
795 struct blame_chunk_cb_data d;
797 memset(&d, 0, sizeof(d));
798 d.sb = sb; d.target = target; d.parent = parent;
799 last_in_target = find_last_in_target(sb, target);
800 if (last_in_target < 0)
801 return 1; /* nothing remains for this target */
803 fill_origin_blob(&sb->revs->diffopt, parent, &file_p);
804 fill_origin_blob(&sb->revs->diffopt, target, &file_o);
807 diff_hunks(&file_p, &file_o, 0, blame_chunk_cb, &d);
808 /* The rest (i.e. anything after tlno) are the same as the parent */
809 blame_chunk(sb, d.tlno, d.plno, last_in_target, target, parent);
815 * The lines in blame_entry after splitting blames many times can become
816 * very small and trivial, and at some point it becomes pointless to
817 * blame the parents. E.g. "\t\t}\n\t}\n\n" appears everywhere in any
818 * ordinary C program, and it is not worth to say it was copied from
819 * totally unrelated file in the parent.
821 * Compute how trivial the lines in the blame_entry are.
823 static unsigned ent_score(struct scoreboard *sb, struct blame_entry *e)
832 cp = nth_line(sb, e->lno);
833 ep = nth_line(sb, e->lno + e->num_lines);
835 unsigned ch = *((unsigned char *)cp);
845 * best_so_far[] and this[] are both a split of an existing blame_entry
846 * that passes blame to the parent. Maintain best_so_far the best split
847 * so far, by comparing this and best_so_far and copying this into
848 * bst_so_far as needed.
850 static void copy_split_if_better(struct scoreboard *sb,
851 struct blame_entry *best_so_far,
852 struct blame_entry *this)
856 if (!this[1].suspect)
858 if (best_so_far[1].suspect) {
859 if (ent_score(sb, &this[1]) < ent_score(sb, &best_so_far[1]))
863 for (i = 0; i < 3; i++)
864 origin_incref(this[i].suspect);
865 decref_split(best_so_far);
866 memcpy(best_so_far, this, sizeof(struct blame_entry [3]));
870 * We are looking at a part of the final image represented by
871 * ent (tlno and same are offset by ent->s_lno).
872 * tlno is where we are looking at in the final image.
873 * up to (but not including) same match preimage.
874 * plno is where we are looking at in the preimage.
876 * <-------------- final image ---------------------->
879 * <---------preimage----->
882 * All line numbers are 0-based.
884 static void handle_split(struct scoreboard *sb,
885 struct blame_entry *ent,
886 int tlno, int plno, int same,
887 struct origin *parent,
888 struct blame_entry *split)
890 if (ent->num_lines <= tlno)
893 struct blame_entry this[3];
896 split_overlap(this, ent, tlno, plno, same, parent);
897 copy_split_if_better(sb, split, this);
902 struct handle_split_cb_data {
903 struct scoreboard *sb;
904 struct blame_entry *ent;
905 struct origin *parent;
906 struct blame_entry *split;
911 static int handle_split_cb(long start_a, long count_a,
912 long start_b, long count_b, void *data)
914 struct handle_split_cb_data *d = data;
915 handle_split(d->sb, d->ent, d->tlno, d->plno, start_b, d->parent,
917 d->plno = start_a + count_a;
918 d->tlno = start_b + count_b;
923 * Find the lines from parent that are the same as ent so that
924 * we can pass blames to it. file_p has the blob contents for
927 static void find_copy_in_blob(struct scoreboard *sb,
928 struct blame_entry *ent,
929 struct origin *parent,
930 struct blame_entry *split,
936 struct handle_split_cb_data d;
938 memset(&d, 0, sizeof(d));
939 d.sb = sb; d.ent = ent; d.parent = parent; d.split = split;
941 * Prepare mmfile that contains only the lines in ent.
943 cp = nth_line(sb, ent->lno);
944 file_o.ptr = (char *) cp;
945 cnt = ent->num_lines;
947 while (cnt && cp < sb->final_buf + sb->final_buf_size) {
951 file_o.size = cp - file_o.ptr;
954 * file_o is a part of final image we are annotating.
955 * file_p partially may match that image.
957 memset(split, 0, sizeof(struct blame_entry [3]));
958 diff_hunks(file_p, &file_o, 1, handle_split_cb, &d);
959 /* remainder, if any, all match the preimage */
960 handle_split(sb, ent, d.tlno, d.plno, ent->num_lines, parent, split);
964 * See if lines currently target is suspected for can be attributed to
967 static int find_move_in_parent(struct scoreboard *sb,
968 struct origin *target,
969 struct origin *parent)
971 int last_in_target, made_progress;
972 struct blame_entry *e, split[3];
975 last_in_target = find_last_in_target(sb, target);
976 if (last_in_target < 0)
977 return 1; /* nothing remains for this target */
979 fill_origin_blob(&sb->revs->diffopt, parent, &file_p);
984 while (made_progress) {
986 for (e = sb->ent; e; e = e->next) {
987 if (e->guilty || !same_suspect(e->suspect, target) ||
988 ent_score(sb, e) < blame_move_score)
990 find_copy_in_blob(sb, e, parent, split, &file_p);
991 if (split[1].suspect &&
992 blame_move_score < ent_score(sb, &split[1])) {
993 split_blame(sb, split, e);
1003 struct blame_entry *ent;
1004 struct blame_entry split[3];
1008 * Count the number of entries the target is suspected for,
1009 * and prepare a list of entry and the best split.
1011 static struct blame_list *setup_blame_list(struct scoreboard *sb,
1012 struct origin *target,
1016 struct blame_entry *e;
1018 struct blame_list *blame_list = NULL;
1020 for (e = sb->ent, num_ents = 0; e; e = e->next)
1021 if (!e->scanned && !e->guilty &&
1022 same_suspect(e->suspect, target) &&
1023 min_score < ent_score(sb, e))
1026 blame_list = xcalloc(num_ents, sizeof(struct blame_list));
1027 for (e = sb->ent, i = 0; e; e = e->next)
1028 if (!e->scanned && !e->guilty &&
1029 same_suspect(e->suspect, target) &&
1030 min_score < ent_score(sb, e))
1031 blame_list[i++].ent = e;
1033 *num_ents_p = num_ents;
1038 * Reset the scanned status on all entries.
1040 static void reset_scanned_flag(struct scoreboard *sb)
1042 struct blame_entry *e;
1043 for (e = sb->ent; e; e = e->next)
1048 * For lines target is suspected for, see if we can find code movement
1049 * across file boundary from the parent commit. porigin is the path
1050 * in the parent we already tried.
1052 static int find_copy_in_parent(struct scoreboard *sb,
1053 struct origin *target,
1054 struct commit *parent,
1055 struct origin *porigin,
1058 struct diff_options diff_opts;
1059 const char *paths[1];
1062 struct blame_list *blame_list;
1065 blame_list = setup_blame_list(sb, target, blame_copy_score, &num_ents);
1067 return 1; /* nothing remains for this target */
1069 diff_setup(&diff_opts);
1070 DIFF_OPT_SET(&diff_opts, RECURSIVE);
1071 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1074 diff_tree_setup_paths(paths, &diff_opts);
1075 diff_setup_done(&diff_opts);
1077 /* Try "find copies harder" on new path if requested;
1078 * we do not want to use diffcore_rename() actually to
1079 * match things up; find_copies_harder is set only to
1080 * force diff_tree_sha1() to feed all filepairs to diff_queue,
1081 * and this code needs to be after diff_setup_done(), which
1082 * usually makes find-copies-harder imply copy detection.
1084 if ((opt & PICKAXE_BLAME_COPY_HARDEST)
1085 || ((opt & PICKAXE_BLAME_COPY_HARDER)
1086 && (!porigin || strcmp(target->path, porigin->path))))
1087 DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
1089 if (is_null_sha1(target->commit->object.sha1))
1090 do_diff_cache(parent->tree->object.sha1, &diff_opts);
1092 diff_tree_sha1(parent->tree->object.sha1,
1093 target->commit->tree->object.sha1,
1096 if (!DIFF_OPT_TST(&diff_opts, FIND_COPIES_HARDER))
1097 diffcore_std(&diff_opts);
1101 int made_progress = 0;
1103 for (i = 0; i < diff_queued_diff.nr; i++) {
1104 struct diff_filepair *p = diff_queued_diff.queue[i];
1105 struct origin *norigin;
1107 struct blame_entry this[3];
1109 if (!DIFF_FILE_VALID(p->one))
1110 continue; /* does not exist in parent */
1111 if (S_ISGITLINK(p->one->mode))
1112 continue; /* ignore git links */
1113 if (porigin && !strcmp(p->one->path, porigin->path))
1114 /* find_move already dealt with this path */
1117 norigin = get_origin(sb, parent, p->one->path);
1118 hashcpy(norigin->blob_sha1, p->one->sha1);
1119 norigin->mode = p->one->mode;
1120 fill_origin_blob(&sb->revs->diffopt, norigin, &file_p);
1124 for (j = 0; j < num_ents; j++) {
1125 find_copy_in_blob(sb, blame_list[j].ent,
1126 norigin, this, &file_p);
1127 copy_split_if_better(sb, blame_list[j].split,
1131 origin_decref(norigin);
1134 for (j = 0; j < num_ents; j++) {
1135 struct blame_entry *split = blame_list[j].split;
1136 if (split[1].suspect &&
1137 blame_copy_score < ent_score(sb, &split[1])) {
1138 split_blame(sb, split, blame_list[j].ent);
1142 blame_list[j].ent->scanned = 1;
1143 decref_split(split);
1149 blame_list = setup_blame_list(sb, target, blame_copy_score, &num_ents);
1155 reset_scanned_flag(sb);
1156 diff_flush(&diff_opts);
1157 diff_tree_release_paths(&diff_opts);
1162 * The blobs of origin and porigin exactly match, so everything
1163 * origin is suspected for can be blamed on the parent.
1165 static void pass_whole_blame(struct scoreboard *sb,
1166 struct origin *origin, struct origin *porigin)
1168 struct blame_entry *e;
1170 if (!porigin->file.ptr && origin->file.ptr) {
1171 /* Steal its file */
1172 porigin->file = origin->file;
1173 origin->file.ptr = NULL;
1175 for (e = sb->ent; e; e = e->next) {
1176 if (!same_suspect(e->suspect, origin))
1178 origin_incref(porigin);
1179 origin_decref(e->suspect);
1180 e->suspect = porigin;
1185 * We pass blame from the current commit to its parents. We keep saying
1186 * "parent" (and "porigin"), but what we mean is to find scapegoat to
1187 * exonerate ourselves.
1189 static struct commit_list *first_scapegoat(struct rev_info *revs, struct commit *commit)
1192 return commit->parents;
1193 return lookup_decoration(&revs->children, &commit->object);
1196 static int num_scapegoats(struct rev_info *revs, struct commit *commit)
1199 struct commit_list *l = first_scapegoat(revs, commit);
1200 for (cnt = 0; l; l = l->next)
1207 static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)
1209 struct rev_info *revs = sb->revs;
1210 int i, pass, num_sg;
1211 struct commit *commit = origin->commit;
1212 struct commit_list *sg;
1213 struct origin *sg_buf[MAXSG];
1214 struct origin *porigin, **sg_origin = sg_buf;
1216 num_sg = num_scapegoats(revs, commit);
1219 else if (num_sg < ARRAY_SIZE(sg_buf))
1220 memset(sg_buf, 0, sizeof(sg_buf));
1222 sg_origin = xcalloc(num_sg, sizeof(*sg_origin));
1225 * The first pass looks for unrenamed path to optimize for
1226 * common cases, then we look for renames in the second pass.
1228 for (pass = 0; pass < 2; pass++) {
1229 struct origin *(*find)(struct scoreboard *,
1230 struct commit *, struct origin *);
1231 find = pass ? find_rename : find_origin;
1233 for (i = 0, sg = first_scapegoat(revs, commit);
1235 sg = sg->next, i++) {
1236 struct commit *p = sg->item;
1241 if (parse_commit(p))
1243 porigin = find(sb, p, origin);
1246 if (!hashcmp(porigin->blob_sha1, origin->blob_sha1)) {
1247 pass_whole_blame(sb, origin, porigin);
1248 origin_decref(porigin);
1251 for (j = same = 0; j < i; j++)
1253 !hashcmp(sg_origin[j]->blob_sha1,
1254 porigin->blob_sha1)) {
1259 sg_origin[i] = porigin;
1261 origin_decref(porigin);
1266 for (i = 0, sg = first_scapegoat(revs, commit);
1268 sg = sg->next, i++) {
1269 struct origin *porigin = sg_origin[i];
1272 if (!origin->previous) {
1273 origin_incref(porigin);
1274 origin->previous = porigin;
1276 if (pass_blame_to_parent(sb, origin, porigin))
1281 * Optionally find moves in parents' files.
1283 if (opt & PICKAXE_BLAME_MOVE)
1284 for (i = 0, sg = first_scapegoat(revs, commit);
1286 sg = sg->next, i++) {
1287 struct origin *porigin = sg_origin[i];
1290 if (find_move_in_parent(sb, origin, porigin))
1295 * Optionally find copies from parents' files.
1297 if (opt & PICKAXE_BLAME_COPY)
1298 for (i = 0, sg = first_scapegoat(revs, commit);
1300 sg = sg->next, i++) {
1301 struct origin *porigin = sg_origin[i];
1302 if (find_copy_in_parent(sb, origin, sg->item,
1308 for (i = 0; i < num_sg; i++) {
1310 drop_origin_blob(sg_origin[i]);
1311 origin_decref(sg_origin[i]);
1314 drop_origin_blob(origin);
1315 if (sg_buf != sg_origin)
1320 * Information on commits, used for output.
1322 struct commit_info {
1324 const char *author_mail;
1325 unsigned long author_time;
1326 const char *author_tz;
1328 /* filled only when asked for details */
1329 const char *committer;
1330 const char *committer_mail;
1331 unsigned long committer_time;
1332 const char *committer_tz;
1334 const char *summary;
1338 * Parse author/committer line in the commit object buffer
1340 static void get_ac_line(const char *inbuf, const char *what,
1341 int person_len, char *person,
1342 int mail_len, char *mail,
1343 unsigned long *time, const char **tz)
1345 int len, tzlen, maillen;
1346 char *tmp, *endp, *timepos, *mailpos;
1348 tmp = strstr(inbuf, what);
1351 tmp += strlen(what);
1352 endp = strchr(tmp, '\n');
1357 if (person_len <= len) {
1361 strcpy(person, *tz);
1366 memcpy(person, tmp, len);
1371 while (person < tmp && *tmp != ' ')
1376 tzlen = (person+len)-(tmp+1);
1379 while (person < tmp && *tmp != ' ')
1383 *time = strtoul(tmp, NULL, 10);
1387 while (person < tmp && !(*tmp == ' ' && tmp[1] == '<'))
1393 maillen = timepos - tmp;
1394 memcpy(mail, mailpos, maillen);
1400 * mailmap expansion may make the name longer.
1401 * make room by pushing stuff down.
1403 tmp = person + person_len - (tzlen + 1);
1404 memmove(tmp, *tz, tzlen);
1409 * Now, convert both name and e-mail using mailmap
1411 if (map_user(&mailmap, mail+1, mail_len-1, person, tmp-person-1)) {
1412 /* Add a trailing '>' to email, since map_user returns plain emails
1413 Note: It already has '<', since we replace from mail+1 */
1414 mailpos = memchr(mail, '\0', mail_len);
1415 if (mailpos && mailpos-mail < mail_len - 1) {
1417 *(mailpos+1) = '\0';
1422 static void get_commit_info(struct commit *commit,
1423 struct commit_info *ret,
1427 const char *subject;
1428 char *reencoded, *message;
1429 static char author_name[1024];
1430 static char author_mail[1024];
1431 static char committer_name[1024];
1432 static char committer_mail[1024];
1433 static char summary_buf[1024];
1436 * We've operated without save_commit_buffer, so
1437 * we now need to populate them for output.
1439 if (!commit->buffer) {
1440 enum object_type type;
1443 read_sha1_file(commit->object.sha1, &type, &size);
1444 if (!commit->buffer)
1445 die("Cannot read commit %s",
1446 sha1_to_hex(commit->object.sha1));
1448 reencoded = reencode_commit_message(commit, NULL);
1449 message = reencoded ? reencoded : commit->buffer;
1450 ret->author = author_name;
1451 ret->author_mail = author_mail;
1452 get_ac_line(message, "\nauthor ",
1453 sizeof(author_name), author_name,
1454 sizeof(author_mail), author_mail,
1455 &ret->author_time, &ret->author_tz);
1462 ret->committer = committer_name;
1463 ret->committer_mail = committer_mail;
1464 get_ac_line(message, "\ncommitter ",
1465 sizeof(committer_name), committer_name,
1466 sizeof(committer_mail), committer_mail,
1467 &ret->committer_time, &ret->committer_tz);
1469 ret->summary = summary_buf;
1470 len = find_commit_subject(message, &subject);
1471 if (len && len < sizeof(summary_buf)) {
1472 memcpy(summary_buf, subject, len);
1473 summary_buf[len] = 0;
1475 sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1));
1481 * To allow LF and other nonportable characters in pathnames,
1482 * they are c-style quoted as needed.
1484 static void write_filename_info(const char *path)
1486 printf("filename ");
1487 write_name_quoted(path, stdout, '\n');
1491 * Porcelain/Incremental format wants to show a lot of details per
1492 * commit. Instead of repeating this every line, emit it only once,
1493 * the first time each commit appears in the output (unless the
1494 * user has specifically asked for us to repeat).
1496 static int emit_one_suspect_detail(struct origin *suspect, int repeat)
1498 struct commit_info ci;
1500 if (!repeat && (suspect->commit->object.flags & METAINFO_SHOWN))
1503 suspect->commit->object.flags |= METAINFO_SHOWN;
1504 get_commit_info(suspect->commit, &ci, 1);
1505 printf("author %s\n", ci.author);
1506 printf("author-mail %s\n", ci.author_mail);
1507 printf("author-time %lu\n", ci.author_time);
1508 printf("author-tz %s\n", ci.author_tz);
1509 printf("committer %s\n", ci.committer);
1510 printf("committer-mail %s\n", ci.committer_mail);
1511 printf("committer-time %lu\n", ci.committer_time);
1512 printf("committer-tz %s\n", ci.committer_tz);
1513 printf("summary %s\n", ci.summary);
1514 if (suspect->commit->object.flags & UNINTERESTING)
1515 printf("boundary\n");
1516 if (suspect->previous) {
1517 struct origin *prev = suspect->previous;
1518 printf("previous %s ", sha1_to_hex(prev->commit->object.sha1));
1519 write_name_quoted(prev->path, stdout, '\n');
1525 * The blame_entry is found to be guilty for the range. Mark it
1526 * as such, and show it in incremental output.
1528 static void found_guilty_entry(struct blame_entry *ent)
1534 struct origin *suspect = ent->suspect;
1536 printf("%s %d %d %d\n",
1537 sha1_to_hex(suspect->commit->object.sha1),
1538 ent->s_lno + 1, ent->lno + 1, ent->num_lines);
1539 emit_one_suspect_detail(suspect, 0);
1540 write_filename_info(suspect->path);
1541 maybe_flush_or_die(stdout, "stdout");
1546 * The main loop -- while the scoreboard has lines whose true origin
1547 * is still unknown, pick one blame_entry, and allow its current
1548 * suspect to pass blames to its parents.
1550 static void assign_blame(struct scoreboard *sb, int opt)
1552 struct rev_info *revs = sb->revs;
1555 struct blame_entry *ent;
1556 struct commit *commit;
1557 struct origin *suspect = NULL;
1559 /* find one suspect to break down */
1560 for (ent = sb->ent; !suspect && ent; ent = ent->next)
1562 suspect = ent->suspect;
1564 return; /* all done */
1567 * We will use this suspect later in the loop,
1568 * so hold onto it in the meantime.
1570 origin_incref(suspect);
1571 commit = suspect->commit;
1572 if (!commit->object.parsed)
1573 parse_commit(commit);
1575 (!(commit->object.flags & UNINTERESTING) &&
1576 !(revs->max_age != -1 && commit->date < revs->max_age)))
1577 pass_blame(sb, suspect, opt);
1579 commit->object.flags |= UNINTERESTING;
1580 if (commit->object.parsed)
1581 mark_parents_uninteresting(commit);
1583 /* treat root commit as boundary */
1584 if (!commit->parents && !show_root)
1585 commit->object.flags |= UNINTERESTING;
1587 /* Take responsibility for the remaining entries */
1588 for (ent = sb->ent; ent; ent = ent->next)
1589 if (same_suspect(ent->suspect, suspect))
1590 found_guilty_entry(ent);
1591 origin_decref(suspect);
1593 if (DEBUG) /* sanity */
1594 sanity_check_refcnt(sb);
1598 static const char *format_time(unsigned long time, const char *tz_str,
1601 static char time_buf[128];
1602 const char *time_str;
1606 if (show_raw_time) {
1607 snprintf(time_buf, sizeof(time_buf), "%lu %s", time, tz_str);
1611 time_str = show_date(time, tz, blame_date_mode);
1612 time_len = strlen(time_str);
1613 memcpy(time_buf, time_str, time_len);
1614 memset(time_buf + time_len, ' ', blame_date_width - time_len);
1619 #define OUTPUT_ANNOTATE_COMPAT 001
1620 #define OUTPUT_LONG_OBJECT_NAME 002
1621 #define OUTPUT_RAW_TIMESTAMP 004
1622 #define OUTPUT_PORCELAIN 010
1623 #define OUTPUT_SHOW_NAME 020
1624 #define OUTPUT_SHOW_NUMBER 040
1625 #define OUTPUT_SHOW_SCORE 0100
1626 #define OUTPUT_NO_AUTHOR 0200
1627 #define OUTPUT_SHOW_EMAIL 0400
1628 #define OUTPUT_LINE_PORCELAIN 01000
1630 static void emit_porcelain_details(struct origin *suspect, int repeat)
1632 if (emit_one_suspect_detail(suspect, repeat) ||
1633 (suspect->commit->object.flags & MORE_THAN_ONE_PATH))
1634 write_filename_info(suspect->path);
1637 static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent,
1640 int repeat = opt & OUTPUT_LINE_PORCELAIN;
1643 struct origin *suspect = ent->suspect;
1646 strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
1647 printf("%s%c%d %d %d\n",
1649 ent->guilty ? ' ' : '*', /* purely for debugging */
1653 emit_porcelain_details(suspect, repeat);
1655 cp = nth_line(sb, ent->lno);
1656 for (cnt = 0; cnt < ent->num_lines; cnt++) {
1659 printf("%s %d %d\n", hex,
1660 ent->s_lno + 1 + cnt,
1661 ent->lno + 1 + cnt);
1663 emit_porcelain_details(suspect, 1);
1669 } while (ch != '\n' &&
1670 cp < sb->final_buf + sb->final_buf_size);
1673 if (sb->final_buf_size && cp[-1] != '\n')
1677 static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
1681 struct origin *suspect = ent->suspect;
1682 struct commit_info ci;
1684 int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
1686 get_commit_info(suspect->commit, &ci, 1);
1687 strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
1689 cp = nth_line(sb, ent->lno);
1690 for (cnt = 0; cnt < ent->num_lines; cnt++) {
1692 int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? 40 : abbrev;
1694 if (suspect->commit->object.flags & UNINTERESTING) {
1696 memset(hex, ' ', length);
1697 else if (!(opt & OUTPUT_ANNOTATE_COMPAT)) {
1703 printf("%.*s", length, hex);
1704 if (opt & OUTPUT_ANNOTATE_COMPAT) {
1706 if (opt & OUTPUT_SHOW_EMAIL)
1707 name = ci.author_mail;
1710 printf("\t(%10s\t%10s\t%d)", name,
1711 format_time(ci.author_time, ci.author_tz,
1713 ent->lno + 1 + cnt);
1715 if (opt & OUTPUT_SHOW_SCORE)
1717 max_score_digits, ent->score,
1718 ent->suspect->refcnt);
1719 if (opt & OUTPUT_SHOW_NAME)
1720 printf(" %-*.*s", longest_file, longest_file,
1722 if (opt & OUTPUT_SHOW_NUMBER)
1723 printf(" %*d", max_orig_digits,
1724 ent->s_lno + 1 + cnt);
1726 if (!(opt & OUTPUT_NO_AUTHOR)) {
1729 if (opt & OUTPUT_SHOW_EMAIL)
1730 name = ci.author_mail;
1733 pad = longest_author - utf8_strwidth(name);
1734 printf(" (%s%*s %10s",
1736 format_time(ci.author_time,
1741 max_digits, ent->lno + 1 + cnt);
1746 } while (ch != '\n' &&
1747 cp < sb->final_buf + sb->final_buf_size);
1750 if (sb->final_buf_size && cp[-1] != '\n')
1754 static void output(struct scoreboard *sb, int option)
1756 struct blame_entry *ent;
1758 if (option & OUTPUT_PORCELAIN) {
1759 for (ent = sb->ent; ent; ent = ent->next) {
1760 struct blame_entry *oth;
1761 struct origin *suspect = ent->suspect;
1762 struct commit *commit = suspect->commit;
1763 if (commit->object.flags & MORE_THAN_ONE_PATH)
1765 for (oth = ent->next; oth; oth = oth->next) {
1766 if ((oth->suspect->commit != commit) ||
1767 !strcmp(oth->suspect->path, suspect->path))
1769 commit->object.flags |= MORE_THAN_ONE_PATH;
1775 for (ent = sb->ent; ent; ent = ent->next) {
1776 if (option & OUTPUT_PORCELAIN)
1777 emit_porcelain(sb, ent, option);
1779 emit_other(sb, ent, option);
1785 * To allow quick access to the contents of nth line in the
1786 * final image, prepare an index in the scoreboard.
1788 static int prepare_lines(struct scoreboard *sb)
1790 const char *buf = sb->final_buf;
1791 unsigned long len = sb->final_buf_size;
1792 int num = 0, incomplete = 0, bol = 1;
1794 if (len && buf[len-1] != '\n')
1795 incomplete++; /* incomplete line at the end */
1798 sb->lineno = xrealloc(sb->lineno,
1799 sizeof(int *) * (num + 1));
1800 sb->lineno[num] = buf - sb->final_buf;
1803 if (*buf++ == '\n') {
1808 sb->lineno = xrealloc(sb->lineno,
1809 sizeof(int *) * (num + incomplete + 1));
1810 sb->lineno[num + incomplete] = buf - sb->final_buf;
1811 sb->num_lines = num + incomplete;
1812 return sb->num_lines;
1816 * Add phony grafts for use with -S; this is primarily to
1817 * support git's cvsserver that wants to give a linear history
1820 static int read_ancestry(const char *graft_file)
1822 FILE *fp = fopen(graft_file, "r");
1826 while (fgets(buf, sizeof(buf), fp)) {
1827 /* The format is just "Commit Parent1 Parent2 ...\n" */
1828 int len = strlen(buf);
1829 struct commit_graft *graft = read_graft_line(buf, len);
1831 register_commit_graft(graft, 0);
1837 static int update_auto_abbrev(int auto_abbrev, struct origin *suspect)
1839 const char *uniq = find_unique_abbrev(suspect->commit->object.sha1,
1841 int len = strlen(uniq);
1842 if (auto_abbrev < len)
1848 * How many columns do we need to show line numbers, authors,
1851 static void find_alignment(struct scoreboard *sb, int *option)
1853 int longest_src_lines = 0;
1854 int longest_dst_lines = 0;
1855 unsigned largest_score = 0;
1856 struct blame_entry *e;
1857 int compute_auto_abbrev = (abbrev < 0);
1858 int auto_abbrev = default_abbrev;
1860 for (e = sb->ent; e; e = e->next) {
1861 struct origin *suspect = e->suspect;
1862 struct commit_info ci;
1865 if (compute_auto_abbrev)
1866 auto_abbrev = update_auto_abbrev(auto_abbrev, suspect);
1867 if (strcmp(suspect->path, sb->path))
1868 *option |= OUTPUT_SHOW_NAME;
1869 num = strlen(suspect->path);
1870 if (longest_file < num)
1872 if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
1873 suspect->commit->object.flags |= METAINFO_SHOWN;
1874 get_commit_info(suspect->commit, &ci, 1);
1875 if (*option & OUTPUT_SHOW_EMAIL)
1876 num = utf8_strwidth(ci.author_mail);
1878 num = utf8_strwidth(ci.author);
1879 if (longest_author < num)
1880 longest_author = num;
1882 num = e->s_lno + e->num_lines;
1883 if (longest_src_lines < num)
1884 longest_src_lines = num;
1885 num = e->lno + e->num_lines;
1886 if (longest_dst_lines < num)
1887 longest_dst_lines = num;
1888 if (largest_score < ent_score(sb, e))
1889 largest_score = ent_score(sb, e);
1891 max_orig_digits = decimal_width(longest_src_lines);
1892 max_digits = decimal_width(longest_dst_lines);
1893 max_score_digits = decimal_width(largest_score);
1895 if (compute_auto_abbrev)
1896 /* one more abbrev length is needed for the boundary commit */
1897 abbrev = auto_abbrev + 1;
1901 * For debugging -- origin is refcounted, and this asserts that
1902 * we do not underflow.
1904 static void sanity_check_refcnt(struct scoreboard *sb)
1907 struct blame_entry *ent;
1909 for (ent = sb->ent; ent; ent = ent->next) {
1910 /* Nobody should have zero or negative refcnt */
1911 if (ent->suspect->refcnt <= 0) {
1912 fprintf(stderr, "%s in %s has negative refcnt %d\n",
1914 sha1_to_hex(ent->suspect->commit->object.sha1),
1915 ent->suspect->refcnt);
1921 find_alignment(sb, &opt);
1923 die("Baa %d!", baa);
1928 * Used for the command line parsing; check if the path exists
1929 * in the working tree.
1931 static int has_string_in_work_tree(const char *path)
1934 return !lstat(path, &st);
1937 static unsigned parse_score(const char *arg)
1940 unsigned long score = strtoul(arg, &end, 10);
1946 static const char *add_prefix(const char *prefix, const char *path)
1948 return prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
1952 * Parsing of (comma separated) one item in the -L option
1954 static const char *parse_loc(const char *spec,
1955 struct scoreboard *sb, long lno,
1956 long begin, long *ret)
1963 regmatch_t match[1];
1965 /* Allow "-L <something>,+20" to mean starting at <something>
1966 * for 20 lines, or "-L <something>,-5" for 5 lines ending at
1969 if (1 < begin && (spec[0] == '+' || spec[0] == '-')) {
1970 num = strtol(spec + 1, &term, 10);
1971 if (term != spec + 1) {
1975 *ret = begin + num - 2;
1984 num = strtol(spec, &term, 10);
1992 /* it could be a regexp of form /.../ */
1993 for (term = (char *) spec + 1; *term && *term != '/'; term++) {
2000 /* try [spec+1 .. term-1] as regexp */
2002 begin--; /* input is in human terms */
2003 line = nth_line(sb, begin);
2005 if (!(reg_error = regcomp(®exp, spec + 1, REG_NEWLINE)) &&
2006 !(reg_error = regexec(®exp, line, 1, match, 0))) {
2007 const char *cp = line + match[0].rm_so;
2010 while (begin++ < lno) {
2011 nline = nth_line(sb, begin);
2012 if (line <= cp && cp < nline)
2023 regerror(reg_error, ®exp, errbuf, 1024);
2024 die("-L parameter '%s': %s", spec + 1, errbuf);
2029 * Parsing of -L option
2031 static void prepare_blame_range(struct scoreboard *sb,
2032 const char *bottomtop,
2034 long *bottom, long *top)
2038 term = parse_loc(bottomtop, sb, lno, 1, bottom);
2040 term = parse_loc(term + 1, sb, lno, *bottom + 1, top);
2048 static int git_blame_config(const char *var, const char *value, void *cb)
2050 if (!strcmp(var, "blame.showroot")) {
2051 show_root = git_config_bool(var, value);
2054 if (!strcmp(var, "blame.blankboundary")) {
2055 blank_boundary = git_config_bool(var, value);
2058 if (!strcmp(var, "blame.date")) {
2060 return config_error_nonbool(var);
2061 blame_date_mode = parse_date_format(value);
2065 if (userdiff_config(var, value) < 0)
2068 return git_default_config(var, value, cb);
2072 * Prepare a dummy commit that represents the work tree (or staged) item.
2073 * Note that annotating work tree item never works in the reverse.
2075 static struct commit *fake_working_tree_commit(struct diff_options *opt,
2077 const char *contents_from)
2079 struct commit *commit;
2080 struct origin *origin;
2081 unsigned char head_sha1[20];
2082 struct strbuf buf = STRBUF_INIT;
2086 struct cache_entry *ce;
2089 if (get_sha1("HEAD", head_sha1))
2090 die("No such ref: HEAD");
2093 commit = xcalloc(1, sizeof(*commit));
2094 commit->parents = xcalloc(1, sizeof(*commit->parents));
2095 commit->parents->item = lookup_commit_reference(head_sha1);
2096 commit->object.parsed = 1;
2098 commit->object.type = OBJ_COMMIT;
2100 origin = make_origin(commit, path);
2102 if (!contents_from || strcmp("-", contents_from)) {
2104 const char *read_from;
2106 unsigned long buf_len;
2108 if (contents_from) {
2109 if (stat(contents_from, &st) < 0)
2110 die_errno("Cannot stat '%s'", contents_from);
2111 read_from = contents_from;
2114 if (lstat(path, &st) < 0)
2115 die_errno("Cannot lstat '%s'", path);
2118 mode = canon_mode(st.st_mode);
2120 switch (st.st_mode & S_IFMT) {
2122 if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
2123 textconv_object(read_from, mode, null_sha1, &buf_ptr, &buf_len))
2124 strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1);
2125 else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
2126 die_errno("cannot open or read '%s'", read_from);
2129 if (strbuf_readlink(&buf, read_from, st.st_size) < 0)
2130 die_errno("cannot readlink '%s'", read_from);
2133 die("unsupported file type %s", read_from);
2137 /* Reading from stdin */
2138 contents_from = "standard input";
2140 if (strbuf_read(&buf, 0, 0) < 0)
2141 die_errno("failed to read from stdin");
2143 convert_to_git(path, buf.buf, buf.len, &buf, 0);
2144 origin->file.ptr = buf.buf;
2145 origin->file.size = buf.len;
2146 pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);
2147 commit->util = origin;
2150 * Read the current index, replace the path entry with
2151 * origin->blob_sha1 without mucking with its mode or type
2152 * bits; we are not going to write this index out -- we just
2153 * want to run "diff-index --cached".
2160 int pos = cache_name_pos(path, len);
2162 mode = active_cache[pos]->ce_mode;
2164 /* Let's not bother reading from HEAD tree */
2165 mode = S_IFREG | 0644;
2167 size = cache_entry_size(len);
2168 ce = xcalloc(1, size);
2169 hashcpy(ce->sha1, origin->blob_sha1);
2170 memcpy(ce->name, path, len);
2171 ce->ce_flags = create_ce_flags(0);
2172 ce->ce_namelen = len;
2173 ce->ce_mode = create_ce_mode(mode);
2174 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
2177 * We are not going to write this out, so this does not matter
2178 * right now, but someday we might optimize diff-index --cached
2179 * with cache-tree information.
2181 cache_tree_invalidate_path(active_cache_tree, path);
2183 commit->buffer = xmalloc(400);
2184 ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
2185 snprintf(commit->buffer, 400,
2186 "tree 0000000000000000000000000000000000000000\n"
2190 "Version of %s from %s\n",
2191 sha1_to_hex(head_sha1),
2192 ident, ident, path, contents_from ? contents_from : path);
2196 static const char *prepare_final(struct scoreboard *sb)
2199 const char *final_commit_name = NULL;
2200 struct rev_info *revs = sb->revs;
2203 * There must be one and only one positive commit in the
2204 * revs->pending array.
2206 for (i = 0; i < revs->pending.nr; i++) {
2207 struct object *obj = revs->pending.objects[i].item;
2208 if (obj->flags & UNINTERESTING)
2210 while (obj->type == OBJ_TAG)
2211 obj = deref_tag(obj, NULL, 0);
2212 if (obj->type != OBJ_COMMIT)
2213 die("Non commit %s?", revs->pending.objects[i].name);
2215 die("More than one commit to dig from %s and %s?",
2216 revs->pending.objects[i].name,
2218 sb->final = (struct commit *) obj;
2219 final_commit_name = revs->pending.objects[i].name;
2221 return final_commit_name;
2224 static const char *prepare_initial(struct scoreboard *sb)
2227 const char *final_commit_name = NULL;
2228 struct rev_info *revs = sb->revs;
2231 * There must be one and only one negative commit, and it must be
2234 for (i = 0; i < revs->pending.nr; i++) {
2235 struct object *obj = revs->pending.objects[i].item;
2236 if (!(obj->flags & UNINTERESTING))
2238 while (obj->type == OBJ_TAG)
2239 obj = deref_tag(obj, NULL, 0);
2240 if (obj->type != OBJ_COMMIT)
2241 die("Non commit %s?", revs->pending.objects[i].name);
2243 die("More than one commit to dig down to %s and %s?",
2244 revs->pending.objects[i].name,
2246 sb->final = (struct commit *) obj;
2247 final_commit_name = revs->pending.objects[i].name;
2249 if (!final_commit_name)
2250 die("No commit to dig down to?");
2251 return final_commit_name;
2254 static int blame_copy_callback(const struct option *option, const char *arg, int unset)
2256 int *opt = option->value;
2259 * -C enables copy from removed files;
2260 * -C -C enables copy from existing files, but only
2261 * when blaming a new file;
2262 * -C -C -C enables copy from existing files for
2265 if (*opt & PICKAXE_BLAME_COPY_HARDER)
2266 *opt |= PICKAXE_BLAME_COPY_HARDEST;
2267 if (*opt & PICKAXE_BLAME_COPY)
2268 *opt |= PICKAXE_BLAME_COPY_HARDER;
2269 *opt |= PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE;
2272 blame_copy_score = parse_score(arg);
2276 static int blame_move_callback(const struct option *option, const char *arg, int unset)
2278 int *opt = option->value;
2280 *opt |= PICKAXE_BLAME_MOVE;
2283 blame_move_score = parse_score(arg);
2287 static int blame_bottomtop_callback(const struct option *option, const char *arg, int unset)
2289 const char **bottomtop = option->value;
2293 die("More than one '-L n,m' option given");
2298 int cmd_blame(int argc, const char **argv, const char *prefix)
2300 struct rev_info revs;
2302 struct scoreboard sb;
2304 struct blame_entry *ent;
2305 long dashdash_pos, bottom, top, lno;
2306 const char *final_commit_name = NULL;
2307 enum object_type type;
2309 static const char *bottomtop = NULL;
2310 static int output_option = 0, opt = 0;
2311 static int show_stats = 0;
2312 static const char *revs_file = NULL;
2313 static const char *contents_from = NULL;
2314 static const struct option options[] = {
2315 OPT_BOOLEAN(0, "incremental", &incremental, "Show blame entries as we find them, incrementally"),
2316 OPT_BOOLEAN('b', NULL, &blank_boundary, "Show blank SHA-1 for boundary commits (Default: off)"),
2317 OPT_BOOLEAN(0, "root", &show_root, "Do not treat root commits as boundaries (Default: off)"),
2318 OPT_BOOLEAN(0, "show-stats", &show_stats, "Show work cost statistics"),
2319 OPT_BIT(0, "score-debug", &output_option, "Show output score for blame entries", OUTPUT_SHOW_SCORE),
2320 OPT_BIT('f', "show-name", &output_option, "Show original filename (Default: auto)", OUTPUT_SHOW_NAME),
2321 OPT_BIT('n', "show-number", &output_option, "Show original linenumber (Default: off)", OUTPUT_SHOW_NUMBER),
2322 OPT_BIT('p', "porcelain", &output_option, "Show in a format designed for machine consumption", OUTPUT_PORCELAIN),
2323 OPT_BIT(0, "line-porcelain", &output_option, "Show porcelain format with per-line commit information", OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
2324 OPT_BIT('c', NULL, &output_option, "Use the same output mode as git-annotate (Default: off)", OUTPUT_ANNOTATE_COMPAT),
2325 OPT_BIT('t', NULL, &output_option, "Show raw timestamp (Default: off)", OUTPUT_RAW_TIMESTAMP),
2326 OPT_BIT('l', NULL, &output_option, "Show long commit SHA1 (Default: off)", OUTPUT_LONG_OBJECT_NAME),
2327 OPT_BIT('s', NULL, &output_option, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR),
2328 OPT_BIT('e', "show-email", &output_option, "Show author email instead of name (Default: off)", OUTPUT_SHOW_EMAIL),
2329 OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE),
2330 OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better match", XDF_NEED_MINIMAL),
2331 OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from <file> instead of calling git-rev-list"),
2332 OPT_STRING(0, "contents", &contents_from, "file", "Use <file>'s contents as the final image"),
2333 { OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies within and across files", PARSE_OPT_OPTARG, blame_copy_callback },
2334 { OPTION_CALLBACK, 'M', NULL, &opt, "score", "Find line movements within and across files", PARSE_OPT_OPTARG, blame_move_callback },
2335 OPT_CALLBACK('L', NULL, &bottomtop, "n,m", "Process only line range n,m, counting from 1", blame_bottomtop_callback),
2336 OPT__ABBREV(&abbrev),
2340 struct parse_opt_ctx_t ctx;
2341 int cmd_is_annotate = !strcmp(argv[0], "annotate");
2343 git_config(git_blame_config, NULL);
2344 init_revisions(&revs, NULL);
2345 revs.date_mode = blame_date_mode;
2346 DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV);
2348 save_commit_buffer = 0;
2351 parse_options_start(&ctx, argc, argv, prefix, options,
2352 PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
2354 switch (parse_options_step(&ctx, options, blame_opt_usage)) {
2355 case PARSE_OPT_HELP:
2357 case PARSE_OPT_DONE:
2359 dashdash_pos = ctx.cpidx;
2363 if (!strcmp(ctx.argv[0], "--reverse")) {
2364 ctx.argv[0] = "--children";
2367 parse_revision_opt(&revs, &ctx, options, blame_opt_usage);
2370 argc = parse_options_end(&ctx);
2373 /* one more abbrev length is needed for the boundary commit */
2376 if (revs_file && read_ancestry(revs_file))
2377 die_errno("reading graft file '%s' failed", revs_file);
2379 if (cmd_is_annotate) {
2380 output_option |= OUTPUT_ANNOTATE_COMPAT;
2381 blame_date_mode = DATE_ISO8601;
2383 blame_date_mode = revs.date_mode;
2386 /* The maximum width used to show the dates */
2387 switch (blame_date_mode) {
2389 blame_date_width = sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
2392 blame_date_width = sizeof("2006-10-19 16:00:04 -0700");
2395 blame_date_width = sizeof("1161298804 -0700");
2398 blame_date_width = sizeof("2006-10-19");
2401 /* "normal" is used as the fallback for "relative" */
2404 blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700");
2407 blame_date_width -= 1; /* strip the null */
2409 if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
2410 opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
2411 PICKAXE_BLAME_COPY_HARDER);
2413 if (!blame_move_score)
2414 blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
2415 if (!blame_copy_score)
2416 blame_copy_score = BLAME_DEFAULT_COPY_SCORE;
2419 * We have collected options unknown to us in argv[1..unk]
2420 * which are to be passed to revision machinery if we are
2421 * going to do the "bottom" processing.
2423 * The remaining are:
2425 * (1) if dashdash_pos != 0, it is either
2426 * "blame [revisions] -- <path>" or
2427 * "blame -- <path> <rev>"
2429 * (2) otherwise, it is one of the two:
2430 * "blame [revisions] <path>"
2431 * "blame <path> <rev>"
2433 * Note that we must strip out <path> from the arguments: we do not
2434 * want the path pruning but we may want "bottom" processing.
2437 switch (argc - dashdash_pos - 1) {
2440 usage_with_options(blame_opt_usage, options);
2441 /* reorder for the new way: <rev> -- <path> */
2447 path = add_prefix(prefix, argv[--argc]);
2451 usage_with_options(blame_opt_usage, options);
2455 usage_with_options(blame_opt_usage, options);
2456 path = add_prefix(prefix, argv[argc - 1]);
2457 if (argc == 3 && !has_string_in_work_tree(path)) { /* (2b) */
2458 path = add_prefix(prefix, argv[1]);
2461 argv[argc - 1] = "--";
2464 if (!has_string_in_work_tree(path))
2465 die_errno("cannot stat path '%s'", path);
2468 revs.disable_stdin = 1;
2469 setup_revisions(argc, argv, &revs, NULL);
2470 memset(&sb, 0, sizeof(sb));
2474 final_commit_name = prepare_final(&sb);
2475 else if (contents_from)
2476 die("--contents and --children do not blend well.");
2478 final_commit_name = prepare_initial(&sb);
2482 * "--not A B -- path" without anything positive;
2483 * do not default to HEAD, but use the working tree
2487 sb.final = fake_working_tree_commit(&sb.revs->diffopt,
2488 path, contents_from);
2489 add_pending_object(&revs, &(sb.final->object), ":");
2491 else if (contents_from)
2492 die("Cannot use --contents with final commit object name");
2495 * If we have bottom, this will mark the ancestors of the
2496 * bottom commits we would reach while traversing as
2499 if (prepare_revision_walk(&revs))
2500 die("revision walk setup failed");
2502 if (is_null_sha1(sb.final->object.sha1)) {
2505 buf = xmalloc(o->file.size + 1);
2506 memcpy(buf, o->file.ptr, o->file.size + 1);
2508 sb.final_buf_size = o->file.size;
2511 o = get_origin(&sb, sb.final, path);
2512 if (fill_blob_sha1_and_mode(o))
2513 die("no such path %s in %s", path, final_commit_name);
2515 if (DIFF_OPT_TST(&sb.revs->diffopt, ALLOW_TEXTCONV) &&
2516 textconv_object(path, o->mode, o->blob_sha1, (char **) &sb.final_buf,
2517 &sb.final_buf_size))
2520 sb.final_buf = read_sha1_file(o->blob_sha1, &type,
2521 &sb.final_buf_size);
2524 die("Cannot read blob %s for path %s",
2525 sha1_to_hex(o->blob_sha1),
2529 lno = prepare_lines(&sb);
2533 prepare_blame_range(&sb, bottomtop, lno, &bottom, &top);
2534 if (bottom && top && top < bottom) {
2536 tmp = top; top = bottom; bottom = tmp;
2543 if (lno < top || lno < bottom)
2544 die("file %s has only %lu lines", path, lno);
2546 ent = xcalloc(1, sizeof(*ent));
2548 ent->num_lines = top - bottom;
2550 ent->s_lno = bottom;
2555 read_mailmap(&mailmap, NULL);
2560 assign_blame(&sb, opt);
2567 if (!(output_option & OUTPUT_PORCELAIN))
2568 find_alignment(&sb, &output_option);
2570 output(&sb, output_option);
2571 free((void *)sb.final_buf);
2572 for (ent = sb.ent; ent; ) {
2573 struct blame_entry *e = ent->next;
2579 printf("num read blob: %d\n", num_read_blob);
2580 printf("num get patch: %d\n", num_get_patch);
2581 printf("num commits: %d\n", num_commits);