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
;
45 static enum date_mode blame_date_mode
= DATE_ISO8601
;
46 static size_t blame_date_width
;
48 static struct string_list mailmap
;
55 static int num_read_blob
;
56 static int num_get_patch
;
57 static int num_commits
;
59 #define PICKAXE_BLAME_MOVE 01
60 #define PICKAXE_BLAME_COPY 02
61 #define PICKAXE_BLAME_COPY_HARDER 04
62 #define PICKAXE_BLAME_COPY_HARDEST 010
65 * blame for a blame_entry with score lower than these thresholds
66 * is not passed to the parent using move/copy logic.
68 static unsigned blame_move_score
;
69 static unsigned blame_copy_score
;
70 #define BLAME_DEFAULT_MOVE_SCORE 20
71 #define BLAME_DEFAULT_COPY_SCORE 40
73 /* bits #0..7 in revision.h, #8..11 used for merge_bases() in commit.c */
74 #define METAINFO_SHOWN (1u<<12)
75 #define MORE_THAN_ONE_PATH (1u<<13)
78 * One blob in a commit that is being suspected
82 struct origin
*previous
;
83 struct commit
*commit
;
85 unsigned char blob_sha1
[20];
87 char path
[FLEX_ARRAY
];
91 * Prepare diff_filespec and convert it using diff textconv API
92 * if the textconv driver exists.
93 * Return 1 if the conversion succeeds, 0 otherwise.
95 int textconv_object(const char *path
,
97 const unsigned char *sha1
,
99 unsigned long *buf_size
)
101 struct diff_filespec
*df
;
102 struct userdiff_driver
*textconv
;
104 df
= alloc_filespec(path
);
105 fill_filespec(df
, sha1
, mode
);
106 textconv
= get_textconv(df
);
112 *buf_size
= fill_textconv(textconv
, df
, buf
);
118 * Given an origin, prepare mmfile_t structure to be used by the
121 static void fill_origin_blob(struct diff_options
*opt
,
122 struct origin
*o
, mmfile_t
*file
)
125 enum object_type type
;
126 unsigned long file_size
;
129 if (DIFF_OPT_TST(opt
, ALLOW_TEXTCONV
) &&
130 textconv_object(o
->path
, o
->mode
, o
->blob_sha1
, &file
->ptr
, &file_size
))
133 file
->ptr
= read_sha1_file(o
->blob_sha1
, &type
, &file_size
);
134 file
->size
= file_size
;
137 die("Cannot read blob %s for path %s",
138 sha1_to_hex(o
->blob_sha1
),
147 * Origin is refcounted and usually we keep the blob contents to be
150 static inline struct origin
*origin_incref(struct origin
*o
)
157 static void origin_decref(struct origin
*o
)
159 if (o
&& --o
->refcnt
<= 0) {
161 origin_decref(o
->previous
);
167 static void drop_origin_blob(struct origin
*o
)
176 * Each group of lines is described by a blame_entry; it can be split
177 * as we pass blame to the parents. They form a linked list in the
178 * scoreboard structure, sorted by the target line number.
181 struct blame_entry
*prev
;
182 struct blame_entry
*next
;
184 /* the first line of this group in the final image;
185 * internally all line numbers are 0 based.
189 /* how many lines this group has */
192 /* the commit that introduced this group into the final image */
193 struct origin
*suspect
;
195 /* true if the suspect is truly guilty; false while we have not
196 * checked if the group came from one of its parents.
200 /* true if the entry has been scanned for copies in the current parent
204 /* the line number of the first line of this group in the
205 * suspect's file; internally all line numbers are 0 based.
209 /* how significant this entry is -- cached to avoid
210 * scanning the lines over and over.
216 * The current state of the blame assignment.
219 /* the final commit (i.e. where we started digging from) */
220 struct commit
*final
;
221 struct rev_info
*revs
;
225 * The contents in the final image.
226 * Used by many functions to obtain contents of the nth line,
227 * indexed with scoreboard.lineno[blame_entry.lno].
229 const char *final_buf
;
230 unsigned long final_buf_size
;
232 /* linked list of blames */
233 struct blame_entry
*ent
;
235 /* look-up a line in the final buffer */
240 static inline int same_suspect(struct origin
*a
, struct origin
*b
)
244 if (a
->commit
!= b
->commit
)
246 return !strcmp(a
->path
, b
->path
);
249 static void sanity_check_refcnt(struct scoreboard
*);
252 * If two blame entries that are next to each other came from
253 * contiguous lines in the same origin (i.e. <commit, path> pair),
254 * merge them together.
256 static void coalesce(struct scoreboard
*sb
)
258 struct blame_entry
*ent
, *next
;
260 for (ent
= sb
->ent
; ent
&& (next
= ent
->next
); ent
= next
) {
261 if (same_suspect(ent
->suspect
, next
->suspect
) &&
262 ent
->guilty
== next
->guilty
&&
263 ent
->s_lno
+ ent
->num_lines
== next
->s_lno
) {
264 ent
->num_lines
+= next
->num_lines
;
265 ent
->next
= next
->next
;
267 ent
->next
->prev
= ent
;
268 origin_decref(next
->suspect
);
271 next
= ent
; /* again */
275 if (DEBUG
) /* sanity */
276 sanity_check_refcnt(sb
);
280 * Given a commit and a path in it, create a new origin structure.
281 * The callers that add blame to the scoreboard should use
282 * get_origin() to obtain shared, refcounted copy instead of calling
283 * this function directly.
285 static struct origin
*make_origin(struct commit
*commit
, const char *path
)
288 o
= xcalloc(1, sizeof(*o
) + strlen(path
) + 1);
291 strcpy(o
->path
, path
);
296 * Locate an existing origin or create a new one.
298 static struct origin
*get_origin(struct scoreboard
*sb
,
299 struct commit
*commit
,
302 struct blame_entry
*e
;
304 for (e
= sb
->ent
; e
; e
= e
->next
) {
305 if (e
->suspect
->commit
== commit
&&
306 !strcmp(e
->suspect
->path
, path
))
307 return origin_incref(e
->suspect
);
309 return make_origin(commit
, path
);
313 * Fill the blob_sha1 field of an origin if it hasn't, so that later
314 * call to fill_origin_blob() can use it to locate the data. blob_sha1
315 * for an origin is also used to pass the blame for the entire file to
316 * the parent to detect the case where a child's blob is identical to
317 * that of its parent's.
319 * This also fills origin->mode for corresponding tree path.
321 static int fill_blob_sha1_and_mode(struct origin
*origin
)
323 if (!is_null_sha1(origin
->blob_sha1
))
325 if (get_tree_entry(origin
->commit
->object
.sha1
,
327 origin
->blob_sha1
, &origin
->mode
))
329 if (sha1_object_info(origin
->blob_sha1
, NULL
) != OBJ_BLOB
)
333 hashclr(origin
->blob_sha1
);
334 origin
->mode
= S_IFINVALID
;
339 * We have an origin -- check if the same path exists in the
340 * parent and return an origin structure to represent it.
342 static struct origin
*find_origin(struct scoreboard
*sb
,
343 struct commit
*parent
,
344 struct origin
*origin
)
346 struct origin
*porigin
= NULL
;
347 struct diff_options diff_opts
;
348 const char *paths
[2];
352 * Each commit object can cache one origin in that
353 * commit. This is a freestanding copy of origin and
356 struct origin
*cached
= parent
->util
;
357 if (!strcmp(cached
->path
, origin
->path
)) {
359 * The same path between origin and its parent
360 * without renaming -- the most common case.
362 porigin
= get_origin(sb
, parent
, cached
->path
);
365 * If the origin was newly created (i.e. get_origin
366 * would call make_origin if none is found in the
367 * scoreboard), it does not know the blob_sha1/mode,
368 * so copy it. Otherwise porigin was in the
369 * scoreboard and already knows blob_sha1/mode.
371 if (porigin
->refcnt
== 1) {
372 hashcpy(porigin
->blob_sha1
, cached
->blob_sha1
);
373 porigin
->mode
= cached
->mode
;
377 /* otherwise it was not very useful; free it */
382 /* See if the origin->path is different between parent
383 * and origin first. Most of the time they are the
384 * same and diff-tree is fairly efficient about this.
386 diff_setup(&diff_opts
);
387 DIFF_OPT_SET(&diff_opts
, RECURSIVE
);
388 diff_opts
.detect_rename
= 0;
389 diff_opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
390 paths
[0] = origin
->path
;
393 diff_tree_setup_paths(paths
, &diff_opts
);
394 if (diff_setup_done(&diff_opts
) < 0)
397 if (is_null_sha1(origin
->commit
->object
.sha1
))
398 do_diff_cache(parent
->tree
->object
.sha1
, &diff_opts
);
400 diff_tree_sha1(parent
->tree
->object
.sha1
,
401 origin
->commit
->tree
->object
.sha1
,
403 diffcore_std(&diff_opts
);
405 if (!diff_queued_diff
.nr
) {
406 /* The path is the same as parent */
407 porigin
= get_origin(sb
, parent
, origin
->path
);
408 hashcpy(porigin
->blob_sha1
, origin
->blob_sha1
);
409 porigin
->mode
= origin
->mode
;
412 * Since origin->path is a pathspec, if the parent
413 * commit had it as a directory, we will see a whole
414 * bunch of deletion of files in the directory that we
418 struct diff_filepair
*p
= NULL
;
419 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
421 p
= diff_queued_diff
.queue
[i
];
422 name
= p
->one
->path
? p
->one
->path
: p
->two
->path
;
423 if (!strcmp(name
, origin
->path
))
427 die("internal error in blame::find_origin");
430 die("internal error in blame::find_origin (%c)",
433 porigin
= get_origin(sb
, parent
, origin
->path
);
434 hashcpy(porigin
->blob_sha1
, p
->one
->sha1
);
435 porigin
->mode
= p
->one
->mode
;
439 /* Did not exist in parent, or type changed */
443 diff_flush(&diff_opts
);
444 diff_tree_release_paths(&diff_opts
);
447 * Create a freestanding copy that is not part of
448 * the refcounted origin found in the scoreboard, and
449 * cache it in the commit.
451 struct origin
*cached
;
453 cached
= make_origin(porigin
->commit
, porigin
->path
);
454 hashcpy(cached
->blob_sha1
, porigin
->blob_sha1
);
455 cached
->mode
= porigin
->mode
;
456 parent
->util
= cached
;
462 * We have an origin -- find the path that corresponds to it in its
463 * parent and return an origin structure to represent it.
465 static struct origin
*find_rename(struct scoreboard
*sb
,
466 struct commit
*parent
,
467 struct origin
*origin
)
469 struct origin
*porigin
= NULL
;
470 struct diff_options diff_opts
;
472 const char *paths
[2];
474 diff_setup(&diff_opts
);
475 DIFF_OPT_SET(&diff_opts
, RECURSIVE
);
476 diff_opts
.detect_rename
= DIFF_DETECT_RENAME
;
477 diff_opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
478 diff_opts
.single_follow
= origin
->path
;
480 diff_tree_setup_paths(paths
, &diff_opts
);
481 if (diff_setup_done(&diff_opts
) < 0)
484 if (is_null_sha1(origin
->commit
->object
.sha1
))
485 do_diff_cache(parent
->tree
->object
.sha1
, &diff_opts
);
487 diff_tree_sha1(parent
->tree
->object
.sha1
,
488 origin
->commit
->tree
->object
.sha1
,
490 diffcore_std(&diff_opts
);
492 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
493 struct diff_filepair
*p
= diff_queued_diff
.queue
[i
];
494 if ((p
->status
== 'R' || p
->status
== 'C') &&
495 !strcmp(p
->two
->path
, origin
->path
)) {
496 porigin
= get_origin(sb
, parent
, p
->one
->path
);
497 hashcpy(porigin
->blob_sha1
, p
->one
->sha1
);
498 porigin
->mode
= p
->one
->mode
;
502 diff_flush(&diff_opts
);
503 diff_tree_release_paths(&diff_opts
);
508 * Link in a new blame entry to the scoreboard. Entries that cover the
509 * same line range have been removed from the scoreboard previously.
511 static void add_blame_entry(struct scoreboard
*sb
, struct blame_entry
*e
)
513 struct blame_entry
*ent
, *prev
= NULL
;
515 origin_incref(e
->suspect
);
517 for (ent
= sb
->ent
; ent
&& ent
->lno
< e
->lno
; ent
= ent
->next
)
520 /* prev, if not NULL, is the last one that is below e */
523 e
->next
= prev
->next
;
535 * src typically is on-stack; we want to copy the information in it to
536 * a malloced blame_entry that is already on the linked list of the
537 * scoreboard. The origin of dst loses a refcnt while the origin of src
540 static void dup_entry(struct blame_entry
*dst
, struct blame_entry
*src
)
542 struct blame_entry
*p
, *n
;
546 origin_incref(src
->suspect
);
547 origin_decref(dst
->suspect
);
548 memcpy(dst
, src
, sizeof(*src
));
554 static const char *nth_line(struct scoreboard
*sb
, int lno
)
556 return sb
->final_buf
+ sb
->lineno
[lno
];
560 * It is known that lines between tlno to same came from parent, and e
561 * has an overlap with that range. it also is known that parent's
562 * line plno corresponds to e's line tlno.
568 * <------------------>
570 * Split e into potentially three parts; before this chunk, the chunk
571 * to be blamed for the parent, and after that portion.
573 static void split_overlap(struct blame_entry
*split
,
574 struct blame_entry
*e
,
575 int tlno
, int plno
, int same
,
576 struct origin
*parent
)
579 memset(split
, 0, sizeof(struct blame_entry
[3]));
581 if (e
->s_lno
< tlno
) {
582 /* there is a pre-chunk part not blamed on parent */
583 split
[0].suspect
= origin_incref(e
->suspect
);
584 split
[0].lno
= e
->lno
;
585 split
[0].s_lno
= e
->s_lno
;
586 split
[0].num_lines
= tlno
- e
->s_lno
;
587 split
[1].lno
= e
->lno
+ tlno
- e
->s_lno
;
588 split
[1].s_lno
= plno
;
591 split
[1].lno
= e
->lno
;
592 split
[1].s_lno
= plno
+ (e
->s_lno
- tlno
);
595 if (same
< e
->s_lno
+ e
->num_lines
) {
596 /* there is a post-chunk part not blamed on parent */
597 split
[2].suspect
= origin_incref(e
->suspect
);
598 split
[2].lno
= e
->lno
+ (same
- e
->s_lno
);
599 split
[2].s_lno
= e
->s_lno
+ (same
- e
->s_lno
);
600 split
[2].num_lines
= e
->s_lno
+ e
->num_lines
- same
;
601 chunk_end_lno
= split
[2].lno
;
604 chunk_end_lno
= e
->lno
+ e
->num_lines
;
605 split
[1].num_lines
= chunk_end_lno
- split
[1].lno
;
608 * if it turns out there is nothing to blame the parent for,
609 * forget about the splitting. !split[1].suspect signals this.
611 if (split
[1].num_lines
< 1)
613 split
[1].suspect
= origin_incref(parent
);
617 * split_overlap() divided an existing blame e into up to three parts
618 * in split. Adjust the linked list of blames in the scoreboard to
621 static void split_blame(struct scoreboard
*sb
,
622 struct blame_entry
*split
,
623 struct blame_entry
*e
)
625 struct blame_entry
*new_entry
;
627 if (split
[0].suspect
&& split
[2].suspect
) {
628 /* The first part (reuse storage for the existing entry e) */
629 dup_entry(e
, &split
[0]);
631 /* The last part -- me */
632 new_entry
= xmalloc(sizeof(*new_entry
));
633 memcpy(new_entry
, &(split
[2]), sizeof(struct blame_entry
));
634 add_blame_entry(sb
, new_entry
);
636 /* ... and the middle part -- parent */
637 new_entry
= xmalloc(sizeof(*new_entry
));
638 memcpy(new_entry
, &(split
[1]), sizeof(struct blame_entry
));
639 add_blame_entry(sb
, new_entry
);
641 else if (!split
[0].suspect
&& !split
[2].suspect
)
643 * The parent covers the entire area; reuse storage for
644 * e and replace it with the parent.
646 dup_entry(e
, &split
[1]);
647 else if (split
[0].suspect
) {
648 /* me and then parent */
649 dup_entry(e
, &split
[0]);
651 new_entry
= xmalloc(sizeof(*new_entry
));
652 memcpy(new_entry
, &(split
[1]), sizeof(struct blame_entry
));
653 add_blame_entry(sb
, new_entry
);
656 /* parent and then me */
657 dup_entry(e
, &split
[1]);
659 new_entry
= xmalloc(sizeof(*new_entry
));
660 memcpy(new_entry
, &(split
[2]), sizeof(struct blame_entry
));
661 add_blame_entry(sb
, new_entry
);
664 if (DEBUG
) { /* sanity */
665 struct blame_entry
*ent
;
666 int lno
= sb
->ent
->lno
, corrupt
= 0;
668 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
673 lno
+= ent
->num_lines
;
677 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
678 printf("L %8d l %8d n %8d\n",
679 lno
, ent
->lno
, ent
->num_lines
);
680 lno
= ent
->lno
+ ent
->num_lines
;
688 * After splitting the blame, the origins used by the
689 * on-stack blame_entry should lose one refcnt each.
691 static void decref_split(struct blame_entry
*split
)
695 for (i
= 0; i
< 3; i
++)
696 origin_decref(split
[i
].suspect
);
700 * Helper for blame_chunk(). blame_entry e is known to overlap with
701 * the patch hunk; split it and pass blame to the parent.
703 static void blame_overlap(struct scoreboard
*sb
, struct blame_entry
*e
,
704 int tlno
, int plno
, int same
,
705 struct origin
*parent
)
707 struct blame_entry split
[3];
709 split_overlap(split
, e
, tlno
, plno
, same
, parent
);
710 if (split
[1].suspect
)
711 split_blame(sb
, split
, e
);
716 * Find the line number of the last line the target is suspected for.
718 static int find_last_in_target(struct scoreboard
*sb
, struct origin
*target
)
720 struct blame_entry
*e
;
721 int last_in_target
= -1;
723 for (e
= sb
->ent
; e
; e
= e
->next
) {
724 if (e
->guilty
|| !same_suspect(e
->suspect
, target
))
726 if (last_in_target
< e
->s_lno
+ e
->num_lines
)
727 last_in_target
= e
->s_lno
+ e
->num_lines
;
729 return last_in_target
;
733 * Process one hunk from the patch between the current suspect for
734 * blame_entry e and its parent. Find and split the overlap, and
735 * pass blame to the overlapping part to the parent.
737 static void blame_chunk(struct scoreboard
*sb
,
738 int tlno
, int plno
, int same
,
739 struct origin
*target
, struct origin
*parent
)
741 struct blame_entry
*e
;
743 for (e
= sb
->ent
; e
; e
= e
->next
) {
744 if (e
->guilty
|| !same_suspect(e
->suspect
, target
))
746 if (same
<= e
->s_lno
)
748 if (tlno
< e
->s_lno
+ e
->num_lines
)
749 blame_overlap(sb
, e
, tlno
, plno
, same
, parent
);
753 struct blame_chunk_cb_data
{
754 struct scoreboard
*sb
;
755 struct origin
*target
;
756 struct origin
*parent
;
761 static void blame_chunk_cb(void *data
, long same
, long p_next
, long t_next
)
763 struct blame_chunk_cb_data
*d
= data
;
764 blame_chunk(d
->sb
, d
->tlno
, d
->plno
, same
, d
->target
, d
->parent
);
770 * We are looking at the origin 'target' and aiming to pass blame
771 * for the lines it is suspected to its parent. Run diff to find
772 * which lines came from parent and pass blame for them.
774 static int pass_blame_to_parent(struct scoreboard
*sb
,
775 struct origin
*target
,
776 struct origin
*parent
)
779 mmfile_t file_p
, file_o
;
780 struct blame_chunk_cb_data d
;
783 memset(&d
, 0, sizeof(d
));
784 d
.sb
= sb
; d
.target
= target
; d
.parent
= parent
;
785 last_in_target
= find_last_in_target(sb
, target
);
786 if (last_in_target
< 0)
787 return 1; /* nothing remains for this target */
789 fill_origin_blob(&sb
->revs
->diffopt
, parent
, &file_p
);
790 fill_origin_blob(&sb
->revs
->diffopt
, target
, &file_o
);
793 memset(&xpp
, 0, sizeof(xpp
));
794 xpp
.flags
= xdl_opts
;
795 memset(&xecfg
, 0, sizeof(xecfg
));
797 xdi_diff_hunks(&file_p
, &file_o
, blame_chunk_cb
, &d
, &xpp
, &xecfg
);
798 /* The rest (i.e. anything after tlno) are the same as the parent */
799 blame_chunk(sb
, d
.tlno
, d
.plno
, last_in_target
, target
, parent
);
805 * The lines in blame_entry after splitting blames many times can become
806 * very small and trivial, and at some point it becomes pointless to
807 * blame the parents. E.g. "\t\t}\n\t}\n\n" appears everywhere in any
808 * ordinary C program, and it is not worth to say it was copied from
809 * totally unrelated file in the parent.
811 * Compute how trivial the lines in the blame_entry are.
813 static unsigned ent_score(struct scoreboard
*sb
, struct blame_entry
*e
)
822 cp
= nth_line(sb
, e
->lno
);
823 ep
= nth_line(sb
, e
->lno
+ e
->num_lines
);
825 unsigned ch
= *((unsigned char *)cp
);
835 * best_so_far[] and this[] are both a split of an existing blame_entry
836 * that passes blame to the parent. Maintain best_so_far the best split
837 * so far, by comparing this and best_so_far and copying this into
838 * bst_so_far as needed.
840 static void copy_split_if_better(struct scoreboard
*sb
,
841 struct blame_entry
*best_so_far
,
842 struct blame_entry
*this)
846 if (!this[1].suspect
)
848 if (best_so_far
[1].suspect
) {
849 if (ent_score(sb
, &this[1]) < ent_score(sb
, &best_so_far
[1]))
853 for (i
= 0; i
< 3; i
++)
854 origin_incref(this[i
].suspect
);
855 decref_split(best_so_far
);
856 memcpy(best_so_far
, this, sizeof(struct blame_entry
[3]));
860 * We are looking at a part of the final image represented by
861 * ent (tlno and same are offset by ent->s_lno).
862 * tlno is where we are looking at in the final image.
863 * up to (but not including) same match preimage.
864 * plno is where we are looking at in the preimage.
866 * <-------------- final image ---------------------->
869 * <---------preimage----->
872 * All line numbers are 0-based.
874 static void handle_split(struct scoreboard
*sb
,
875 struct blame_entry
*ent
,
876 int tlno
, int plno
, int same
,
877 struct origin
*parent
,
878 struct blame_entry
*split
)
880 if (ent
->num_lines
<= tlno
)
883 struct blame_entry
this[3];
886 split_overlap(this, ent
, tlno
, plno
, same
, parent
);
887 copy_split_if_better(sb
, split
, this);
892 struct handle_split_cb_data
{
893 struct scoreboard
*sb
;
894 struct blame_entry
*ent
;
895 struct origin
*parent
;
896 struct blame_entry
*split
;
901 static void handle_split_cb(void *data
, long same
, long p_next
, long t_next
)
903 struct handle_split_cb_data
*d
= data
;
904 handle_split(d
->sb
, d
->ent
, d
->tlno
, d
->plno
, same
, d
->parent
, d
->split
);
910 * Find the lines from parent that are the same as ent so that
911 * we can pass blames to it. file_p has the blob contents for
914 static void find_copy_in_blob(struct scoreboard
*sb
,
915 struct blame_entry
*ent
,
916 struct origin
*parent
,
917 struct blame_entry
*split
,
923 struct handle_split_cb_data d
;
926 memset(&d
, 0, sizeof(d
));
927 d
.sb
= sb
; d
.ent
= ent
; d
.parent
= parent
; d
.split
= split
;
929 * Prepare mmfile that contains only the lines in ent.
931 cp
= nth_line(sb
, ent
->lno
);
932 file_o
.ptr
= (char *) cp
;
933 cnt
= ent
->num_lines
;
935 while (cnt
&& cp
< sb
->final_buf
+ sb
->final_buf_size
) {
939 file_o
.size
= cp
- file_o
.ptr
;
942 * file_o is a part of final image we are annotating.
943 * file_p partially may match that image.
945 memset(&xpp
, 0, sizeof(xpp
));
946 xpp
.flags
= xdl_opts
;
947 memset(&xecfg
, 0, sizeof(xecfg
));
949 memset(split
, 0, sizeof(struct blame_entry
[3]));
950 xdi_diff_hunks(file_p
, &file_o
, handle_split_cb
, &d
, &xpp
, &xecfg
);
951 /* remainder, if any, all match the preimage */
952 handle_split(sb
, ent
, d
.tlno
, d
.plno
, ent
->num_lines
, parent
, split
);
956 * See if lines currently target is suspected for can be attributed to
959 static int find_move_in_parent(struct scoreboard
*sb
,
960 struct origin
*target
,
961 struct origin
*parent
)
963 int last_in_target
, made_progress
;
964 struct blame_entry
*e
, split
[3];
967 last_in_target
= find_last_in_target(sb
, target
);
968 if (last_in_target
< 0)
969 return 1; /* nothing remains for this target */
971 fill_origin_blob(&sb
->revs
->diffopt
, parent
, &file_p
);
976 while (made_progress
) {
978 for (e
= sb
->ent
; e
; e
= e
->next
) {
979 if (e
->guilty
|| !same_suspect(e
->suspect
, target
) ||
980 ent_score(sb
, e
) < blame_move_score
)
982 find_copy_in_blob(sb
, e
, parent
, split
, &file_p
);
983 if (split
[1].suspect
&&
984 blame_move_score
< ent_score(sb
, &split
[1])) {
985 split_blame(sb
, split
, e
);
995 struct blame_entry
*ent
;
996 struct blame_entry split
[3];
1000 * Count the number of entries the target is suspected for,
1001 * and prepare a list of entry and the best split.
1003 static struct blame_list
*setup_blame_list(struct scoreboard
*sb
,
1004 struct origin
*target
,
1008 struct blame_entry
*e
;
1010 struct blame_list
*blame_list
= NULL
;
1012 for (e
= sb
->ent
, num_ents
= 0; e
; e
= e
->next
)
1013 if (!e
->scanned
&& !e
->guilty
&&
1014 same_suspect(e
->suspect
, target
) &&
1015 min_score
< ent_score(sb
, e
))
1018 blame_list
= xcalloc(num_ents
, sizeof(struct blame_list
));
1019 for (e
= sb
->ent
, i
= 0; e
; e
= e
->next
)
1020 if (!e
->scanned
&& !e
->guilty
&&
1021 same_suspect(e
->suspect
, target
) &&
1022 min_score
< ent_score(sb
, e
))
1023 blame_list
[i
++].ent
= e
;
1025 *num_ents_p
= num_ents
;
1030 * Reset the scanned status on all entries.
1032 static void reset_scanned_flag(struct scoreboard
*sb
)
1034 struct blame_entry
*e
;
1035 for (e
= sb
->ent
; e
; e
= e
->next
)
1040 * For lines target is suspected for, see if we can find code movement
1041 * across file boundary from the parent commit. porigin is the path
1042 * in the parent we already tried.
1044 static int find_copy_in_parent(struct scoreboard
*sb
,
1045 struct origin
*target
,
1046 struct commit
*parent
,
1047 struct origin
*porigin
,
1050 struct diff_options diff_opts
;
1051 const char *paths
[1];
1054 struct blame_list
*blame_list
;
1057 blame_list
= setup_blame_list(sb
, target
, blame_copy_score
, &num_ents
);
1059 return 1; /* nothing remains for this target */
1061 diff_setup(&diff_opts
);
1062 DIFF_OPT_SET(&diff_opts
, RECURSIVE
);
1063 diff_opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1066 diff_tree_setup_paths(paths
, &diff_opts
);
1067 if (diff_setup_done(&diff_opts
) < 0)
1070 /* Try "find copies harder" on new path if requested;
1071 * we do not want to use diffcore_rename() actually to
1072 * match things up; find_copies_harder is set only to
1073 * force diff_tree_sha1() to feed all filepairs to diff_queue,
1074 * and this code needs to be after diff_setup_done(), which
1075 * usually makes find-copies-harder imply copy detection.
1077 if ((opt
& PICKAXE_BLAME_COPY_HARDEST
)
1078 || ((opt
& PICKAXE_BLAME_COPY_HARDER
)
1079 && (!porigin
|| strcmp(target
->path
, porigin
->path
))))
1080 DIFF_OPT_SET(&diff_opts
, FIND_COPIES_HARDER
);
1082 if (is_null_sha1(target
->commit
->object
.sha1
))
1083 do_diff_cache(parent
->tree
->object
.sha1
, &diff_opts
);
1085 diff_tree_sha1(parent
->tree
->object
.sha1
,
1086 target
->commit
->tree
->object
.sha1
,
1089 if (!DIFF_OPT_TST(&diff_opts
, FIND_COPIES_HARDER
))
1090 diffcore_std(&diff_opts
);
1094 int made_progress
= 0;
1096 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
1097 struct diff_filepair
*p
= diff_queued_diff
.queue
[i
];
1098 struct origin
*norigin
;
1100 struct blame_entry
this[3];
1102 if (!DIFF_FILE_VALID(p
->one
))
1103 continue; /* does not exist in parent */
1104 if (S_ISGITLINK(p
->one
->mode
))
1105 continue; /* ignore git links */
1106 if (porigin
&& !strcmp(p
->one
->path
, porigin
->path
))
1107 /* find_move already dealt with this path */
1110 norigin
= get_origin(sb
, parent
, p
->one
->path
);
1111 hashcpy(norigin
->blob_sha1
, p
->one
->sha1
);
1112 norigin
->mode
= p
->one
->mode
;
1113 fill_origin_blob(&sb
->revs
->diffopt
, norigin
, &file_p
);
1117 for (j
= 0; j
< num_ents
; j
++) {
1118 find_copy_in_blob(sb
, blame_list
[j
].ent
,
1119 norigin
, this, &file_p
);
1120 copy_split_if_better(sb
, blame_list
[j
].split
,
1124 origin_decref(norigin
);
1127 for (j
= 0; j
< num_ents
; j
++) {
1128 struct blame_entry
*split
= blame_list
[j
].split
;
1129 if (split
[1].suspect
&&
1130 blame_copy_score
< ent_score(sb
, &split
[1])) {
1131 split_blame(sb
, split
, blame_list
[j
].ent
);
1135 blame_list
[j
].ent
->scanned
= 1;
1136 decref_split(split
);
1142 blame_list
= setup_blame_list(sb
, target
, blame_copy_score
, &num_ents
);
1148 reset_scanned_flag(sb
);
1149 diff_flush(&diff_opts
);
1150 diff_tree_release_paths(&diff_opts
);
1155 * The blobs of origin and porigin exactly match, so everything
1156 * origin is suspected for can be blamed on the parent.
1158 static void pass_whole_blame(struct scoreboard
*sb
,
1159 struct origin
*origin
, struct origin
*porigin
)
1161 struct blame_entry
*e
;
1163 if (!porigin
->file
.ptr
&& origin
->file
.ptr
) {
1164 /* Steal its file */
1165 porigin
->file
= origin
->file
;
1166 origin
->file
.ptr
= NULL
;
1168 for (e
= sb
->ent
; e
; e
= e
->next
) {
1169 if (!same_suspect(e
->suspect
, origin
))
1171 origin_incref(porigin
);
1172 origin_decref(e
->suspect
);
1173 e
->suspect
= porigin
;
1178 * We pass blame from the current commit to its parents. We keep saying
1179 * "parent" (and "porigin"), but what we mean is to find scapegoat to
1180 * exonerate ourselves.
1182 static struct commit_list
*first_scapegoat(struct rev_info
*revs
, struct commit
*commit
)
1185 return commit
->parents
;
1186 return lookup_decoration(&revs
->children
, &commit
->object
);
1189 static int num_scapegoats(struct rev_info
*revs
, struct commit
*commit
)
1192 struct commit_list
*l
= first_scapegoat(revs
, commit
);
1193 for (cnt
= 0; l
; l
= l
->next
)
1200 static void pass_blame(struct scoreboard
*sb
, struct origin
*origin
, int opt
)
1202 struct rev_info
*revs
= sb
->revs
;
1203 int i
, pass
, num_sg
;
1204 struct commit
*commit
= origin
->commit
;
1205 struct commit_list
*sg
;
1206 struct origin
*sg_buf
[MAXSG
];
1207 struct origin
*porigin
, **sg_origin
= sg_buf
;
1209 num_sg
= num_scapegoats(revs
, commit
);
1212 else if (num_sg
< ARRAY_SIZE(sg_buf
))
1213 memset(sg_buf
, 0, sizeof(sg_buf
));
1215 sg_origin
= xcalloc(num_sg
, sizeof(*sg_origin
));
1218 * The first pass looks for unrenamed path to optimize for
1219 * common cases, then we look for renames in the second pass.
1221 for (pass
= 0; pass
< 2; pass
++) {
1222 struct origin
*(*find
)(struct scoreboard
*,
1223 struct commit
*, struct origin
*);
1224 find
= pass
? find_rename
: find_origin
;
1226 for (i
= 0, sg
= first_scapegoat(revs
, commit
);
1228 sg
= sg
->next
, i
++) {
1229 struct commit
*p
= sg
->item
;
1234 if (parse_commit(p
))
1236 porigin
= find(sb
, p
, origin
);
1239 if (!hashcmp(porigin
->blob_sha1
, origin
->blob_sha1
)) {
1240 pass_whole_blame(sb
, origin
, porigin
);
1241 origin_decref(porigin
);
1244 for (j
= same
= 0; j
< i
; j
++)
1246 !hashcmp(sg_origin
[j
]->blob_sha1
,
1247 porigin
->blob_sha1
)) {
1252 sg_origin
[i
] = porigin
;
1254 origin_decref(porigin
);
1259 for (i
= 0, sg
= first_scapegoat(revs
, commit
);
1261 sg
= sg
->next
, i
++) {
1262 struct origin
*porigin
= sg_origin
[i
];
1265 if (!origin
->previous
) {
1266 origin_incref(porigin
);
1267 origin
->previous
= porigin
;
1269 if (pass_blame_to_parent(sb
, origin
, porigin
))
1274 * Optionally find moves in parents' files.
1276 if (opt
& PICKAXE_BLAME_MOVE
)
1277 for (i
= 0, sg
= first_scapegoat(revs
, commit
);
1279 sg
= sg
->next
, i
++) {
1280 struct origin
*porigin
= sg_origin
[i
];
1283 if (find_move_in_parent(sb
, origin
, porigin
))
1288 * Optionally find copies from parents' files.
1290 if (opt
& PICKAXE_BLAME_COPY
)
1291 for (i
= 0, sg
= first_scapegoat(revs
, commit
);
1293 sg
= sg
->next
, i
++) {
1294 struct origin
*porigin
= sg_origin
[i
];
1295 if (find_copy_in_parent(sb
, origin
, sg
->item
,
1301 for (i
= 0; i
< num_sg
; i
++) {
1303 drop_origin_blob(sg_origin
[i
]);
1304 origin_decref(sg_origin
[i
]);
1307 drop_origin_blob(origin
);
1308 if (sg_buf
!= sg_origin
)
1313 * Information on commits, used for output.
1318 const char *author_mail
;
1319 unsigned long author_time
;
1320 const char *author_tz
;
1322 /* filled only when asked for details */
1323 const char *committer
;
1324 const char *committer_mail
;
1325 unsigned long committer_time
;
1326 const char *committer_tz
;
1328 const char *summary
;
1332 * Parse author/committer line in the commit object buffer
1334 static void get_ac_line(const char *inbuf
, const char *what
,
1335 int person_len
, char *person
,
1336 int mail_len
, char *mail
,
1337 unsigned long *time
, const char **tz
)
1339 int len
, tzlen
, maillen
;
1340 char *tmp
, *endp
, *timepos
, *mailpos
;
1342 tmp
= strstr(inbuf
, what
);
1345 tmp
+= strlen(what
);
1346 endp
= strchr(tmp
, '\n');
1351 if (person_len
<= len
) {
1355 strcpy(person
, *tz
);
1360 memcpy(person
, tmp
, len
);
1365 while (person
< tmp
&& *tmp
!= ' ')
1370 tzlen
= (person
+len
)-(tmp
+1);
1373 while (person
< tmp
&& *tmp
!= ' ')
1377 *time
= strtoul(tmp
, NULL
, 10);
1381 while (person
< tmp
&& *tmp
!= ' ')
1387 maillen
= timepos
- tmp
;
1388 memcpy(mail
, mailpos
, maillen
);
1394 * mailmap expansion may make the name longer.
1395 * make room by pushing stuff down.
1397 tmp
= person
+ person_len
- (tzlen
+ 1);
1398 memmove(tmp
, *tz
, tzlen
);
1403 * Now, convert both name and e-mail using mailmap
1405 if (map_user(&mailmap
, mail
+1, mail_len
-1, person
, tmp
-person
-1)) {
1406 /* Add a trailing '>' to email, since map_user returns plain emails
1407 Note: It already has '<', since we replace from mail+1 */
1408 mailpos
= memchr(mail
, '\0', mail_len
);
1409 if (mailpos
&& mailpos
-mail
< mail_len
- 1) {
1411 *(mailpos
+1) = '\0';
1416 static void get_commit_info(struct commit
*commit
,
1417 struct commit_info
*ret
,
1421 char *tmp
, *endp
, *reencoded
, *message
;
1422 static char author_name
[1024];
1423 static char author_mail
[1024];
1424 static char committer_name
[1024];
1425 static char committer_mail
[1024];
1426 static char summary_buf
[1024];
1429 * We've operated without save_commit_buffer, so
1430 * we now need to populate them for output.
1432 if (!commit
->buffer
) {
1433 enum object_type type
;
1436 read_sha1_file(commit
->object
.sha1
, &type
, &size
);
1437 if (!commit
->buffer
)
1438 die("Cannot read commit %s",
1439 sha1_to_hex(commit
->object
.sha1
));
1441 reencoded
= reencode_commit_message(commit
, NULL
);
1442 message
= reencoded
? reencoded
: commit
->buffer
;
1443 ret
->author
= author_name
;
1444 ret
->author_mail
= author_mail
;
1445 get_ac_line(message
, "\nauthor ",
1446 sizeof(author_name
), author_name
,
1447 sizeof(author_mail
), author_mail
,
1448 &ret
->author_time
, &ret
->author_tz
);
1455 ret
->committer
= committer_name
;
1456 ret
->committer_mail
= committer_mail
;
1457 get_ac_line(message
, "\ncommitter ",
1458 sizeof(committer_name
), committer_name
,
1459 sizeof(committer_mail
), committer_mail
,
1460 &ret
->committer_time
, &ret
->committer_tz
);
1462 ret
->summary
= summary_buf
;
1463 tmp
= strstr(message
, "\n\n");
1466 sprintf(summary_buf
, "(%s)", sha1_to_hex(commit
->object
.sha1
));
1471 endp
= strchr(tmp
, '\n');
1473 endp
= tmp
+ strlen(tmp
);
1475 if (len
>= sizeof(summary_buf
) || len
== 0)
1477 memcpy(summary_buf
, tmp
, len
);
1478 summary_buf
[len
] = 0;
1483 * To allow LF and other nonportable characters in pathnames,
1484 * they are c-style quoted as needed.
1486 static void write_filename_info(const char *path
)
1488 printf("filename ");
1489 write_name_quoted(path
, stdout
, '\n');
1493 * Porcelain/Incremental format wants to show a lot of details per
1494 * commit. Instead of repeating this every line, emit it only once,
1495 * the first time each commit appears in the output.
1497 static int emit_one_suspect_detail(struct origin
*suspect
)
1499 struct commit_info ci
;
1501 if (suspect
->commit
->object
.flags
& METAINFO_SHOWN
)
1504 suspect
->commit
->object
.flags
|= METAINFO_SHOWN
;
1505 get_commit_info(suspect
->commit
, &ci
, 1);
1506 printf("author %s\n", ci
.author
);
1507 printf("author-mail %s\n", ci
.author_mail
);
1508 printf("author-time %lu\n", ci
.author_time
);
1509 printf("author-tz %s\n", ci
.author_tz
);
1510 printf("committer %s\n", ci
.committer
);
1511 printf("committer-mail %s\n", ci
.committer_mail
);
1512 printf("committer-time %lu\n", ci
.committer_time
);
1513 printf("committer-tz %s\n", ci
.committer_tz
);
1514 printf("summary %s\n", ci
.summary
);
1515 if (suspect
->commit
->object
.flags
& UNINTERESTING
)
1516 printf("boundary\n");
1517 if (suspect
->previous
) {
1518 struct origin
*prev
= suspect
->previous
;
1519 printf("previous %s ", sha1_to_hex(prev
->commit
->object
.sha1
));
1520 write_name_quoted(prev
->path
, stdout
, '\n');
1526 * The blame_entry is found to be guilty for the range. Mark it
1527 * as such, and show it in incremental output.
1529 static void found_guilty_entry(struct blame_entry
*ent
)
1535 struct origin
*suspect
= ent
->suspect
;
1537 printf("%s %d %d %d\n",
1538 sha1_to_hex(suspect
->commit
->object
.sha1
),
1539 ent
->s_lno
+ 1, ent
->lno
+ 1, ent
->num_lines
);
1540 emit_one_suspect_detail(suspect
);
1541 write_filename_info(suspect
->path
);
1542 maybe_flush_or_die(stdout
, "stdout");
1547 * The main loop -- while the scoreboard has lines whose true origin
1548 * is still unknown, pick one blame_entry, and allow its current
1549 * suspect to pass blames to its parents.
1551 static void assign_blame(struct scoreboard
*sb
, int opt
)
1553 struct rev_info
*revs
= sb
->revs
;
1556 struct blame_entry
*ent
;
1557 struct commit
*commit
;
1558 struct origin
*suspect
= NULL
;
1560 /* find one suspect to break down */
1561 for (ent
= sb
->ent
; !suspect
&& ent
; ent
= ent
->next
)
1563 suspect
= ent
->suspect
;
1565 return; /* all done */
1568 * We will use this suspect later in the loop,
1569 * so hold onto it in the meantime.
1571 origin_incref(suspect
);
1572 commit
= suspect
->commit
;
1573 if (!commit
->object
.parsed
)
1574 parse_commit(commit
);
1576 (!(commit
->object
.flags
& UNINTERESTING
) &&
1577 !(revs
->max_age
!= -1 && commit
->date
< revs
->max_age
)))
1578 pass_blame(sb
, suspect
, opt
);
1580 commit
->object
.flags
|= UNINTERESTING
;
1581 if (commit
->object
.parsed
)
1582 mark_parents_uninteresting(commit
);
1584 /* treat root commit as boundary */
1585 if (!commit
->parents
&& !show_root
)
1586 commit
->object
.flags
|= UNINTERESTING
;
1588 /* Take responsibility for the remaining entries */
1589 for (ent
= sb
->ent
; ent
; ent
= ent
->next
)
1590 if (same_suspect(ent
->suspect
, suspect
))
1591 found_guilty_entry(ent
);
1592 origin_decref(suspect
);
1594 if (DEBUG
) /* sanity */
1595 sanity_check_refcnt(sb
);
1599 static const char *format_time(unsigned long time
, const char *tz_str
,
1602 static char time_buf
[128];
1603 const char *time_str
;
1607 if (show_raw_time
) {
1608 sprintf(time_buf
, "%lu %s", time
, tz_str
);
1612 time_str
= show_date(time
, tz
, blame_date_mode
);
1613 time_len
= strlen(time_str
);
1614 memcpy(time_buf
, time_str
, time_len
);
1615 memset(time_buf
+ time_len
, ' ', blame_date_width
- time_len
);
1620 #define OUTPUT_ANNOTATE_COMPAT 001
1621 #define OUTPUT_LONG_OBJECT_NAME 002
1622 #define OUTPUT_RAW_TIMESTAMP 004
1623 #define OUTPUT_PORCELAIN 010
1624 #define OUTPUT_SHOW_NAME 020
1625 #define OUTPUT_SHOW_NUMBER 040
1626 #define OUTPUT_SHOW_SCORE 0100
1627 #define OUTPUT_NO_AUTHOR 0200
1629 static void emit_porcelain(struct scoreboard
*sb
, struct blame_entry
*ent
)
1633 struct origin
*suspect
= ent
->suspect
;
1636 strcpy(hex
, sha1_to_hex(suspect
->commit
->object
.sha1
));
1637 printf("%s%c%d %d %d\n",
1639 ent
->guilty
? ' ' : '*', /* purely for debugging */
1643 if (emit_one_suspect_detail(suspect
) ||
1644 (suspect
->commit
->object
.flags
& MORE_THAN_ONE_PATH
))
1645 write_filename_info(suspect
->path
);
1647 cp
= nth_line(sb
, ent
->lno
);
1648 for (cnt
= 0; cnt
< ent
->num_lines
; cnt
++) {
1651 printf("%s %d %d\n", hex
,
1652 ent
->s_lno
+ 1 + cnt
,
1653 ent
->lno
+ 1 + cnt
);
1658 } while (ch
!= '\n' &&
1659 cp
< sb
->final_buf
+ sb
->final_buf_size
);
1662 if (sb
->final_buf_size
&& cp
[-1] != '\n')
1666 static void emit_other(struct scoreboard
*sb
, struct blame_entry
*ent
, int opt
)
1670 struct origin
*suspect
= ent
->suspect
;
1671 struct commit_info ci
;
1673 int show_raw_time
= !!(opt
& OUTPUT_RAW_TIMESTAMP
);
1675 get_commit_info(suspect
->commit
, &ci
, 1);
1676 strcpy(hex
, sha1_to_hex(suspect
->commit
->object
.sha1
));
1678 cp
= nth_line(sb
, ent
->lno
);
1679 for (cnt
= 0; cnt
< ent
->num_lines
; cnt
++) {
1681 int length
= (opt
& OUTPUT_LONG_OBJECT_NAME
) ? 40 : 8;
1683 if (suspect
->commit
->object
.flags
& UNINTERESTING
) {
1685 memset(hex
, ' ', length
);
1686 else if (!(opt
& OUTPUT_ANNOTATE_COMPAT
)) {
1692 printf("%.*s", length
, hex
);
1693 if (opt
& OUTPUT_ANNOTATE_COMPAT
)
1694 printf("\t(%10s\t%10s\t%d)", ci
.author
,
1695 format_time(ci
.author_time
, ci
.author_tz
,
1697 ent
->lno
+ 1 + cnt
);
1699 if (opt
& OUTPUT_SHOW_SCORE
)
1701 max_score_digits
, ent
->score
,
1702 ent
->suspect
->refcnt
);
1703 if (opt
& OUTPUT_SHOW_NAME
)
1704 printf(" %-*.*s", longest_file
, longest_file
,
1706 if (opt
& OUTPUT_SHOW_NUMBER
)
1707 printf(" %*d", max_orig_digits
,
1708 ent
->s_lno
+ 1 + cnt
);
1710 if (!(opt
& OUTPUT_NO_AUTHOR
)) {
1711 int pad
= longest_author
- utf8_strwidth(ci
.author
);
1712 printf(" (%s%*s %10s",
1714 format_time(ci
.author_time
,
1719 max_digits
, ent
->lno
+ 1 + cnt
);
1724 } while (ch
!= '\n' &&
1725 cp
< sb
->final_buf
+ sb
->final_buf_size
);
1728 if (sb
->final_buf_size
&& cp
[-1] != '\n')
1732 static void output(struct scoreboard
*sb
, int option
)
1734 struct blame_entry
*ent
;
1736 if (option
& OUTPUT_PORCELAIN
) {
1737 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
1738 struct blame_entry
*oth
;
1739 struct origin
*suspect
= ent
->suspect
;
1740 struct commit
*commit
= suspect
->commit
;
1741 if (commit
->object
.flags
& MORE_THAN_ONE_PATH
)
1743 for (oth
= ent
->next
; oth
; oth
= oth
->next
) {
1744 if ((oth
->suspect
->commit
!= commit
) ||
1745 !strcmp(oth
->suspect
->path
, suspect
->path
))
1747 commit
->object
.flags
|= MORE_THAN_ONE_PATH
;
1753 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
1754 if (option
& OUTPUT_PORCELAIN
)
1755 emit_porcelain(sb
, ent
);
1757 emit_other(sb
, ent
, option
);
1763 * To allow quick access to the contents of nth line in the
1764 * final image, prepare an index in the scoreboard.
1766 static int prepare_lines(struct scoreboard
*sb
)
1768 const char *buf
= sb
->final_buf
;
1769 unsigned long len
= sb
->final_buf_size
;
1770 int num
= 0, incomplete
= 0, bol
= 1;
1772 if (len
&& buf
[len
-1] != '\n')
1773 incomplete
++; /* incomplete line at the end */
1776 sb
->lineno
= xrealloc(sb
->lineno
,
1777 sizeof(int *) * (num
+ 1));
1778 sb
->lineno
[num
] = buf
- sb
->final_buf
;
1781 if (*buf
++ == '\n') {
1786 sb
->lineno
= xrealloc(sb
->lineno
,
1787 sizeof(int *) * (num
+ incomplete
+ 1));
1788 sb
->lineno
[num
+ incomplete
] = buf
- sb
->final_buf
;
1789 sb
->num_lines
= num
+ incomplete
;
1790 return sb
->num_lines
;
1794 * Add phony grafts for use with -S; this is primarily to
1795 * support git's cvsserver that wants to give a linear history
1798 static int read_ancestry(const char *graft_file
)
1800 FILE *fp
= fopen(graft_file
, "r");
1804 while (fgets(buf
, sizeof(buf
), fp
)) {
1805 /* The format is just "Commit Parent1 Parent2 ...\n" */
1806 int len
= strlen(buf
);
1807 struct commit_graft
*graft
= read_graft_line(buf
, len
);
1809 register_commit_graft(graft
, 0);
1816 * How many columns do we need to show line numbers in decimal?
1818 static int lineno_width(int lines
)
1822 for (width
= 1, i
= 10; i
<= lines
; width
++)
1828 * How many columns do we need to show line numbers, authors,
1831 static void find_alignment(struct scoreboard
*sb
, int *option
)
1833 int longest_src_lines
= 0;
1834 int longest_dst_lines
= 0;
1835 unsigned largest_score
= 0;
1836 struct blame_entry
*e
;
1838 for (e
= sb
->ent
; e
; e
= e
->next
) {
1839 struct origin
*suspect
= e
->suspect
;
1840 struct commit_info ci
;
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 num
= utf8_strwidth(ci
.author
);
1852 if (longest_author
< num
)
1853 longest_author
= num
;
1855 num
= e
->s_lno
+ e
->num_lines
;
1856 if (longest_src_lines
< num
)
1857 longest_src_lines
= num
;
1858 num
= e
->lno
+ e
->num_lines
;
1859 if (longest_dst_lines
< num
)
1860 longest_dst_lines
= num
;
1861 if (largest_score
< ent_score(sb
, e
))
1862 largest_score
= ent_score(sb
, e
);
1864 max_orig_digits
= lineno_width(longest_src_lines
);
1865 max_digits
= lineno_width(longest_dst_lines
);
1866 max_score_digits
= lineno_width(largest_score
);
1870 * For debugging -- origin is refcounted, and this asserts that
1871 * we do not underflow.
1873 static void sanity_check_refcnt(struct scoreboard
*sb
)
1876 struct blame_entry
*ent
;
1878 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
1879 /* Nobody should have zero or negative refcnt */
1880 if (ent
->suspect
->refcnt
<= 0) {
1881 fprintf(stderr
, "%s in %s has negative refcnt %d\n",
1883 sha1_to_hex(ent
->suspect
->commit
->object
.sha1
),
1884 ent
->suspect
->refcnt
);
1890 find_alignment(sb
, &opt
);
1892 die("Baa %d!", baa
);
1897 * Used for the command line parsing; check if the path exists
1898 * in the working tree.
1900 static int has_string_in_work_tree(const char *path
)
1903 return !lstat(path
, &st
);
1906 static unsigned parse_score(const char *arg
)
1909 unsigned long score
= strtoul(arg
, &end
, 10);
1915 static const char *add_prefix(const char *prefix
, const char *path
)
1917 return prefix_path(prefix
, prefix
? strlen(prefix
) : 0, path
);
1921 * Parsing of (comma separated) one item in the -L option
1923 static const char *parse_loc(const char *spec
,
1924 struct scoreboard
*sb
, long lno
,
1925 long begin
, long *ret
)
1932 regmatch_t match
[1];
1934 /* Allow "-L <something>,+20" to mean starting at <something>
1935 * for 20 lines, or "-L <something>,-5" for 5 lines ending at
1938 if (1 < begin
&& (spec
[0] == '+' || spec
[0] == '-')) {
1939 num
= strtol(spec
+ 1, &term
, 10);
1940 if (term
!= spec
+ 1) {
1944 *ret
= begin
+ num
- 2;
1953 num
= strtol(spec
, &term
, 10);
1961 /* it could be a regexp of form /.../ */
1962 for (term
= (char *) spec
+ 1; *term
&& *term
!= '/'; term
++) {
1969 /* try [spec+1 .. term-1] as regexp */
1971 begin
--; /* input is in human terms */
1972 line
= nth_line(sb
, begin
);
1974 if (!(reg_error
= regcomp(®exp
, spec
+ 1, REG_NEWLINE
)) &&
1975 !(reg_error
= regexec(®exp
, line
, 1, match
, 0))) {
1976 const char *cp
= line
+ match
[0].rm_so
;
1979 while (begin
++ < lno
) {
1980 nline
= nth_line(sb
, begin
);
1981 if (line
<= cp
&& cp
< nline
)
1992 regerror(reg_error
, ®exp
, errbuf
, 1024);
1993 die("-L parameter '%s': %s", spec
+ 1, errbuf
);
1998 * Parsing of -L option
2000 static void prepare_blame_range(struct scoreboard
*sb
,
2001 const char *bottomtop
,
2003 long *bottom
, long *top
)
2007 term
= parse_loc(bottomtop
, sb
, lno
, 1, bottom
);
2009 term
= parse_loc(term
+ 1, sb
, lno
, *bottom
+ 1, top
);
2017 static int git_blame_config(const char *var
, const char *value
, void *cb
)
2019 if (!strcmp(var
, "blame.showroot")) {
2020 show_root
= git_config_bool(var
, value
);
2023 if (!strcmp(var
, "blame.blankboundary")) {
2024 blank_boundary
= git_config_bool(var
, value
);
2027 if (!strcmp(var
, "blame.date")) {
2029 return config_error_nonbool(var
);
2030 blame_date_mode
= parse_date_format(value
);
2034 switch (userdiff_config(var
, value
)) {
2043 return git_default_config(var
, value
, cb
);
2047 * Prepare a dummy commit that represents the work tree (or staged) item.
2048 * Note that annotating work tree item never works in the reverse.
2050 static struct commit
*fake_working_tree_commit(struct diff_options
*opt
,
2052 const char *contents_from
)
2054 struct commit
*commit
;
2055 struct origin
*origin
;
2056 unsigned char head_sha1
[20];
2057 struct strbuf buf
= STRBUF_INIT
;
2061 struct cache_entry
*ce
;
2064 if (get_sha1("HEAD", head_sha1
))
2065 die("No such ref: HEAD");
2068 commit
= xcalloc(1, sizeof(*commit
));
2069 commit
->parents
= xcalloc(1, sizeof(*commit
->parents
));
2070 commit
->parents
->item
= lookup_commit_reference(head_sha1
);
2071 commit
->object
.parsed
= 1;
2073 commit
->object
.type
= OBJ_COMMIT
;
2075 origin
= make_origin(commit
, path
);
2077 if (!contents_from
|| strcmp("-", contents_from
)) {
2079 const char *read_from
;
2080 unsigned long buf_len
;
2082 if (contents_from
) {
2083 if (stat(contents_from
, &st
) < 0)
2084 die_errno("Cannot stat '%s'", contents_from
);
2085 read_from
= contents_from
;
2088 if (lstat(path
, &st
) < 0)
2089 die_errno("Cannot lstat '%s'", path
);
2092 mode
= canon_mode(st
.st_mode
);
2094 switch (st
.st_mode
& S_IFMT
) {
2096 if (DIFF_OPT_TST(opt
, ALLOW_TEXTCONV
) &&
2097 textconv_object(read_from
, mode
, null_sha1
, &buf
.buf
, &buf_len
))
2099 else if (strbuf_read_file(&buf
, read_from
, st
.st_size
) != st
.st_size
)
2100 die_errno("cannot open or read '%s'", read_from
);
2103 if (strbuf_readlink(&buf
, read_from
, st
.st_size
) < 0)
2104 die_errno("cannot readlink '%s'", read_from
);
2107 die("unsupported file type %s", read_from
);
2111 /* Reading from stdin */
2112 contents_from
= "standard input";
2114 if (strbuf_read(&buf
, 0, 0) < 0)
2115 die_errno("failed to read from stdin");
2117 convert_to_git(path
, buf
.buf
, buf
.len
, &buf
, 0);
2118 origin
->file
.ptr
= buf
.buf
;
2119 origin
->file
.size
= buf
.len
;
2120 pretend_sha1_file(buf
.buf
, buf
.len
, OBJ_BLOB
, origin
->blob_sha1
);
2121 commit
->util
= origin
;
2124 * Read the current index, replace the path entry with
2125 * origin->blob_sha1 without mucking with its mode or type
2126 * bits; we are not going to write this index out -- we just
2127 * want to run "diff-index --cached".
2134 int pos
= cache_name_pos(path
, len
);
2136 mode
= active_cache
[pos
]->ce_mode
;
2138 /* Let's not bother reading from HEAD tree */
2139 mode
= S_IFREG
| 0644;
2141 size
= cache_entry_size(len
);
2142 ce
= xcalloc(1, size
);
2143 hashcpy(ce
->sha1
, origin
->blob_sha1
);
2144 memcpy(ce
->name
, path
, len
);
2145 ce
->ce_flags
= create_ce_flags(len
, 0);
2146 ce
->ce_mode
= create_ce_mode(mode
);
2147 add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
2150 * We are not going to write this out, so this does not matter
2151 * right now, but someday we might optimize diff-index --cached
2152 * with cache-tree information.
2154 cache_tree_invalidate_path(active_cache_tree
, path
);
2156 commit
->buffer
= xmalloc(400);
2157 ident
= fmt_ident("Not Committed Yet", "not.committed.yet", NULL
, 0);
2158 snprintf(commit
->buffer
, 400,
2159 "tree 0000000000000000000000000000000000000000\n"
2163 "Version of %s from %s\n",
2164 sha1_to_hex(head_sha1
),
2165 ident
, ident
, path
, contents_from
? contents_from
: path
);
2169 static const char *prepare_final(struct scoreboard
*sb
)
2172 const char *final_commit_name
= NULL
;
2173 struct rev_info
*revs
= sb
->revs
;
2176 * There must be one and only one positive commit in the
2177 * revs->pending array.
2179 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
2180 struct object
*obj
= revs
->pending
.objects
[i
].item
;
2181 if (obj
->flags
& UNINTERESTING
)
2183 while (obj
->type
== OBJ_TAG
)
2184 obj
= deref_tag(obj
, NULL
, 0);
2185 if (obj
->type
!= OBJ_COMMIT
)
2186 die("Non commit %s?", revs
->pending
.objects
[i
].name
);
2188 die("More than one commit to dig from %s and %s?",
2189 revs
->pending
.objects
[i
].name
,
2191 sb
->final
= (struct commit
*) obj
;
2192 final_commit_name
= revs
->pending
.objects
[i
].name
;
2194 return final_commit_name
;
2197 static const char *prepare_initial(struct scoreboard
*sb
)
2200 const char *final_commit_name
= NULL
;
2201 struct rev_info
*revs
= sb
->revs
;
2204 * There must be one and only one negative commit, and it must be
2207 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
2208 struct object
*obj
= revs
->pending
.objects
[i
].item
;
2209 if (!(obj
->flags
& UNINTERESTING
))
2211 while (obj
->type
== OBJ_TAG
)
2212 obj
= deref_tag(obj
, NULL
, 0);
2213 if (obj
->type
!= OBJ_COMMIT
)
2214 die("Non commit %s?", revs
->pending
.objects
[i
].name
);
2216 die("More than one commit to dig down to %s and %s?",
2217 revs
->pending
.objects
[i
].name
,
2219 sb
->final
= (struct commit
*) obj
;
2220 final_commit_name
= revs
->pending
.objects
[i
].name
;
2222 if (!final_commit_name
)
2223 die("No commit to dig down to?");
2224 return final_commit_name
;
2227 static int blame_copy_callback(const struct option
*option
, const char *arg
, int unset
)
2229 int *opt
= option
->value
;
2232 * -C enables copy from removed files;
2233 * -C -C enables copy from existing files, but only
2234 * when blaming a new file;
2235 * -C -C -C enables copy from existing files for
2238 if (*opt
& PICKAXE_BLAME_COPY_HARDER
)
2239 *opt
|= PICKAXE_BLAME_COPY_HARDEST
;
2240 if (*opt
& PICKAXE_BLAME_COPY
)
2241 *opt
|= PICKAXE_BLAME_COPY_HARDER
;
2242 *opt
|= PICKAXE_BLAME_COPY
| PICKAXE_BLAME_MOVE
;
2245 blame_copy_score
= parse_score(arg
);
2249 static int blame_move_callback(const struct option
*option
, const char *arg
, int unset
)
2251 int *opt
= option
->value
;
2253 *opt
|= PICKAXE_BLAME_MOVE
;
2256 blame_move_score
= parse_score(arg
);
2260 static int blame_bottomtop_callback(const struct option
*option
, const char *arg
, int unset
)
2262 const char **bottomtop
= option
->value
;
2266 die("More than one '-L n,m' option given");
2271 int cmd_blame(int argc
, const char **argv
, const char *prefix
)
2273 struct rev_info revs
;
2275 struct scoreboard sb
;
2277 struct blame_entry
*ent
;
2278 long dashdash_pos
, bottom
, top
, lno
;
2279 const char *final_commit_name
= NULL
;
2280 enum object_type type
;
2282 static const char *bottomtop
= NULL
;
2283 static int output_option
= 0, opt
= 0;
2284 static int show_stats
= 0;
2285 static const char *revs_file
= NULL
;
2286 static const char *contents_from
= NULL
;
2287 static const struct option options
[] = {
2288 OPT_BOOLEAN(0, "incremental", &incremental
, "Show blame entries as we find them, incrementally"),
2289 OPT_BOOLEAN('b', NULL
, &blank_boundary
, "Show blank SHA-1 for boundary commits (Default: off)"),
2290 OPT_BOOLEAN(0, "root", &show_root
, "Do not treat root commits as boundaries (Default: off)"),
2291 OPT_BOOLEAN(0, "show-stats", &show_stats
, "Show work cost statistics"),
2292 OPT_BIT(0, "score-debug", &output_option
, "Show output score for blame entries", OUTPUT_SHOW_SCORE
),
2293 OPT_BIT('f', "show-name", &output_option
, "Show original filename (Default: auto)", OUTPUT_SHOW_NAME
),
2294 OPT_BIT('n', "show-number", &output_option
, "Show original linenumber (Default: off)", OUTPUT_SHOW_NUMBER
),
2295 OPT_BIT('p', "porcelain", &output_option
, "Show in a format designed for machine consumption", OUTPUT_PORCELAIN
),
2296 OPT_BIT('c', NULL
, &output_option
, "Use the same output mode as git-annotate (Default: off)", OUTPUT_ANNOTATE_COMPAT
),
2297 OPT_BIT('t', NULL
, &output_option
, "Show raw timestamp (Default: off)", OUTPUT_RAW_TIMESTAMP
),
2298 OPT_BIT('l', NULL
, &output_option
, "Show long commit SHA1 (Default: off)", OUTPUT_LONG_OBJECT_NAME
),
2299 OPT_BIT('s', NULL
, &output_option
, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR
),
2300 OPT_BIT('w', NULL
, &xdl_opts
, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE
),
2301 OPT_STRING('S', NULL
, &revs_file
, "file", "Use revisions from <file> instead of calling git-rev-list"),
2302 OPT_STRING(0, "contents", &contents_from
, "file", "Use <file>'s contents as the final image"),
2303 { OPTION_CALLBACK
, 'C', NULL
, &opt
, "score", "Find line copies within and across files", PARSE_OPT_OPTARG
, blame_copy_callback
},
2304 { OPTION_CALLBACK
, 'M', NULL
, &opt
, "score", "Find line movements within and across files", PARSE_OPT_OPTARG
, blame_move_callback
},
2305 OPT_CALLBACK('L', NULL
, &bottomtop
, "n,m", "Process only line range n,m, counting from 1", blame_bottomtop_callback
),
2309 struct parse_opt_ctx_t ctx
;
2310 int cmd_is_annotate
= !strcmp(argv
[0], "annotate");
2312 git_config(git_blame_config
, NULL
);
2313 init_revisions(&revs
, NULL
);
2314 revs
.date_mode
= blame_date_mode
;
2315 DIFF_OPT_SET(&revs
.diffopt
, ALLOW_TEXTCONV
);
2317 save_commit_buffer
= 0;
2320 parse_options_start(&ctx
, argc
, argv
, prefix
, PARSE_OPT_KEEP_DASHDASH
|
2321 PARSE_OPT_KEEP_ARGV0
);
2323 switch (parse_options_step(&ctx
, options
, blame_opt_usage
)) {
2324 case PARSE_OPT_HELP
:
2326 case PARSE_OPT_DONE
:
2328 dashdash_pos
= ctx
.cpidx
;
2332 if (!strcmp(ctx
.argv
[0], "--reverse")) {
2333 ctx
.argv
[0] = "--children";
2336 parse_revision_opt(&revs
, &ctx
, options
, blame_opt_usage
);
2339 argc
= parse_options_end(&ctx
);
2341 if (revs_file
&& read_ancestry(revs_file
))
2342 die_errno("reading graft file '%s' failed", revs_file
);
2344 if (cmd_is_annotate
) {
2345 output_option
|= OUTPUT_ANNOTATE_COMPAT
;
2346 blame_date_mode
= DATE_ISO8601
;
2348 blame_date_mode
= revs
.date_mode
;
2351 /* The maximum width used to show the dates */
2352 switch (blame_date_mode
) {
2354 blame_date_width
= sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
2357 blame_date_width
= sizeof("2006-10-19 16:00:04 -0700");
2360 blame_date_width
= sizeof("1161298804 -0700");
2363 blame_date_width
= sizeof("2006-10-19");
2366 /* "normal" is used as the fallback for "relative" */
2369 blame_date_width
= sizeof("Thu Oct 19 16:00:04 2006 -0700");
2372 blame_date_width
-= 1; /* strip the null */
2374 if (DIFF_OPT_TST(&revs
.diffopt
, FIND_COPIES_HARDER
))
2375 opt
|= (PICKAXE_BLAME_COPY
| PICKAXE_BLAME_MOVE
|
2376 PICKAXE_BLAME_COPY_HARDER
);
2378 if (!blame_move_score
)
2379 blame_move_score
= BLAME_DEFAULT_MOVE_SCORE
;
2380 if (!blame_copy_score
)
2381 blame_copy_score
= BLAME_DEFAULT_COPY_SCORE
;
2384 * We have collected options unknown to us in argv[1..unk]
2385 * which are to be passed to revision machinery if we are
2386 * going to do the "bottom" processing.
2388 * The remaining are:
2390 * (1) if dashdash_pos != 0, it is either
2391 * "blame [revisions] -- <path>" or
2392 * "blame -- <path> <rev>"
2394 * (2) otherwise, it is one of the two:
2395 * "blame [revisions] <path>"
2396 * "blame <path> <rev>"
2398 * Note that we must strip out <path> from the arguments: we do not
2399 * want the path pruning but we may want "bottom" processing.
2402 switch (argc
- dashdash_pos
- 1) {
2405 usage_with_options(blame_opt_usage
, options
);
2406 /* reorder for the new way: <rev> -- <path> */
2412 path
= add_prefix(prefix
, argv
[--argc
]);
2416 usage_with_options(blame_opt_usage
, options
);
2420 usage_with_options(blame_opt_usage
, options
);
2421 path
= add_prefix(prefix
, argv
[argc
- 1]);
2422 if (argc
== 3 && !has_string_in_work_tree(path
)) { /* (2b) */
2423 path
= add_prefix(prefix
, argv
[1]);
2426 argv
[argc
- 1] = "--";
2429 if (!has_string_in_work_tree(path
))
2430 die_errno("cannot stat path '%s'", path
);
2433 revs
.disable_stdin
= 1;
2434 setup_revisions(argc
, argv
, &revs
, NULL
);
2435 memset(&sb
, 0, sizeof(sb
));
2439 final_commit_name
= prepare_final(&sb
);
2440 else if (contents_from
)
2441 die("--contents and --children do not blend well.");
2443 final_commit_name
= prepare_initial(&sb
);
2447 * "--not A B -- path" without anything positive;
2448 * do not default to HEAD, but use the working tree
2452 sb
.final
= fake_working_tree_commit(&sb
.revs
->diffopt
,
2453 path
, contents_from
);
2454 add_pending_object(&revs
, &(sb
.final
->object
), ":");
2456 else if (contents_from
)
2457 die("Cannot use --contents with final commit object name");
2460 * If we have bottom, this will mark the ancestors of the
2461 * bottom commits we would reach while traversing as
2464 if (prepare_revision_walk(&revs
))
2465 die("revision walk setup failed");
2467 if (is_null_sha1(sb
.final
->object
.sha1
)) {
2470 buf
= xmalloc(o
->file
.size
+ 1);
2471 memcpy(buf
, o
->file
.ptr
, o
->file
.size
+ 1);
2473 sb
.final_buf_size
= o
->file
.size
;
2476 o
= get_origin(&sb
, sb
.final
, path
);
2477 if (fill_blob_sha1_and_mode(o
))
2478 die("no such path %s in %s", path
, final_commit_name
);
2480 if (DIFF_OPT_TST(&sb
.revs
->diffopt
, ALLOW_TEXTCONV
) &&
2481 textconv_object(path
, o
->mode
, o
->blob_sha1
, (char **) &sb
.final_buf
,
2482 &sb
.final_buf_size
))
2485 sb
.final_buf
= read_sha1_file(o
->blob_sha1
, &type
,
2486 &sb
.final_buf_size
);
2489 die("Cannot read blob %s for path %s",
2490 sha1_to_hex(o
->blob_sha1
),
2494 lno
= prepare_lines(&sb
);
2498 prepare_blame_range(&sb
, bottomtop
, lno
, &bottom
, &top
);
2499 if (bottom
&& top
&& top
< bottom
) {
2501 tmp
= top
; top
= bottom
; bottom
= tmp
;
2508 if (lno
< top
|| lno
< bottom
)
2509 die("file %s has only %lu lines", path
, lno
);
2511 ent
= xcalloc(1, sizeof(*ent
));
2513 ent
->num_lines
= top
- bottom
;
2515 ent
->s_lno
= bottom
;
2520 read_mailmap(&mailmap
, NULL
);
2525 assign_blame(&sb
, opt
);
2532 if (!(output_option
& OUTPUT_PORCELAIN
))
2533 find_alignment(&sb
, &output_option
);
2535 output(&sb
, output_option
);
2536 free((void *)sb
.final_buf
);
2537 for (ent
= sb
.ent
; ent
; ) {
2538 struct blame_entry
*e
= ent
->next
;
2544 printf("num read blob: %d\n", num_read_blob
);
2545 printf("num get patch: %d\n", num_get_patch
);
2546 printf("num commits: %d\n", num_commits
);