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"
24 #include "line-range.h"
27 static char blame_usage[] = N_("git blame [options] [rev-opts] [rev] [--] file");
29 static const char *blame_opt_usage[] = {
32 N_("[rev-opts] are documented in git-rev-list(1)"),
36 static int longest_file;
37 static int longest_author;
38 static int max_orig_digits;
39 static int max_digits;
40 static int max_score_digits;
43 static int blank_boundary;
44 static int incremental;
46 static int abbrev = -1;
47 static int no_whole_file_rename;
49 static enum date_mode blame_date_mode = DATE_ISO8601;
50 static size_t blame_date_width;
52 static struct string_list mailmap;
59 static int num_read_blob;
60 static int num_get_patch;
61 static int num_commits;
63 #define PICKAXE_BLAME_MOVE 01
64 #define PICKAXE_BLAME_COPY 02
65 #define PICKAXE_BLAME_COPY_HARDER 04
66 #define PICKAXE_BLAME_COPY_HARDEST 010
69 * blame for a blame_entry with score lower than these thresholds
70 * is not passed to the parent using move/copy logic.
72 static unsigned blame_move_score;
73 static unsigned blame_copy_score;
74 #define BLAME_DEFAULT_MOVE_SCORE 20
75 #define BLAME_DEFAULT_COPY_SCORE 40
77 /* bits #0..7 in revision.h, #8..11 used for merge_bases() in commit.c */
78 #define METAINFO_SHOWN (1u<<12)
79 #define MORE_THAN_ONE_PATH (1u<<13)
82 * One blob in a commit that is being suspected
86 struct origin *previous;
87 struct commit *commit;
89 unsigned char blob_sha1[20];
91 char path[FLEX_ARRAY];
94 static int diff_hunks(mmfile_t *file_a, mmfile_t *file_b, long ctxlen,
95 xdl_emit_hunk_consume_func_t hunk_func, void *cb_data)
98 xdemitconf_t xecfg = {0};
99 xdemitcb_t ecb = {NULL};
101 xpp.flags = xdl_opts;
102 xecfg.ctxlen = ctxlen;
103 xecfg.hunk_func = hunk_func;
105 return xdi_diff(file_a, file_b, &xpp, &xecfg, &ecb);
109 * Prepare diff_filespec and convert it using diff textconv API
110 * if the textconv driver exists.
111 * Return 1 if the conversion succeeds, 0 otherwise.
113 int textconv_object(const char *path,
115 const unsigned char *sha1,
118 unsigned long *buf_size)
120 struct diff_filespec *df;
121 struct userdiff_driver *textconv;
123 df = alloc_filespec(path);
124 fill_filespec(df, sha1, sha1_valid, mode);
125 textconv = get_textconv(df);
131 *buf_size = fill_textconv(textconv, df, buf);
137 * Given an origin, prepare mmfile_t structure to be used by the
140 static void fill_origin_blob(struct diff_options *opt,
141 struct origin *o, mmfile_t *file)
144 enum object_type type;
145 unsigned long file_size;
148 if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
149 textconv_object(o->path, o->mode, o->blob_sha1, 1, &file->ptr, &file_size))
152 file->ptr = read_sha1_file(o->blob_sha1, &type, &file_size);
153 file->size = file_size;
156 die("Cannot read blob %s for path %s",
157 sha1_to_hex(o->blob_sha1),
166 * Origin is refcounted and usually we keep the blob contents to be
169 static inline struct origin *origin_incref(struct origin *o)
176 static void origin_decref(struct origin *o)
178 if (o && --o->refcnt <= 0) {
180 origin_decref(o->previous);
186 static void drop_origin_blob(struct origin *o)
195 * Each group of lines is described by a blame_entry; it can be split
196 * as we pass blame to the parents. They form a linked list in the
197 * scoreboard structure, sorted by the target line number.
200 struct blame_entry *next;
202 /* the first line of this group in the final image;
203 * internally all line numbers are 0 based.
207 /* how many lines this group has */
210 /* the commit that introduced this group into the final image */
211 struct origin *suspect;
213 /* true if the suspect is truly guilty; false while we have not
214 * checked if the group came from one of its parents.
218 /* true if the entry has been scanned for copies in the current parent
222 /* the line number of the first line of this group in the
223 * suspect's file; internally all line numbers are 0 based.
227 /* how significant this entry is -- cached to avoid
228 * scanning the lines over and over.
234 * The current state of the blame assignment.
237 /* the final commit (i.e. where we started digging from) */
238 struct commit *final;
239 struct rev_info *revs;
243 * The contents in the final image.
244 * Used by many functions to obtain contents of the nth line,
245 * indexed with scoreboard.lineno[blame_entry.lno].
247 const char *final_buf;
248 unsigned long final_buf_size;
250 /* linked list of blames */
251 struct blame_entry *ent;
253 /* look-up a line in the final buffer */
258 static void sanity_check_refcnt(struct scoreboard *);
261 * If two blame entries that are next to each other came from
262 * contiguous lines in the same origin (i.e. <commit, path> pair),
263 * merge them together.
265 static void coalesce(struct scoreboard *sb)
267 struct blame_entry *ent, *next;
269 for (ent = sb->ent; ent && (next = ent->next); ent = next) {
270 if (ent->suspect == next->suspect &&
271 ent->guilty == next->guilty &&
272 ent->s_lno + ent->num_lines == next->s_lno) {
273 ent->num_lines += next->num_lines;
274 ent->next = next->next;
275 origin_decref(next->suspect);
278 next = ent; /* again */
282 if (DEBUG) /* sanity */
283 sanity_check_refcnt(sb);
287 * Given a commit and a path in it, create a new origin structure.
288 * The callers that add blame to the scoreboard should use
289 * get_origin() to obtain shared, refcounted copy instead of calling
290 * this function directly.
292 static struct origin *make_origin(struct commit *commit, const char *path)
295 o = xcalloc(1, sizeof(*o) + strlen(path) + 1);
298 strcpy(o->path, path);
303 * Locate an existing origin or create a new one.
305 static struct origin *get_origin(struct scoreboard *sb,
306 struct commit *commit,
309 struct blame_entry *e;
311 for (e = sb->ent; e; e = e->next) {
312 if (e->suspect->commit == commit &&
313 !strcmp(e->suspect->path, path))
314 return origin_incref(e->suspect);
316 return make_origin(commit, path);
320 * Fill the blob_sha1 field of an origin if it hasn't, so that later
321 * call to fill_origin_blob() can use it to locate the data. blob_sha1
322 * for an origin is also used to pass the blame for the entire file to
323 * the parent to detect the case where a child's blob is identical to
324 * that of its parent's.
326 * This also fills origin->mode for corresponding tree path.
328 static int fill_blob_sha1_and_mode(struct origin *origin)
330 if (!is_null_sha1(origin->blob_sha1))
332 if (get_tree_entry(origin->commit->object.sha1,
334 origin->blob_sha1, &origin->mode))
336 if (sha1_object_info(origin->blob_sha1, NULL) != OBJ_BLOB)
340 hashclr(origin->blob_sha1);
341 origin->mode = S_IFINVALID;
346 * We have an origin -- check if the same path exists in the
347 * parent and return an origin structure to represent it.
349 static struct origin *find_origin(struct scoreboard *sb,
350 struct commit *parent,
351 struct origin *origin)
353 struct origin *porigin = NULL;
354 struct diff_options diff_opts;
355 const char *paths[2];
359 * Each commit object can cache one origin in that
360 * commit. This is a freestanding copy of origin and
363 struct origin *cached = parent->util;
364 if (!strcmp(cached->path, origin->path)) {
366 * The same path between origin and its parent
367 * without renaming -- the most common case.
369 porigin = get_origin(sb, parent, cached->path);
372 * If the origin was newly created (i.e. get_origin
373 * would call make_origin if none is found in the
374 * scoreboard), it does not know the blob_sha1/mode,
375 * so copy it. Otherwise porigin was in the
376 * scoreboard and already knows blob_sha1/mode.
378 if (porigin->refcnt == 1) {
379 hashcpy(porigin->blob_sha1, cached->blob_sha1);
380 porigin->mode = cached->mode;
384 /* otherwise it was not very useful; free it */
389 /* See if the origin->path is different between parent
390 * and origin first. Most of the time they are the
391 * same and diff-tree is fairly efficient about this.
393 diff_setup(&diff_opts);
394 DIFF_OPT_SET(&diff_opts, RECURSIVE);
395 diff_opts.detect_rename = 0;
396 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
397 paths[0] = origin->path;
400 parse_pathspec(&diff_opts.pathspec,
401 PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
402 PATHSPEC_LITERAL_PATH, "", paths);
403 diff_setup_done(&diff_opts);
405 if (is_null_sha1(origin->commit->object.sha1))
406 do_diff_cache(parent->tree->object.sha1, &diff_opts);
408 diff_tree_sha1(parent->tree->object.sha1,
409 origin->commit->tree->object.sha1,
411 diffcore_std(&diff_opts);
413 if (!diff_queued_diff.nr) {
414 /* The path is the same as parent */
415 porigin = get_origin(sb, parent, origin->path);
416 hashcpy(porigin->blob_sha1, origin->blob_sha1);
417 porigin->mode = origin->mode;
420 * Since origin->path is a pathspec, if the parent
421 * commit had it as a directory, we will see a whole
422 * bunch of deletion of files in the directory that we
426 struct diff_filepair *p = NULL;
427 for (i = 0; i < diff_queued_diff.nr; i++) {
429 p = diff_queued_diff.queue[i];
430 name = p->one->path ? p->one->path : p->two->path;
431 if (!strcmp(name, origin->path))
435 die("internal error in blame::find_origin");
438 die("internal error in blame::find_origin (%c)",
441 porigin = get_origin(sb, parent, origin->path);
442 hashcpy(porigin->blob_sha1, p->one->sha1);
443 porigin->mode = p->one->mode;
447 /* Did not exist in parent, or type changed */
451 diff_flush(&diff_opts);
452 free_pathspec(&diff_opts.pathspec);
455 * Create a freestanding copy that is not part of
456 * the refcounted origin found in the scoreboard, and
457 * cache it in the commit.
459 struct origin *cached;
461 cached = make_origin(porigin->commit, porigin->path);
462 hashcpy(cached->blob_sha1, porigin->blob_sha1);
463 cached->mode = porigin->mode;
464 parent->util = cached;
470 * We have an origin -- find the path that corresponds to it in its
471 * parent and return an origin structure to represent it.
473 static struct origin *find_rename(struct scoreboard *sb,
474 struct commit *parent,
475 struct origin *origin)
477 struct origin *porigin = NULL;
478 struct diff_options diff_opts;
481 diff_setup(&diff_opts);
482 DIFF_OPT_SET(&diff_opts, RECURSIVE);
483 diff_opts.detect_rename = DIFF_DETECT_RENAME;
484 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
485 diff_opts.single_follow = origin->path;
486 diff_setup_done(&diff_opts);
488 if (is_null_sha1(origin->commit->object.sha1))
489 do_diff_cache(parent->tree->object.sha1, &diff_opts);
491 diff_tree_sha1(parent->tree->object.sha1,
492 origin->commit->tree->object.sha1,
494 diffcore_std(&diff_opts);
496 for (i = 0; i < diff_queued_diff.nr; i++) {
497 struct diff_filepair *p = diff_queued_diff.queue[i];
498 if ((p->status == 'R' || p->status == 'C') &&
499 !strcmp(p->two->path, origin->path)) {
500 porigin = get_origin(sb, parent, p->one->path);
501 hashcpy(porigin->blob_sha1, p->one->sha1);
502 porigin->mode = p->one->mode;
506 diff_flush(&diff_opts);
507 free_pathspec(&diff_opts.pathspec);
512 * Link in a new blame entry to the scoreboard. Entries that cover the
513 * same line range have been removed from the scoreboard previously.
515 static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
517 struct blame_entry *ent, *prev = NULL;
519 origin_incref(e->suspect);
521 for (ent = sb->ent; ent && ent->lno < e->lno; ent = ent->next)
524 /* prev, if not NULL, is the last one that is below e */
527 e->next = prev->next;
537 * src typically is on-stack; we want to copy the information in it to
538 * a malloced blame_entry that is already on the linked list of the
539 * scoreboard. The origin of dst loses a refcnt while the origin of src
542 static void dup_entry(struct blame_entry *dst, struct blame_entry *src)
544 struct blame_entry *n;
547 origin_incref(src->suspect);
548 origin_decref(dst->suspect);
549 memcpy(dst, src, sizeof(*src));
554 static const char *nth_line(struct scoreboard *sb, long lno)
556 return sb->final_buf + sb->lineno[lno];
559 static const char *nth_line_cb(void *data, long lno)
561 return nth_line((struct scoreboard *)data, lno);
565 * It is known that lines between tlno to same came from parent, and e
566 * has an overlap with that range. it also is known that parent's
567 * line plno corresponds to e's line tlno.
573 * <------------------>
575 * Split e into potentially three parts; before this chunk, the chunk
576 * to be blamed for the parent, and after that portion.
578 static void split_overlap(struct blame_entry *split,
579 struct blame_entry *e,
580 int tlno, int plno, int same,
581 struct origin *parent)
584 memset(split, 0, sizeof(struct blame_entry [3]));
586 if (e->s_lno < tlno) {
587 /* there is a pre-chunk part not blamed on parent */
588 split[0].suspect = origin_incref(e->suspect);
589 split[0].lno = e->lno;
590 split[0].s_lno = e->s_lno;
591 split[0].num_lines = tlno - e->s_lno;
592 split[1].lno = e->lno + tlno - e->s_lno;
593 split[1].s_lno = plno;
596 split[1].lno = e->lno;
597 split[1].s_lno = plno + (e->s_lno - tlno);
600 if (same < e->s_lno + e->num_lines) {
601 /* there is a post-chunk part not blamed on parent */
602 split[2].suspect = origin_incref(e->suspect);
603 split[2].lno = e->lno + (same - e->s_lno);
604 split[2].s_lno = e->s_lno + (same - e->s_lno);
605 split[2].num_lines = e->s_lno + e->num_lines - same;
606 chunk_end_lno = split[2].lno;
609 chunk_end_lno = e->lno + e->num_lines;
610 split[1].num_lines = chunk_end_lno - split[1].lno;
613 * if it turns out there is nothing to blame the parent for,
614 * forget about the splitting. !split[1].suspect signals this.
616 if (split[1].num_lines < 1)
618 split[1].suspect = origin_incref(parent);
622 * split_overlap() divided an existing blame e into up to three parts
623 * in split. Adjust the linked list of blames in the scoreboard to
626 static void split_blame(struct scoreboard *sb,
627 struct blame_entry *split,
628 struct blame_entry *e)
630 struct blame_entry *new_entry;
632 if (split[0].suspect && split[2].suspect) {
633 /* The first part (reuse storage for the existing entry e) */
634 dup_entry(e, &split[0]);
636 /* The last part -- me */
637 new_entry = xmalloc(sizeof(*new_entry));
638 memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
639 add_blame_entry(sb, new_entry);
641 /* ... and the middle part -- parent */
642 new_entry = xmalloc(sizeof(*new_entry));
643 memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
644 add_blame_entry(sb, new_entry);
646 else if (!split[0].suspect && !split[2].suspect)
648 * The parent covers the entire area; reuse storage for
649 * e and replace it with the parent.
651 dup_entry(e, &split[1]);
652 else if (split[0].suspect) {
653 /* me and then parent */
654 dup_entry(e, &split[0]);
656 new_entry = xmalloc(sizeof(*new_entry));
657 memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
658 add_blame_entry(sb, new_entry);
661 /* parent and then me */
662 dup_entry(e, &split[1]);
664 new_entry = xmalloc(sizeof(*new_entry));
665 memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
666 add_blame_entry(sb, new_entry);
669 if (DEBUG) { /* sanity */
670 struct blame_entry *ent;
671 int lno = sb->ent->lno, corrupt = 0;
673 for (ent = sb->ent; ent; ent = ent->next) {
678 lno += ent->num_lines;
682 for (ent = sb->ent; ent; ent = ent->next) {
683 printf("L %8d l %8d n %8d\n",
684 lno, ent->lno, ent->num_lines);
685 lno = ent->lno + ent->num_lines;
693 * After splitting the blame, the origins used by the
694 * on-stack blame_entry should lose one refcnt each.
696 static void decref_split(struct blame_entry *split)
700 for (i = 0; i < 3; i++)
701 origin_decref(split[i].suspect);
705 * Helper for blame_chunk(). blame_entry e is known to overlap with
706 * the patch hunk; split it and pass blame to the parent.
708 static void blame_overlap(struct scoreboard *sb, struct blame_entry *e,
709 int tlno, int plno, int same,
710 struct origin *parent)
712 struct blame_entry split[3];
714 split_overlap(split, e, tlno, plno, same, parent);
715 if (split[1].suspect)
716 split_blame(sb, split, e);
721 * Find the line number of the last line the target is suspected for.
723 static int find_last_in_target(struct scoreboard *sb, struct origin *target)
725 struct blame_entry *e;
726 int last_in_target = -1;
728 for (e = sb->ent; e; e = e->next) {
729 if (e->guilty || e->suspect != target)
731 if (last_in_target < e->s_lno + e->num_lines)
732 last_in_target = e->s_lno + e->num_lines;
734 return last_in_target;
738 * Process one hunk from the patch between the current suspect for
739 * blame_entry e and its parent. Find and split the overlap, and
740 * pass blame to the overlapping part to the parent.
742 static void blame_chunk(struct scoreboard *sb,
743 int tlno, int plno, int same,
744 struct origin *target, struct origin *parent)
746 struct blame_entry *e;
748 for (e = sb->ent; e; e = e->next) {
749 if (e->guilty || e->suspect != target)
751 if (same <= e->s_lno)
753 if (tlno < e->s_lno + e->num_lines)
754 blame_overlap(sb, e, tlno, plno, same, parent);
758 struct blame_chunk_cb_data {
759 struct scoreboard *sb;
760 struct origin *target;
761 struct origin *parent;
766 static int blame_chunk_cb(long start_a, long count_a,
767 long start_b, long count_b, void *data)
769 struct blame_chunk_cb_data *d = data;
770 blame_chunk(d->sb, d->tlno, d->plno, start_b, d->target, d->parent);
771 d->plno = start_a + count_a;
772 d->tlno = start_b + count_b;
777 * We are looking at the origin 'target' and aiming to pass blame
778 * for the lines it is suspected to its parent. Run diff to find
779 * which lines came from parent and pass blame for them.
781 static int pass_blame_to_parent(struct scoreboard *sb,
782 struct origin *target,
783 struct origin *parent)
786 mmfile_t file_p, file_o;
787 struct blame_chunk_cb_data d;
789 memset(&d, 0, sizeof(d));
790 d.sb = sb; d.target = target; d.parent = parent;
791 last_in_target = find_last_in_target(sb, target);
792 if (last_in_target < 0)
793 return 1; /* nothing remains for this target */
795 fill_origin_blob(&sb->revs->diffopt, parent, &file_p);
796 fill_origin_blob(&sb->revs->diffopt, target, &file_o);
799 diff_hunks(&file_p, &file_o, 0, blame_chunk_cb, &d);
800 /* The rest (i.e. anything after tlno) are the same as the parent */
801 blame_chunk(sb, d.tlno, d.plno, last_in_target, target, parent);
807 * The lines in blame_entry after splitting blames many times can become
808 * very small and trivial, and at some point it becomes pointless to
809 * blame the parents. E.g. "\t\t}\n\t}\n\n" appears everywhere in any
810 * ordinary C program, and it is not worth to say it was copied from
811 * totally unrelated file in the parent.
813 * Compute how trivial the lines in the blame_entry are.
815 static unsigned ent_score(struct scoreboard *sb, struct blame_entry *e)
824 cp = nth_line(sb, e->lno);
825 ep = nth_line(sb, e->lno + e->num_lines);
827 unsigned ch = *((unsigned char *)cp);
837 * best_so_far[] and this[] are both a split of an existing blame_entry
838 * that passes blame to the parent. Maintain best_so_far the best split
839 * so far, by comparing this and best_so_far and copying this into
840 * bst_so_far as needed.
842 static void copy_split_if_better(struct scoreboard *sb,
843 struct blame_entry *best_so_far,
844 struct blame_entry *this)
848 if (!this[1].suspect)
850 if (best_so_far[1].suspect) {
851 if (ent_score(sb, &this[1]) < ent_score(sb, &best_so_far[1]))
855 for (i = 0; i < 3; i++)
856 origin_incref(this[i].suspect);
857 decref_split(best_so_far);
858 memcpy(best_so_far, this, sizeof(struct blame_entry [3]));
862 * We are looking at a part of the final image represented by
863 * ent (tlno and same are offset by ent->s_lno).
864 * tlno is where we are looking at in the final image.
865 * up to (but not including) same match preimage.
866 * plno is where we are looking at in the preimage.
868 * <-------------- final image ---------------------->
871 * <---------preimage----->
874 * All line numbers are 0-based.
876 static void handle_split(struct scoreboard *sb,
877 struct blame_entry *ent,
878 int tlno, int plno, int same,
879 struct origin *parent,
880 struct blame_entry *split)
882 if (ent->num_lines <= tlno)
885 struct blame_entry this[3];
888 split_overlap(this, ent, tlno, plno, same, parent);
889 copy_split_if_better(sb, split, this);
894 struct handle_split_cb_data {
895 struct scoreboard *sb;
896 struct blame_entry *ent;
897 struct origin *parent;
898 struct blame_entry *split;
903 static int handle_split_cb(long start_a, long count_a,
904 long start_b, long count_b, void *data)
906 struct handle_split_cb_data *d = data;
907 handle_split(d->sb, d->ent, d->tlno, d->plno, start_b, d->parent,
909 d->plno = start_a + count_a;
910 d->tlno = start_b + count_b;
915 * Find the lines from parent that are the same as ent so that
916 * we can pass blames to it. file_p has the blob contents for
919 static void find_copy_in_blob(struct scoreboard *sb,
920 struct blame_entry *ent,
921 struct origin *parent,
922 struct blame_entry *split,
927 struct handle_split_cb_data d;
929 memset(&d, 0, sizeof(d));
930 d.sb = sb; d.ent = ent; d.parent = parent; d.split = split;
932 * Prepare mmfile that contains only the lines in ent.
934 cp = nth_line(sb, ent->lno);
935 file_o.ptr = (char *) cp;
936 file_o.size = nth_line(sb, ent->lno + ent->num_lines) - cp;
939 * file_o is a part of final image we are annotating.
940 * file_p partially may match that image.
942 memset(split, 0, sizeof(struct blame_entry [3]));
943 diff_hunks(file_p, &file_o, 1, handle_split_cb, &d);
944 /* remainder, if any, all match the preimage */
945 handle_split(sb, ent, d.tlno, d.plno, ent->num_lines, parent, split);
949 * See if lines currently target is suspected for can be attributed to
952 static int find_move_in_parent(struct scoreboard *sb,
953 struct origin *target,
954 struct origin *parent)
956 int last_in_target, made_progress;
957 struct blame_entry *e, split[3];
960 last_in_target = find_last_in_target(sb, target);
961 if (last_in_target < 0)
962 return 1; /* nothing remains for this target */
964 fill_origin_blob(&sb->revs->diffopt, parent, &file_p);
969 while (made_progress) {
971 for (e = sb->ent; e; e = e->next) {
972 if (e->guilty || e->suspect != target ||
973 ent_score(sb, e) < blame_move_score)
975 find_copy_in_blob(sb, e, parent, split, &file_p);
976 if (split[1].suspect &&
977 blame_move_score < ent_score(sb, &split[1])) {
978 split_blame(sb, split, e);
988 struct blame_entry *ent;
989 struct blame_entry split[3];
993 * Count the number of entries the target is suspected for,
994 * and prepare a list of entry and the best split.
996 static struct blame_list *setup_blame_list(struct scoreboard *sb,
997 struct origin *target,
1001 struct blame_entry *e;
1003 struct blame_list *blame_list = NULL;
1005 for (e = sb->ent, num_ents = 0; e; e = e->next)
1006 if (!e->scanned && !e->guilty &&
1007 e->suspect == target &&
1008 min_score < ent_score(sb, e))
1011 blame_list = xcalloc(num_ents, sizeof(struct blame_list));
1012 for (e = sb->ent, i = 0; e; e = e->next)
1013 if (!e->scanned && !e->guilty &&
1014 e->suspect == target &&
1015 min_score < ent_score(sb, e))
1016 blame_list[i++].ent = e;
1018 *num_ents_p = num_ents;
1023 * Reset the scanned status on all entries.
1025 static void reset_scanned_flag(struct scoreboard *sb)
1027 struct blame_entry *e;
1028 for (e = sb->ent; e; e = e->next)
1033 * For lines target is suspected for, see if we can find code movement
1034 * across file boundary from the parent commit. porigin is the path
1035 * in the parent we already tried.
1037 static int find_copy_in_parent(struct scoreboard *sb,
1038 struct origin *target,
1039 struct commit *parent,
1040 struct origin *porigin,
1043 struct diff_options diff_opts;
1046 struct blame_list *blame_list;
1049 blame_list = setup_blame_list(sb, target, blame_copy_score, &num_ents);
1051 return 1; /* nothing remains for this target */
1053 diff_setup(&diff_opts);
1054 DIFF_OPT_SET(&diff_opts, RECURSIVE);
1055 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1057 diff_setup_done(&diff_opts);
1059 /* Try "find copies harder" on new path if requested;
1060 * we do not want to use diffcore_rename() actually to
1061 * match things up; find_copies_harder is set only to
1062 * force diff_tree_sha1() to feed all filepairs to diff_queue,
1063 * and this code needs to be after diff_setup_done(), which
1064 * usually makes find-copies-harder imply copy detection.
1066 if ((opt & PICKAXE_BLAME_COPY_HARDEST)
1067 || ((opt & PICKAXE_BLAME_COPY_HARDER)
1068 && (!porigin || strcmp(target->path, porigin->path))))
1069 DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
1071 if (is_null_sha1(target->commit->object.sha1))
1072 do_diff_cache(parent->tree->object.sha1, &diff_opts);
1074 diff_tree_sha1(parent->tree->object.sha1,
1075 target->commit->tree->object.sha1,
1078 if (!DIFF_OPT_TST(&diff_opts, FIND_COPIES_HARDER))
1079 diffcore_std(&diff_opts);
1083 int made_progress = 0;
1085 for (i = 0; i < diff_queued_diff.nr; i++) {
1086 struct diff_filepair *p = diff_queued_diff.queue[i];
1087 struct origin *norigin;
1089 struct blame_entry this[3];
1091 if (!DIFF_FILE_VALID(p->one))
1092 continue; /* does not exist in parent */
1093 if (S_ISGITLINK(p->one->mode))
1094 continue; /* ignore git links */
1095 if (porigin && !strcmp(p->one->path, porigin->path))
1096 /* find_move already dealt with this path */
1099 norigin = get_origin(sb, parent, p->one->path);
1100 hashcpy(norigin->blob_sha1, p->one->sha1);
1101 norigin->mode = p->one->mode;
1102 fill_origin_blob(&sb->revs->diffopt, norigin, &file_p);
1106 for (j = 0; j < num_ents; j++) {
1107 find_copy_in_blob(sb, blame_list[j].ent,
1108 norigin, this, &file_p);
1109 copy_split_if_better(sb, blame_list[j].split,
1113 origin_decref(norigin);
1116 for (j = 0; j < num_ents; j++) {
1117 struct blame_entry *split = blame_list[j].split;
1118 if (split[1].suspect &&
1119 blame_copy_score < ent_score(sb, &split[1])) {
1120 split_blame(sb, split, blame_list[j].ent);
1124 blame_list[j].ent->scanned = 1;
1125 decref_split(split);
1131 blame_list = setup_blame_list(sb, target, blame_copy_score, &num_ents);
1137 reset_scanned_flag(sb);
1138 diff_flush(&diff_opts);
1139 free_pathspec(&diff_opts.pathspec);
1144 * The blobs of origin and porigin exactly match, so everything
1145 * origin is suspected for can be blamed on the parent.
1147 static void pass_whole_blame(struct scoreboard *sb,
1148 struct origin *origin, struct origin *porigin)
1150 struct blame_entry *e;
1152 if (!porigin->file.ptr && origin->file.ptr) {
1153 /* Steal its file */
1154 porigin->file = origin->file;
1155 origin->file.ptr = NULL;
1157 for (e = sb->ent; e; e = e->next) {
1158 if (e->suspect != origin)
1160 origin_incref(porigin);
1161 origin_decref(e->suspect);
1162 e->suspect = porigin;
1167 * We pass blame from the current commit to its parents. We keep saying
1168 * "parent" (and "porigin"), but what we mean is to find scapegoat to
1169 * exonerate ourselves.
1171 static struct commit_list *first_scapegoat(struct rev_info *revs, struct commit *commit)
1174 return commit->parents;
1175 return lookup_decoration(&revs->children, &commit->object);
1178 static int num_scapegoats(struct rev_info *revs, struct commit *commit)
1181 struct commit_list *l = first_scapegoat(revs, commit);
1182 for (cnt = 0; l; l = l->next)
1189 static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)
1191 struct rev_info *revs = sb->revs;
1192 int i, pass, num_sg;
1193 struct commit *commit = origin->commit;
1194 struct commit_list *sg;
1195 struct origin *sg_buf[MAXSG];
1196 struct origin *porigin, **sg_origin = sg_buf;
1198 num_sg = num_scapegoats(revs, commit);
1201 else if (num_sg < ARRAY_SIZE(sg_buf))
1202 memset(sg_buf, 0, sizeof(sg_buf));
1204 sg_origin = xcalloc(num_sg, sizeof(*sg_origin));
1207 * The first pass looks for unrenamed path to optimize for
1208 * common cases, then we look for renames in the second pass.
1210 for (pass = 0; pass < 2 - no_whole_file_rename; pass++) {
1211 struct origin *(*find)(struct scoreboard *,
1212 struct commit *, struct origin *);
1213 find = pass ? find_rename : find_origin;
1215 for (i = 0, sg = first_scapegoat(revs, commit);
1217 sg = sg->next, i++) {
1218 struct commit *p = sg->item;
1223 if (parse_commit(p))
1225 porigin = find(sb, p, origin);
1228 if (!hashcmp(porigin->blob_sha1, origin->blob_sha1)) {
1229 pass_whole_blame(sb, origin, porigin);
1230 origin_decref(porigin);
1233 for (j = same = 0; j < i; j++)
1235 !hashcmp(sg_origin[j]->blob_sha1,
1236 porigin->blob_sha1)) {
1241 sg_origin[i] = porigin;
1243 origin_decref(porigin);
1248 for (i = 0, sg = first_scapegoat(revs, commit);
1250 sg = sg->next, i++) {
1251 struct origin *porigin = sg_origin[i];
1254 if (!origin->previous) {
1255 origin_incref(porigin);
1256 origin->previous = porigin;
1258 if (pass_blame_to_parent(sb, origin, porigin))
1263 * Optionally find moves in parents' files.
1265 if (opt & PICKAXE_BLAME_MOVE)
1266 for (i = 0, sg = first_scapegoat(revs, commit);
1268 sg = sg->next, i++) {
1269 struct origin *porigin = sg_origin[i];
1272 if (find_move_in_parent(sb, origin, porigin))
1277 * Optionally find copies from parents' files.
1279 if (opt & PICKAXE_BLAME_COPY)
1280 for (i = 0, sg = first_scapegoat(revs, commit);
1282 sg = sg->next, i++) {
1283 struct origin *porigin = sg_origin[i];
1284 if (find_copy_in_parent(sb, origin, sg->item,
1290 for (i = 0; i < num_sg; i++) {
1292 drop_origin_blob(sg_origin[i]);
1293 origin_decref(sg_origin[i]);
1296 drop_origin_blob(origin);
1297 if (sg_buf != sg_origin)
1302 * Information on commits, used for output.
1304 struct commit_info {
1305 struct strbuf author;
1306 struct strbuf author_mail;
1307 unsigned long author_time;
1308 struct strbuf author_tz;
1310 /* filled only when asked for details */
1311 struct strbuf committer;
1312 struct strbuf committer_mail;
1313 unsigned long committer_time;
1314 struct strbuf committer_tz;
1316 struct strbuf summary;
1320 * Parse author/committer line in the commit object buffer
1322 static void get_ac_line(const char *inbuf, const char *what,
1323 struct strbuf *name, struct strbuf *mail,
1324 unsigned long *time, struct strbuf *tz)
1326 struct ident_split ident;
1327 size_t len, maillen, namelen;
1329 const char *namebuf, *mailbuf;
1331 tmp = strstr(inbuf, what);
1334 tmp += strlen(what);
1335 endp = strchr(tmp, '\n');
1341 if (split_ident_line(&ident, tmp, len)) {
1345 strbuf_addstr(name, tmp);
1346 strbuf_addstr(mail, tmp);
1347 strbuf_addstr(tz, tmp);
1352 namelen = ident.name_end - ident.name_begin;
1353 namebuf = ident.name_begin;
1355 maillen = ident.mail_end - ident.mail_begin;
1356 mailbuf = ident.mail_begin;
1358 if (ident.date_begin && ident.date_end)
1359 *time = strtoul(ident.date_begin, NULL, 10);
1363 if (ident.tz_begin && ident.tz_end)
1364 strbuf_add(tz, ident.tz_begin, ident.tz_end - ident.tz_begin);
1366 strbuf_addstr(tz, "(unknown)");
1369 * Now, convert both name and e-mail using mailmap
1371 map_user(&mailmap, &mailbuf, &maillen,
1372 &namebuf, &namelen);
1374 strbuf_addf(mail, "<%.*s>", (int)maillen, mailbuf);
1375 strbuf_add(name, namebuf, namelen);
1378 static void commit_info_init(struct commit_info *ci)
1381 strbuf_init(&ci->author, 0);
1382 strbuf_init(&ci->author_mail, 0);
1383 strbuf_init(&ci->author_tz, 0);
1384 strbuf_init(&ci->committer, 0);
1385 strbuf_init(&ci->committer_mail, 0);
1386 strbuf_init(&ci->committer_tz, 0);
1387 strbuf_init(&ci->summary, 0);
1390 static void commit_info_destroy(struct commit_info *ci)
1393 strbuf_release(&ci->author);
1394 strbuf_release(&ci->author_mail);
1395 strbuf_release(&ci->author_tz);
1396 strbuf_release(&ci->committer);
1397 strbuf_release(&ci->committer_mail);
1398 strbuf_release(&ci->committer_tz);
1399 strbuf_release(&ci->summary);
1402 static void get_commit_info(struct commit *commit,
1403 struct commit_info *ret,
1407 const char *subject, *encoding;
1410 commit_info_init(ret);
1412 encoding = get_log_output_encoding();
1413 message = logmsg_reencode(commit, NULL, encoding);
1414 get_ac_line(message, "\nauthor ",
1415 &ret->author, &ret->author_mail,
1416 &ret->author_time, &ret->author_tz);
1419 logmsg_free(message, commit);
1423 get_ac_line(message, "\ncommitter ",
1424 &ret->committer, &ret->committer_mail,
1425 &ret->committer_time, &ret->committer_tz);
1427 len = find_commit_subject(message, &subject);
1429 strbuf_add(&ret->summary, subject, len);
1431 strbuf_addf(&ret->summary, "(%s)", sha1_to_hex(commit->object.sha1));
1433 logmsg_free(message, commit);
1437 * To allow LF and other nonportable characters in pathnames,
1438 * they are c-style quoted as needed.
1440 static void write_filename_info(const char *path)
1442 printf("filename ");
1443 write_name_quoted(path, stdout, '\n');
1447 * Porcelain/Incremental format wants to show a lot of details per
1448 * commit. Instead of repeating this every line, emit it only once,
1449 * the first time each commit appears in the output (unless the
1450 * user has specifically asked for us to repeat).
1452 static int emit_one_suspect_detail(struct origin *suspect, int repeat)
1454 struct commit_info ci;
1456 if (!repeat && (suspect->commit->object.flags & METAINFO_SHOWN))
1459 suspect->commit->object.flags |= METAINFO_SHOWN;
1460 get_commit_info(suspect->commit, &ci, 1);
1461 printf("author %s\n", ci.author.buf);
1462 printf("author-mail %s\n", ci.author_mail.buf);
1463 printf("author-time %lu\n", ci.author_time);
1464 printf("author-tz %s\n", ci.author_tz.buf);
1465 printf("committer %s\n", ci.committer.buf);
1466 printf("committer-mail %s\n", ci.committer_mail.buf);
1467 printf("committer-time %lu\n", ci.committer_time);
1468 printf("committer-tz %s\n", ci.committer_tz.buf);
1469 printf("summary %s\n", ci.summary.buf);
1470 if (suspect->commit->object.flags & UNINTERESTING)
1471 printf("boundary\n");
1472 if (suspect->previous) {
1473 struct origin *prev = suspect->previous;
1474 printf("previous %s ", sha1_to_hex(prev->commit->object.sha1));
1475 write_name_quoted(prev->path, stdout, '\n');
1478 commit_info_destroy(&ci);
1484 * The blame_entry is found to be guilty for the range. Mark it
1485 * as such, and show it in incremental output.
1487 static void found_guilty_entry(struct blame_entry *ent)
1493 struct origin *suspect = ent->suspect;
1495 printf("%s %d %d %d\n",
1496 sha1_to_hex(suspect->commit->object.sha1),
1497 ent->s_lno + 1, ent->lno + 1, ent->num_lines);
1498 emit_one_suspect_detail(suspect, 0);
1499 write_filename_info(suspect->path);
1500 maybe_flush_or_die(stdout, "stdout");
1505 * The main loop -- while the scoreboard has lines whose true origin
1506 * is still unknown, pick one blame_entry, and allow its current
1507 * suspect to pass blames to its parents.
1509 static void assign_blame(struct scoreboard *sb, int opt)
1511 struct rev_info *revs = sb->revs;
1514 struct blame_entry *ent;
1515 struct commit *commit;
1516 struct origin *suspect = NULL;
1518 /* find one suspect to break down */
1519 for (ent = sb->ent; !suspect && ent; ent = ent->next)
1521 suspect = ent->suspect;
1523 return; /* all done */
1526 * We will use this suspect later in the loop,
1527 * so hold onto it in the meantime.
1529 origin_incref(suspect);
1530 commit = suspect->commit;
1531 parse_commit(commit);
1533 (!(commit->object.flags & UNINTERESTING) &&
1534 !(revs->max_age != -1 && commit->date < revs->max_age)))
1535 pass_blame(sb, suspect, opt);
1537 commit->object.flags |= UNINTERESTING;
1538 if (commit->object.parsed)
1539 mark_parents_uninteresting(commit);
1541 /* treat root commit as boundary */
1542 if (!commit->parents && !show_root)
1543 commit->object.flags |= UNINTERESTING;
1545 /* Take responsibility for the remaining entries */
1546 for (ent = sb->ent; ent; ent = ent->next)
1547 if (ent->suspect == suspect)
1548 found_guilty_entry(ent);
1549 origin_decref(suspect);
1551 if (DEBUG) /* sanity */
1552 sanity_check_refcnt(sb);
1556 static const char *format_time(unsigned long time, const char *tz_str,
1559 static char time_buf[128];
1561 if (show_raw_time) {
1562 snprintf(time_buf, sizeof(time_buf), "%lu %s", time, tz_str);
1565 const char *time_str;
1569 time_str = show_date(time, tz, blame_date_mode);
1570 time_len = strlen(time_str);
1571 memcpy(time_buf, time_str, time_len);
1572 memset(time_buf + time_len, ' ', blame_date_width - time_len);
1577 #define OUTPUT_ANNOTATE_COMPAT 001
1578 #define OUTPUT_LONG_OBJECT_NAME 002
1579 #define OUTPUT_RAW_TIMESTAMP 004
1580 #define OUTPUT_PORCELAIN 010
1581 #define OUTPUT_SHOW_NAME 020
1582 #define OUTPUT_SHOW_NUMBER 040
1583 #define OUTPUT_SHOW_SCORE 0100
1584 #define OUTPUT_NO_AUTHOR 0200
1585 #define OUTPUT_SHOW_EMAIL 0400
1586 #define OUTPUT_LINE_PORCELAIN 01000
1588 static void emit_porcelain_details(struct origin *suspect, int repeat)
1590 if (emit_one_suspect_detail(suspect, repeat) ||
1591 (suspect->commit->object.flags & MORE_THAN_ONE_PATH))
1592 write_filename_info(suspect->path);
1595 static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent,
1598 int repeat = opt & OUTPUT_LINE_PORCELAIN;
1601 struct origin *suspect = ent->suspect;
1604 strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
1605 printf("%s%c%d %d %d\n",
1607 ent->guilty ? ' ' : '*', /* purely for debugging */
1611 emit_porcelain_details(suspect, repeat);
1613 cp = nth_line(sb, ent->lno);
1614 for (cnt = 0; cnt < ent->num_lines; cnt++) {
1617 printf("%s %d %d\n", hex,
1618 ent->s_lno + 1 + cnt,
1619 ent->lno + 1 + cnt);
1621 emit_porcelain_details(suspect, 1);
1627 } while (ch != '\n' &&
1628 cp < sb->final_buf + sb->final_buf_size);
1631 if (sb->final_buf_size && cp[-1] != '\n')
1635 static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
1639 struct origin *suspect = ent->suspect;
1640 struct commit_info ci;
1642 int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
1644 get_commit_info(suspect->commit, &ci, 1);
1645 strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
1647 cp = nth_line(sb, ent->lno);
1648 for (cnt = 0; cnt < ent->num_lines; cnt++) {
1650 int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? 40 : abbrev;
1652 if (suspect->commit->object.flags & UNINTERESTING) {
1654 memset(hex, ' ', length);
1655 else if (!(opt & OUTPUT_ANNOTATE_COMPAT)) {
1661 printf("%.*s", length, hex);
1662 if (opt & OUTPUT_ANNOTATE_COMPAT) {
1664 if (opt & OUTPUT_SHOW_EMAIL)
1665 name = ci.author_mail.buf;
1667 name = ci.author.buf;
1668 printf("\t(%10s\t%10s\t%d)", name,
1669 format_time(ci.author_time, ci.author_tz.buf,
1671 ent->lno + 1 + cnt);
1673 if (opt & OUTPUT_SHOW_SCORE)
1675 max_score_digits, ent->score,
1676 ent->suspect->refcnt);
1677 if (opt & OUTPUT_SHOW_NAME)
1678 printf(" %-*.*s", longest_file, longest_file,
1680 if (opt & OUTPUT_SHOW_NUMBER)
1681 printf(" %*d", max_orig_digits,
1682 ent->s_lno + 1 + cnt);
1684 if (!(opt & OUTPUT_NO_AUTHOR)) {
1687 if (opt & OUTPUT_SHOW_EMAIL)
1688 name = ci.author_mail.buf;
1690 name = ci.author.buf;
1691 pad = longest_author - utf8_strwidth(name);
1692 printf(" (%s%*s %10s",
1694 format_time(ci.author_time,
1699 max_digits, ent->lno + 1 + cnt);
1704 } while (ch != '\n' &&
1705 cp < sb->final_buf + sb->final_buf_size);
1708 if (sb->final_buf_size && cp[-1] != '\n')
1711 commit_info_destroy(&ci);
1714 static void output(struct scoreboard *sb, int option)
1716 struct blame_entry *ent;
1718 if (option & OUTPUT_PORCELAIN) {
1719 for (ent = sb->ent; ent; ent = ent->next) {
1720 struct blame_entry *oth;
1721 struct origin *suspect = ent->suspect;
1722 struct commit *commit = suspect->commit;
1723 if (commit->object.flags & MORE_THAN_ONE_PATH)
1725 for (oth = ent->next; oth; oth = oth->next) {
1726 if ((oth->suspect->commit != commit) ||
1727 !strcmp(oth->suspect->path, suspect->path))
1729 commit->object.flags |= MORE_THAN_ONE_PATH;
1735 for (ent = sb->ent; ent; ent = ent->next) {
1736 if (option & OUTPUT_PORCELAIN)
1737 emit_porcelain(sb, ent, option);
1739 emit_other(sb, ent, option);
1745 * To allow quick access to the contents of nth line in the
1746 * final image, prepare an index in the scoreboard.
1748 static int prepare_lines(struct scoreboard *sb)
1750 const char *buf = sb->final_buf;
1751 unsigned long len = sb->final_buf_size;
1752 const char *end = buf + len;
1755 int num = 0, incomplete = 0;
1758 p = memchr(p, '\n', end - p);
1767 if (len && end[-1] != '\n')
1768 incomplete++; /* incomplete line at the end */
1770 sb->lineno = xmalloc(sizeof(*sb->lineno) * (num + incomplete + 1));
1771 lineno = sb->lineno;
1775 p = memchr(p, '\n', end - p);
1778 *lineno++ = p - buf;
1787 sb->num_lines = num + incomplete;
1788 return sb->num_lines;
1792 * Add phony grafts for use with -S; this is primarily to
1793 * support git's cvsserver that wants to give a linear history
1796 static int read_ancestry(const char *graft_file)
1798 FILE *fp = fopen(graft_file, "r");
1799 struct strbuf buf = STRBUF_INIT;
1802 while (!strbuf_getwholeline(&buf, fp, '\n')) {
1803 /* The format is just "Commit Parent1 Parent2 ...\n" */
1804 struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
1806 register_commit_graft(graft, 0);
1809 strbuf_release(&buf);
1813 static int update_auto_abbrev(int auto_abbrev, struct origin *suspect)
1815 const char *uniq = find_unique_abbrev(suspect->commit->object.sha1,
1817 int len = strlen(uniq);
1818 if (auto_abbrev < len)
1824 * How many columns do we need to show line numbers, authors,
1827 static void find_alignment(struct scoreboard *sb, int *option)
1829 int longest_src_lines = 0;
1830 int longest_dst_lines = 0;
1831 unsigned largest_score = 0;
1832 struct blame_entry *e;
1833 int compute_auto_abbrev = (abbrev < 0);
1834 int auto_abbrev = default_abbrev;
1836 for (e = sb->ent; e; e = e->next) {
1837 struct origin *suspect = e->suspect;
1838 struct commit_info ci;
1841 if (compute_auto_abbrev)
1842 auto_abbrev = update_auto_abbrev(auto_abbrev, suspect);
1843 if (strcmp(suspect->path, sb->path))
1844 *option |= OUTPUT_SHOW_NAME;
1845 num = strlen(suspect->path);
1846 if (longest_file < num)
1848 if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
1849 suspect->commit->object.flags |= METAINFO_SHOWN;
1850 get_commit_info(suspect->commit, &ci, 1);
1851 if (*option & OUTPUT_SHOW_EMAIL)
1852 num = utf8_strwidth(ci.author_mail.buf);
1854 num = utf8_strwidth(ci.author.buf);
1855 if (longest_author < num)
1856 longest_author = num;
1858 num = e->s_lno + e->num_lines;
1859 if (longest_src_lines < num)
1860 longest_src_lines = num;
1861 num = e->lno + e->num_lines;
1862 if (longest_dst_lines < num)
1863 longest_dst_lines = num;
1864 if (largest_score < ent_score(sb, e))
1865 largest_score = ent_score(sb, e);
1867 commit_info_destroy(&ci);
1869 max_orig_digits = decimal_width(longest_src_lines);
1870 max_digits = decimal_width(longest_dst_lines);
1871 max_score_digits = decimal_width(largest_score);
1873 if (compute_auto_abbrev)
1874 /* one more abbrev length is needed for the boundary commit */
1875 abbrev = auto_abbrev + 1;
1879 * For debugging -- origin is refcounted, and this asserts that
1880 * we do not underflow.
1882 static void sanity_check_refcnt(struct scoreboard *sb)
1885 struct blame_entry *ent;
1887 for (ent = sb->ent; ent; ent = ent->next) {
1888 /* Nobody should have zero or negative refcnt */
1889 if (ent->suspect->refcnt <= 0) {
1890 fprintf(stderr, "%s in %s has negative refcnt %d\n",
1892 sha1_to_hex(ent->suspect->commit->object.sha1),
1893 ent->suspect->refcnt);
1899 find_alignment(sb, &opt);
1901 die("Baa %d!", baa);
1906 * Used for the command line parsing; check if the path exists
1907 * in the working tree.
1909 static int has_string_in_work_tree(const char *path)
1912 return !lstat(path, &st);
1915 static unsigned parse_score(const char *arg)
1918 unsigned long score = strtoul(arg, &end, 10);
1924 static const char *add_prefix(const char *prefix, const char *path)
1926 return prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
1929 static int git_blame_config(const char *var, const char *value, void *cb)
1931 if (!strcmp(var, "blame.showroot")) {
1932 show_root = git_config_bool(var, value);
1935 if (!strcmp(var, "blame.blankboundary")) {
1936 blank_boundary = git_config_bool(var, value);
1939 if (!strcmp(var, "blame.date")) {
1941 return config_error_nonbool(var);
1942 blame_date_mode = parse_date_format(value);
1946 if (userdiff_config(var, value) < 0)
1949 return git_default_config(var, value, cb);
1952 static void verify_working_tree_path(struct commit *work_tree, const char *path)
1954 struct commit_list *parents;
1956 for (parents = work_tree->parents; parents; parents = parents->next) {
1957 const unsigned char *commit_sha1 = parents->item->object.sha1;
1958 unsigned char blob_sha1[20];
1961 if (!get_tree_entry(commit_sha1, path, blob_sha1, &mode) &&
1962 sha1_object_info(blob_sha1, NULL) == OBJ_BLOB)
1965 die("no such path '%s' in HEAD", path);
1968 static struct commit_list **append_parent(struct commit_list **tail, const unsigned char *sha1)
1970 struct commit *parent;
1972 parent = lookup_commit_reference(sha1);
1974 die("no such commit %s", sha1_to_hex(sha1));
1975 return &commit_list_insert(parent, tail)->next;
1978 static void append_merge_parents(struct commit_list **tail)
1981 const char *merge_head_file = git_path("MERGE_HEAD");
1982 struct strbuf line = STRBUF_INIT;
1984 merge_head = open(merge_head_file, O_RDONLY);
1985 if (merge_head < 0) {
1986 if (errno == ENOENT)
1988 die("cannot open '%s' for reading", merge_head_file);
1991 while (!strbuf_getwholeline_fd(&line, merge_head, '\n')) {
1992 unsigned char sha1[20];
1993 if (line.len < 40 || get_sha1_hex(line.buf, sha1))
1994 die("unknown line in '%s': %s", merge_head_file, line.buf);
1995 tail = append_parent(tail, sha1);
1998 strbuf_release(&line);
2002 * Prepare a dummy commit that represents the work tree (or staged) item.
2003 * Note that annotating work tree item never works in the reverse.
2005 static struct commit *fake_working_tree_commit(struct diff_options *opt,
2007 const char *contents_from)
2009 struct commit *commit;
2010 struct origin *origin;
2011 struct commit_list **parent_tail, *parent;
2012 unsigned char head_sha1[20];
2013 struct strbuf buf = STRBUF_INIT;
2017 struct cache_entry *ce;
2019 struct strbuf msg = STRBUF_INIT;
2022 commit = xcalloc(1, sizeof(*commit));
2023 commit->object.parsed = 1;
2025 commit->object.type = OBJ_COMMIT;
2026 parent_tail = &commit->parents;
2028 if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL))
2029 die("no such ref: HEAD");
2031 parent_tail = append_parent(parent_tail, head_sha1);
2032 append_merge_parents(parent_tail);
2033 verify_working_tree_path(commit, path);
2035 origin = make_origin(commit, path);
2037 ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
2038 strbuf_addstr(&msg, "tree 0000000000000000000000000000000000000000\n");
2039 for (parent = commit->parents; parent; parent = parent->next)
2040 strbuf_addf(&msg, "parent %s\n",
2041 sha1_to_hex(parent->item->object.sha1));
2045 "Version of %s from %s\n",
2047 (!contents_from ? path :
2048 (!strcmp(contents_from, "-") ? "standard input" : contents_from)));
2049 commit->buffer = strbuf_detach(&msg, NULL);
2051 if (!contents_from || strcmp("-", contents_from)) {
2053 const char *read_from;
2055 unsigned long buf_len;
2057 if (contents_from) {
2058 if (stat(contents_from, &st) < 0)
2059 die_errno("Cannot stat '%s'", contents_from);
2060 read_from = contents_from;
2063 if (lstat(path, &st) < 0)
2064 die_errno("Cannot lstat '%s'", path);
2067 mode = canon_mode(st.st_mode);
2069 switch (st.st_mode & S_IFMT) {
2071 if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
2072 textconv_object(read_from, mode, null_sha1, 0, &buf_ptr, &buf_len))
2073 strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1);
2074 else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
2075 die_errno("cannot open or read '%s'", read_from);
2078 if (strbuf_readlink(&buf, read_from, st.st_size) < 0)
2079 die_errno("cannot readlink '%s'", read_from);
2082 die("unsupported file type %s", read_from);
2086 /* Reading from stdin */
2088 if (strbuf_read(&buf, 0, 0) < 0)
2089 die_errno("failed to read from stdin");
2091 convert_to_git(path, buf.buf, buf.len, &buf, 0);
2092 origin->file.ptr = buf.buf;
2093 origin->file.size = buf.len;
2094 pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);
2095 commit->util = origin;
2098 * Read the current index, replace the path entry with
2099 * origin->blob_sha1 without mucking with its mode or type
2100 * bits; we are not going to write this index out -- we just
2101 * want to run "diff-index --cached".
2108 int pos = cache_name_pos(path, len);
2110 mode = active_cache[pos]->ce_mode;
2112 /* Let's not bother reading from HEAD tree */
2113 mode = S_IFREG | 0644;
2115 size = cache_entry_size(len);
2116 ce = xcalloc(1, size);
2117 hashcpy(ce->sha1, origin->blob_sha1);
2118 memcpy(ce->name, path, len);
2119 ce->ce_flags = create_ce_flags(0);
2120 ce->ce_namelen = len;
2121 ce->ce_mode = create_ce_mode(mode);
2122 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
2125 * We are not going to write this out, so this does not matter
2126 * right now, but someday we might optimize diff-index --cached
2127 * with cache-tree information.
2129 cache_tree_invalidate_path(active_cache_tree, path);
2134 static const char *prepare_final(struct scoreboard *sb)
2137 const char *final_commit_name = NULL;
2138 struct rev_info *revs = sb->revs;
2141 * There must be one and only one positive commit in the
2142 * revs->pending array.
2144 for (i = 0; i < revs->pending.nr; i++) {
2145 struct object *obj = revs->pending.objects[i].item;
2146 if (obj->flags & UNINTERESTING)
2148 while (obj->type == OBJ_TAG)
2149 obj = deref_tag(obj, NULL, 0);
2150 if (obj->type != OBJ_COMMIT)
2151 die("Non commit %s?", revs->pending.objects[i].name);
2153 die("More than one commit to dig from %s and %s?",
2154 revs->pending.objects[i].name,
2156 sb->final = (struct commit *) obj;
2157 final_commit_name = revs->pending.objects[i].name;
2159 return final_commit_name;
2162 static const char *prepare_initial(struct scoreboard *sb)
2165 const char *final_commit_name = NULL;
2166 struct rev_info *revs = sb->revs;
2169 * There must be one and only one negative commit, and it must be
2172 for (i = 0; i < revs->pending.nr; i++) {
2173 struct object *obj = revs->pending.objects[i].item;
2174 if (!(obj->flags & UNINTERESTING))
2176 while (obj->type == OBJ_TAG)
2177 obj = deref_tag(obj, NULL, 0);
2178 if (obj->type != OBJ_COMMIT)
2179 die("Non commit %s?", revs->pending.objects[i].name);
2181 die("More than one commit to dig down to %s and %s?",
2182 revs->pending.objects[i].name,
2184 sb->final = (struct commit *) obj;
2185 final_commit_name = revs->pending.objects[i].name;
2187 if (!final_commit_name)
2188 die("No commit to dig down to?");
2189 return final_commit_name;
2192 static int blame_copy_callback(const struct option *option, const char *arg, int unset)
2194 int *opt = option->value;
2197 * -C enables copy from removed files;
2198 * -C -C enables copy from existing files, but only
2199 * when blaming a new file;
2200 * -C -C -C enables copy from existing files for
2203 if (*opt & PICKAXE_BLAME_COPY_HARDER)
2204 *opt |= PICKAXE_BLAME_COPY_HARDEST;
2205 if (*opt & PICKAXE_BLAME_COPY)
2206 *opt |= PICKAXE_BLAME_COPY_HARDER;
2207 *opt |= PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE;
2210 blame_copy_score = parse_score(arg);
2214 static int blame_move_callback(const struct option *option, const char *arg, int unset)
2216 int *opt = option->value;
2218 *opt |= PICKAXE_BLAME_MOVE;
2221 blame_move_score = parse_score(arg);
2225 int cmd_blame(int argc, const char **argv, const char *prefix)
2227 struct rev_info revs;
2229 struct scoreboard sb;
2231 struct blame_entry *ent = NULL;
2232 long dashdash_pos, lno;
2233 const char *final_commit_name = NULL;
2234 enum object_type type;
2236 static struct string_list range_list;
2237 static int output_option = 0, opt = 0;
2238 static int show_stats = 0;
2239 static const char *revs_file = NULL;
2240 static const char *contents_from = NULL;
2241 static const struct option options[] = {
2242 OPT_BOOL(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")),
2243 OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
2244 OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
2245 OPT_BOOL(0, "show-stats", &show_stats, N_("Show work cost statistics")),
2246 OPT_BIT(0, "score-debug", &output_option, N_("Show output score for blame entries"), OUTPUT_SHOW_SCORE),
2247 OPT_BIT('f', "show-name", &output_option, N_("Show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
2248 OPT_BIT('n', "show-number", &output_option, N_("Show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
2249 OPT_BIT('p', "porcelain", &output_option, N_("Show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
2250 OPT_BIT(0, "line-porcelain", &output_option, N_("Show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
2251 OPT_BIT('c', NULL, &output_option, N_("Use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
2252 OPT_BIT('t', NULL, &output_option, N_("Show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
2253 OPT_BIT('l', NULL, &output_option, N_("Show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
2254 OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
2255 OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
2256 OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
2257 OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
2258 OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
2259 OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")),
2260 { OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback },
2261 { OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback },
2262 OPT_STRING_LIST('L', NULL, &range_list, N_("n,m"), N_("Process only line range n,m, counting from 1")),
2263 OPT__ABBREV(&abbrev),
2267 struct parse_opt_ctx_t ctx;
2268 int cmd_is_annotate = !strcmp(argv[0], "annotate");
2269 struct range_set ranges;
2270 unsigned int range_i;
2273 git_config(git_blame_config, NULL);
2274 init_revisions(&revs, NULL);
2275 revs.date_mode = blame_date_mode;
2276 DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV);
2277 DIFF_OPT_SET(&revs.diffopt, FOLLOW_RENAMES);
2279 save_commit_buffer = 0;
2282 parse_options_start(&ctx, argc, argv, prefix, options,
2283 PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
2285 switch (parse_options_step(&ctx, options, blame_opt_usage)) {
2286 case PARSE_OPT_HELP:
2288 case PARSE_OPT_DONE:
2290 dashdash_pos = ctx.cpidx;
2294 if (!strcmp(ctx.argv[0], "--reverse")) {
2295 ctx.argv[0] = "--children";
2298 parse_revision_opt(&revs, &ctx, options, blame_opt_usage);
2301 no_whole_file_rename = !DIFF_OPT_TST(&revs.diffopt, FOLLOW_RENAMES);
2302 DIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES);
2303 argc = parse_options_end(&ctx);
2306 /* one more abbrev length is needed for the boundary commit */
2309 if (revs_file && read_ancestry(revs_file))
2310 die_errno("reading graft file '%s' failed", revs_file);
2312 if (cmd_is_annotate) {
2313 output_option |= OUTPUT_ANNOTATE_COMPAT;
2314 blame_date_mode = DATE_ISO8601;
2316 blame_date_mode = revs.date_mode;
2319 /* The maximum width used to show the dates */
2320 switch (blame_date_mode) {
2322 blame_date_width = sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
2325 blame_date_width = sizeof("2006-10-19 16:00:04 -0700");
2328 blame_date_width = sizeof("1161298804 -0700");
2331 blame_date_width = sizeof("2006-10-19");
2334 /* "normal" is used as the fallback for "relative" */
2337 blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700");
2340 blame_date_width -= 1; /* strip the null */
2342 if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
2343 opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
2344 PICKAXE_BLAME_COPY_HARDER);
2346 if (!blame_move_score)
2347 blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
2348 if (!blame_copy_score)
2349 blame_copy_score = BLAME_DEFAULT_COPY_SCORE;
2352 * We have collected options unknown to us in argv[1..unk]
2353 * which are to be passed to revision machinery if we are
2354 * going to do the "bottom" processing.
2356 * The remaining are:
2358 * (1) if dashdash_pos != 0, it is either
2359 * "blame [revisions] -- <path>" or
2360 * "blame -- <path> <rev>"
2362 * (2) otherwise, it is one of the two:
2363 * "blame [revisions] <path>"
2364 * "blame <path> <rev>"
2366 * Note that we must strip out <path> from the arguments: we do not
2367 * want the path pruning but we may want "bottom" processing.
2370 switch (argc - dashdash_pos - 1) {
2373 usage_with_options(blame_opt_usage, options);
2374 /* reorder for the new way: <rev> -- <path> */
2380 path = add_prefix(prefix, argv[--argc]);
2384 usage_with_options(blame_opt_usage, options);
2388 usage_with_options(blame_opt_usage, options);
2389 path = add_prefix(prefix, argv[argc - 1]);
2390 if (argc == 3 && !has_string_in_work_tree(path)) { /* (2b) */
2391 path = add_prefix(prefix, argv[1]);
2394 argv[argc - 1] = "--";
2397 if (!has_string_in_work_tree(path))
2398 die_errno("cannot stat path '%s'", path);
2401 revs.disable_stdin = 1;
2402 setup_revisions(argc, argv, &revs, NULL);
2403 memset(&sb, 0, sizeof(sb));
2407 final_commit_name = prepare_final(&sb);
2408 else if (contents_from)
2409 die("--contents and --children do not blend well.");
2411 final_commit_name = prepare_initial(&sb);
2415 * "--not A B -- path" without anything positive;
2416 * do not default to HEAD, but use the working tree
2420 sb.final = fake_working_tree_commit(&sb.revs->diffopt,
2421 path, contents_from);
2422 add_pending_object(&revs, &(sb.final->object), ":");
2424 else if (contents_from)
2425 die("Cannot use --contents with final commit object name");
2428 * If we have bottom, this will mark the ancestors of the
2429 * bottom commits we would reach while traversing as
2432 if (prepare_revision_walk(&revs))
2433 die("revision walk setup failed");
2435 if (is_null_sha1(sb.final->object.sha1)) {
2438 buf = xmalloc(o->file.size + 1);
2439 memcpy(buf, o->file.ptr, o->file.size + 1);
2441 sb.final_buf_size = o->file.size;
2444 o = get_origin(&sb, sb.final, path);
2445 if (fill_blob_sha1_and_mode(o))
2446 die("no such path %s in %s", path, final_commit_name);
2448 if (DIFF_OPT_TST(&sb.revs->diffopt, ALLOW_TEXTCONV) &&
2449 textconv_object(path, o->mode, o->blob_sha1, 1, (char **) &sb.final_buf,
2450 &sb.final_buf_size))
2453 sb.final_buf = read_sha1_file(o->blob_sha1, &type,
2454 &sb.final_buf_size);
2457 die("Cannot read blob %s for path %s",
2458 sha1_to_hex(o->blob_sha1),
2462 lno = prepare_lines(&sb);
2464 if (lno && !range_list.nr)
2465 string_list_append(&range_list, xstrdup("1"));
2468 range_set_init(&ranges, range_list.nr);
2469 for (range_i = 0; range_i < range_list.nr; ++range_i) {
2471 if (parse_range_arg(range_list.items[range_i].string,
2472 nth_line_cb, &sb, lno, anchor,
2473 &bottom, &top, sb.path))
2475 if (lno < top || ((lno || bottom) && lno < bottom))
2476 die("file %s has only %lu lines", path, lno);
2482 range_set_append_unsafe(&ranges, bottom, top);
2485 sort_and_merge_range_set(&ranges);
2487 for (range_i = ranges.nr; range_i > 0; --range_i) {
2488 const struct range *r = &ranges.ranges[range_i - 1];
2489 long bottom = r->start;
2491 struct blame_entry *next = ent;
2492 ent = xcalloc(1, sizeof(*ent));
2494 ent->num_lines = top - bottom;
2496 ent->s_lno = bottom;
2502 range_set_release(&ranges);
2503 string_list_clear(&range_list, 0);
2508 read_mailmap(&mailmap, NULL);
2513 assign_blame(&sb, opt);
2520 if (!(output_option & OUTPUT_PORCELAIN))
2521 find_alignment(&sb, &output_option);
2523 output(&sb, output_option);
2524 free((void *)sb.final_buf);
2525 for (ent = sb.ent; ent; ) {
2526 struct blame_entry *e = ent->next;
2532 printf("num read blob: %d\n", num_read_blob);
2533 printf("num get patch: %d\n", num_get_patch);
2534 printf("num commits: %d\n", num_commits);