4 * Copyright (c) 2006, Junio C Hamano
12 #include "tree-walk.h"
17 #include "xdiff-interface.h"
18 #include "cache-tree.h"
20 static char blame_usage[] =
21 "git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n"
22 " -c Use the same output mode as git-annotate (Default: off)\n"
23 " -b Show blank SHA-1 for boundary commits (Default: off)\n"
24 " -l Show long commit SHA1 (Default: off)\n"
25 " --root Do not treat root commits as boundaries (Default: off)\n"
26 " -t Show raw timestamp (Default: off)\n"
27 " -f, --show-name Show original filename (Default: auto)\n"
28 " -n, --show-number Show original linenumber (Default: off)\n"
29 " -p, --porcelain Show in a format designed for machine consumption\n"
30 " -L n,m Process only line range n,m, counting from 1\n"
31 " -M, -C Find line movements within and across files\n"
32 " --incremental Show blame entries as we find them, incrementally\n"
33 " --contents file Use <file>'s contents as the final image\n"
34 " -S revs-file Use revisions from revs-file instead of calling git-rev-list\n";
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;
42 static int blank_boundary;
43 static int incremental;
44 static int cmd_is_annotate;
51 static int num_read_blob;
52 static int num_get_patch;
53 static int num_commits;
55 #define PICKAXE_BLAME_MOVE 01
56 #define PICKAXE_BLAME_COPY 02
57 #define PICKAXE_BLAME_COPY_HARDER 04
58 #define PICKAXE_BLAME_COPY_HARDEST 010
61 * blame for a blame_entry with score lower than these thresholds
62 * is not passed to the parent using move/copy logic.
64 static unsigned blame_move_score;
65 static unsigned blame_copy_score;
66 #define BLAME_DEFAULT_MOVE_SCORE 20
67 #define BLAME_DEFAULT_COPY_SCORE 40
69 /* bits #0..7 in revision.h, #8..11 used for merge_bases() in commit.c */
70 #define METAINFO_SHOWN (1u<<12)
71 #define MORE_THAN_ONE_PATH (1u<<13)
74 * One blob in a commit that is being suspected
78 struct commit *commit;
80 unsigned char blob_sha1[20];
81 char path[FLEX_ARRAY];
85 * Given an origin, prepare mmfile_t structure to be used by the
88 static char *fill_origin_blob(struct origin *o, mmfile_t *file)
91 enum object_type type;
93 file->ptr = read_sha1_file(o->blob_sha1, &type,
94 (unsigned long *)(&(file->size)));
103 * Origin is refcounted and usually we keep the blob contents to be
106 static inline struct origin *origin_incref(struct origin *o)
113 static void origin_decref(struct origin *o)
115 if (o && --o->refcnt <= 0) {
118 memset(o, 0, sizeof(*o));
124 * Each group of lines is described by a blame_entry; it can be split
125 * as we pass blame to the parents. They form a linked list in the
126 * scoreboard structure, sorted by the target line number.
129 struct blame_entry *prev;
130 struct blame_entry *next;
132 /* the first line of this group in the final image;
133 * internally all line numbers are 0 based.
137 /* how many lines this group has */
140 /* the commit that introduced this group into the final image */
141 struct origin *suspect;
143 /* true if the suspect is truly guilty; false while we have not
144 * checked if the group came from one of its parents.
148 /* the line number of the first line of this group in the
149 * suspect's file; internally all line numbers are 0 based.
153 /* how significant this entry is -- cached to avoid
154 * scanning the lines over and over.
160 * The current state of the blame assignment.
163 /* the final commit (i.e. where we started digging from) */
164 struct commit *final;
169 * The contents in the final image.
170 * Used by many functions to obtain contents of the nth line,
171 * indexed with scoreboard.lineno[blame_entry.lno].
173 const char *final_buf;
174 unsigned long final_buf_size;
176 /* linked list of blames */
177 struct blame_entry *ent;
179 /* look-up a line in the final buffer */
184 static inline int same_suspect(struct origin *a, struct origin *b)
188 if (a->commit != b->commit)
190 return !strcmp(a->path, b->path);
193 static void sanity_check_refcnt(struct scoreboard *);
196 * If two blame entries that are next to each other came from
197 * contiguous lines in the same origin (i.e. <commit, path> pair),
198 * merge them together.
200 static void coalesce(struct scoreboard *sb)
202 struct blame_entry *ent, *next;
204 for (ent = sb->ent; ent && (next = ent->next); ent = next) {
205 if (same_suspect(ent->suspect, next->suspect) &&
206 ent->guilty == next->guilty &&
207 ent->s_lno + ent->num_lines == next->s_lno) {
208 ent->num_lines += next->num_lines;
209 ent->next = next->next;
211 ent->next->prev = ent;
212 origin_decref(next->suspect);
215 next = ent; /* again */
219 if (DEBUG) /* sanity */
220 sanity_check_refcnt(sb);
224 * Given a commit and a path in it, create a new origin structure.
225 * The callers that add blame to the scoreboard should use
226 * get_origin() to obtain shared, refcounted copy instead of calling
227 * this function directly.
229 static struct origin *make_origin(struct commit *commit, const char *path)
232 o = xcalloc(1, sizeof(*o) + strlen(path) + 1);
235 strcpy(o->path, path);
240 * Locate an existing origin or create a new one.
242 static struct origin *get_origin(struct scoreboard *sb,
243 struct commit *commit,
246 struct blame_entry *e;
248 for (e = sb->ent; e; e = e->next) {
249 if (e->suspect->commit == commit &&
250 !strcmp(e->suspect->path, path))
251 return origin_incref(e->suspect);
253 return make_origin(commit, path);
257 * Fill the blob_sha1 field of an origin if it hasn't, so that later
258 * call to fill_origin_blob() can use it to locate the data. blob_sha1
259 * for an origin is also used to pass the blame for the entire file to
260 * the parent to detect the case where a child's blob is identical to
261 * that of its parent's.
263 static int fill_blob_sha1(struct origin *origin)
267 if (!is_null_sha1(origin->blob_sha1))
269 if (get_tree_entry(origin->commit->object.sha1,
271 origin->blob_sha1, &mode))
273 if (sha1_object_info(origin->blob_sha1, NULL) != OBJ_BLOB)
277 hashclr(origin->blob_sha1);
282 * We have an origin -- check if the same path exists in the
283 * parent and return an origin structure to represent it.
285 static struct origin *find_origin(struct scoreboard *sb,
286 struct commit *parent,
287 struct origin *origin)
289 struct origin *porigin = NULL;
290 struct diff_options diff_opts;
291 const char *paths[2];
295 * Each commit object can cache one origin in that
296 * commit. This is a freestanding copy of origin and
299 struct origin *cached = parent->util;
300 if (!strcmp(cached->path, origin->path)) {
302 * The same path between origin and its parent
303 * without renaming -- the most common case.
305 porigin = get_origin(sb, parent, cached->path);
308 * If the origin was newly created (i.e. get_origin
309 * would call make_origin if none is found in the
310 * scoreboard), it does not know the blob_sha1,
311 * so copy it. Otherwise porigin was in the
312 * scoreboard and already knows blob_sha1.
314 if (porigin->refcnt == 1)
315 hashcpy(porigin->blob_sha1, cached->blob_sha1);
318 /* otherwise it was not very useful; free it */
323 /* See if the origin->path is different between parent
324 * and origin first. Most of the time they are the
325 * same and diff-tree is fairly efficient about this.
327 diff_setup(&diff_opts);
328 diff_opts.recursive = 1;
329 diff_opts.detect_rename = 0;
330 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
331 paths[0] = origin->path;
334 diff_tree_setup_paths(paths, &diff_opts);
335 if (diff_setup_done(&diff_opts) < 0)
338 if (is_null_sha1(origin->commit->object.sha1))
339 do_diff_cache(parent->tree->object.sha1, &diff_opts);
341 diff_tree_sha1(parent->tree->object.sha1,
342 origin->commit->tree->object.sha1,
344 diffcore_std(&diff_opts);
346 /* It is either one entry that says "modified", or "created",
349 if (!diff_queued_diff.nr) {
350 /* The path is the same as parent */
351 porigin = get_origin(sb, parent, origin->path);
352 hashcpy(porigin->blob_sha1, origin->blob_sha1);
354 else if (diff_queued_diff.nr != 1)
355 die("internal error in blame::find_origin");
357 struct diff_filepair *p = diff_queued_diff.queue[0];
360 die("internal error in blame::find_origin (%c)",
363 porigin = get_origin(sb, parent, origin->path);
364 hashcpy(porigin->blob_sha1, p->one->sha1);
368 /* Did not exist in parent, or type changed */
372 diff_flush(&diff_opts);
375 * Create a freestanding copy that is not part of
376 * the refcounted origin found in the scoreboard, and
377 * cache it in the commit.
379 struct origin *cached;
381 cached = make_origin(porigin->commit, porigin->path);
382 hashcpy(cached->blob_sha1, porigin->blob_sha1);
383 parent->util = cached;
389 * We have an origin -- find the path that corresponds to it in its
390 * parent and return an origin structure to represent it.
392 static struct origin *find_rename(struct scoreboard *sb,
393 struct commit *parent,
394 struct origin *origin)
396 struct origin *porigin = NULL;
397 struct diff_options diff_opts;
399 const char *paths[2];
401 diff_setup(&diff_opts);
402 diff_opts.recursive = 1;
403 diff_opts.detect_rename = DIFF_DETECT_RENAME;
404 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
405 diff_opts.single_follow = origin->path;
407 diff_tree_setup_paths(paths, &diff_opts);
408 if (diff_setup_done(&diff_opts) < 0)
411 if (is_null_sha1(origin->commit->object.sha1))
412 do_diff_cache(parent->tree->object.sha1, &diff_opts);
414 diff_tree_sha1(parent->tree->object.sha1,
415 origin->commit->tree->object.sha1,
417 diffcore_std(&diff_opts);
419 for (i = 0; i < diff_queued_diff.nr; i++) {
420 struct diff_filepair *p = diff_queued_diff.queue[i];
421 if ((p->status == 'R' || p->status == 'C') &&
422 !strcmp(p->two->path, origin->path)) {
423 porigin = get_origin(sb, parent, p->one->path);
424 hashcpy(porigin->blob_sha1, p->one->sha1);
428 diff_flush(&diff_opts);
433 * Parsing of patch chunks...
436 /* line number in postimage; up to but not including this
437 * line is the same as preimage
441 /* preimage line number after this chunk */
444 /* postimage line number after this chunk */
449 struct chunk *chunks;
453 struct blame_diff_state {
454 struct xdiff_emit_state xm;
456 unsigned hunk_post_context;
457 unsigned hunk_in_pre_context : 1;
460 static void process_u_diff(void *state_, char *line, unsigned long len)
462 struct blame_diff_state *state = state_;
464 int off1, off2, len1, len2, num;
466 num = state->ret->num;
467 if (len < 4 || line[0] != '@' || line[1] != '@') {
468 if (state->hunk_in_pre_context && line[0] == ' ')
469 state->ret->chunks[num - 1].same++;
471 state->hunk_in_pre_context = 0;
473 state->hunk_post_context++;
475 state->hunk_post_context = 0;
480 if (num && state->hunk_post_context) {
481 chunk = &state->ret->chunks[num - 1];
482 chunk->p_next -= state->hunk_post_context;
483 chunk->t_next -= state->hunk_post_context;
485 state->ret->num = ++num;
486 state->ret->chunks = xrealloc(state->ret->chunks,
487 sizeof(struct chunk) * num);
488 chunk = &state->ret->chunks[num - 1];
489 if (parse_hunk_header(line, len, &off1, &len1, &off2, &len2)) {
494 /* Line numbers in patch output are one based. */
498 chunk->same = len2 ? off2 : (off2 + 1);
500 chunk->p_next = off1 + (len1 ? len1 : 1);
501 chunk->t_next = chunk->same + len2;
502 state->hunk_in_pre_context = 1;
503 state->hunk_post_context = 0;
506 static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
509 struct blame_diff_state state;
514 xpp.flags = XDF_NEED_MINIMAL;
515 xecfg.ctxlen = context;
517 ecb.outf = xdiff_outf;
519 memset(&state, 0, sizeof(state));
520 state.xm.consume = process_u_diff;
521 state.ret = xmalloc(sizeof(struct patch));
522 state.ret->chunks = NULL;
525 xdl_diff(file_p, file_o, &xpp, &xecfg, &ecb);
527 if (state.ret->num) {
529 chunk = &state.ret->chunks[state.ret->num - 1];
530 chunk->p_next -= state.hunk_post_context;
531 chunk->t_next -= state.hunk_post_context;
537 * Run diff between two origins and grab the patch output, so that
538 * we can pass blame for lines origin is currently suspected for
541 static struct patch *get_patch(struct origin *parent, struct origin *origin)
543 mmfile_t file_p, file_o;
546 fill_origin_blob(parent, &file_p);
547 fill_origin_blob(origin, &file_o);
548 if (!file_p.ptr || !file_o.ptr)
550 patch = compare_buffer(&file_p, &file_o, 0);
555 static void free_patch(struct patch *p)
562 * Link in a new blame entry to the scoreboard. Entries that cover the
563 * same line range have been removed from the scoreboard previously.
565 static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
567 struct blame_entry *ent, *prev = NULL;
569 origin_incref(e->suspect);
571 for (ent = sb->ent; ent && ent->lno < e->lno; ent = ent->next)
574 /* prev, if not NULL, is the last one that is below e */
577 e->next = prev->next;
589 * src typically is on-stack; we want to copy the information in it to
590 * an malloced blame_entry that is already on the linked list of the
591 * scoreboard. The origin of dst loses a refcnt while the origin of src
594 static void dup_entry(struct blame_entry *dst, struct blame_entry *src)
596 struct blame_entry *p, *n;
600 origin_incref(src->suspect);
601 origin_decref(dst->suspect);
602 memcpy(dst, src, sizeof(*src));
608 static const char *nth_line(struct scoreboard *sb, int lno)
610 return sb->final_buf + sb->lineno[lno];
614 * It is known that lines between tlno to same came from parent, and e
615 * has an overlap with that range. it also is known that parent's
616 * line plno corresponds to e's line tlno.
622 * <------------------>
624 * Split e into potentially three parts; before this chunk, the chunk
625 * to be blamed for the parent, and after that portion.
627 static void split_overlap(struct blame_entry *split,
628 struct blame_entry *e,
629 int tlno, int plno, int same,
630 struct origin *parent)
633 memset(split, 0, sizeof(struct blame_entry [3]));
635 if (e->s_lno < tlno) {
636 /* there is a pre-chunk part not blamed on parent */
637 split[0].suspect = origin_incref(e->suspect);
638 split[0].lno = e->lno;
639 split[0].s_lno = e->s_lno;
640 split[0].num_lines = tlno - e->s_lno;
641 split[1].lno = e->lno + tlno - e->s_lno;
642 split[1].s_lno = plno;
645 split[1].lno = e->lno;
646 split[1].s_lno = plno + (e->s_lno - tlno);
649 if (same < e->s_lno + e->num_lines) {
650 /* there is a post-chunk part not blamed on parent */
651 split[2].suspect = origin_incref(e->suspect);
652 split[2].lno = e->lno + (same - e->s_lno);
653 split[2].s_lno = e->s_lno + (same - e->s_lno);
654 split[2].num_lines = e->s_lno + e->num_lines - same;
655 chunk_end_lno = split[2].lno;
658 chunk_end_lno = e->lno + e->num_lines;
659 split[1].num_lines = chunk_end_lno - split[1].lno;
662 * if it turns out there is nothing to blame the parent for,
663 * forget about the splitting. !split[1].suspect signals this.
665 if (split[1].num_lines < 1)
667 split[1].suspect = origin_incref(parent);
671 * split_overlap() divided an existing blame e into up to three parts
672 * in split. Adjust the linked list of blames in the scoreboard to
675 static void split_blame(struct scoreboard *sb,
676 struct blame_entry *split,
677 struct blame_entry *e)
679 struct blame_entry *new_entry;
681 if (split[0].suspect && split[2].suspect) {
682 /* The first part (reuse storage for the existing entry e) */
683 dup_entry(e, &split[0]);
685 /* The last part -- me */
686 new_entry = xmalloc(sizeof(*new_entry));
687 memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
688 add_blame_entry(sb, new_entry);
690 /* ... and the middle part -- parent */
691 new_entry = xmalloc(sizeof(*new_entry));
692 memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
693 add_blame_entry(sb, new_entry);
695 else if (!split[0].suspect && !split[2].suspect)
697 * The parent covers the entire area; reuse storage for
698 * e and replace it with the parent.
700 dup_entry(e, &split[1]);
701 else if (split[0].suspect) {
702 /* me and then parent */
703 dup_entry(e, &split[0]);
705 new_entry = xmalloc(sizeof(*new_entry));
706 memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
707 add_blame_entry(sb, new_entry);
710 /* parent and then me */
711 dup_entry(e, &split[1]);
713 new_entry = xmalloc(sizeof(*new_entry));
714 memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
715 add_blame_entry(sb, new_entry);
718 if (DEBUG) { /* sanity */
719 struct blame_entry *ent;
720 int lno = sb->ent->lno, corrupt = 0;
722 for (ent = sb->ent; ent; ent = ent->next) {
727 lno += ent->num_lines;
731 for (ent = sb->ent; ent; ent = ent->next) {
732 printf("L %8d l %8d n %8d\n",
733 lno, ent->lno, ent->num_lines);
734 lno = ent->lno + ent->num_lines;
742 * After splitting the blame, the origins used by the
743 * on-stack blame_entry should lose one refcnt each.
745 static void decref_split(struct blame_entry *split)
749 for (i = 0; i < 3; i++)
750 origin_decref(split[i].suspect);
754 * Helper for blame_chunk(). blame_entry e is known to overlap with
755 * the patch hunk; split it and pass blame to the parent.
757 static void blame_overlap(struct scoreboard *sb, struct blame_entry *e,
758 int tlno, int plno, int same,
759 struct origin *parent)
761 struct blame_entry split[3];
763 split_overlap(split, e, tlno, plno, same, parent);
764 if (split[1].suspect)
765 split_blame(sb, split, e);
770 * Find the line number of the last line the target is suspected for.
772 static int find_last_in_target(struct scoreboard *sb, struct origin *target)
774 struct blame_entry *e;
775 int last_in_target = -1;
777 for (e = sb->ent; e; e = e->next) {
778 if (e->guilty || !same_suspect(e->suspect, target))
780 if (last_in_target < e->s_lno + e->num_lines)
781 last_in_target = e->s_lno + e->num_lines;
783 return last_in_target;
787 * Process one hunk from the patch between the current suspect for
788 * blame_entry e and its parent. Find and split the overlap, and
789 * pass blame to the overlapping part to the parent.
791 static void blame_chunk(struct scoreboard *sb,
792 int tlno, int plno, int same,
793 struct origin *target, struct origin *parent)
795 struct blame_entry *e;
797 for (e = sb->ent; e; e = e->next) {
798 if (e->guilty || !same_suspect(e->suspect, target))
800 if (same <= e->s_lno)
802 if (tlno < e->s_lno + e->num_lines)
803 blame_overlap(sb, e, tlno, plno, same, parent);
808 * We are looking at the origin 'target' and aiming to pass blame
809 * for the lines it is suspected to its parent. Run diff to find
810 * which lines came from parent and pass blame for them.
812 static int pass_blame_to_parent(struct scoreboard *sb,
813 struct origin *target,
814 struct origin *parent)
816 int i, last_in_target, plno, tlno;
819 last_in_target = find_last_in_target(sb, target);
820 if (last_in_target < 0)
821 return 1; /* nothing remains for this target */
823 patch = get_patch(parent, target);
825 for (i = 0; i < patch->num; i++) {
826 struct chunk *chunk = &patch->chunks[i];
828 blame_chunk(sb, tlno, plno, chunk->same, target, parent);
829 plno = chunk->p_next;
830 tlno = chunk->t_next;
832 /* The rest (i.e. anything after tlno) are the same as the parent */
833 blame_chunk(sb, tlno, plno, last_in_target, target, parent);
840 * The lines in blame_entry after splitting blames many times can become
841 * very small and trivial, and at some point it becomes pointless to
842 * blame the parents. E.g. "\t\t}\n\t}\n\n" appears everywhere in any
843 * ordinary C program, and it is not worth to say it was copied from
844 * totally unrelated file in the parent.
846 * Compute how trivial the lines in the blame_entry are.
848 static unsigned ent_score(struct scoreboard *sb, struct blame_entry *e)
857 cp = nth_line(sb, e->lno);
858 ep = nth_line(sb, e->lno + e->num_lines);
860 unsigned ch = *((unsigned char *)cp);
870 * best_so_far[] and this[] are both a split of an existing blame_entry
871 * that passes blame to the parent. Maintain best_so_far the best split
872 * so far, by comparing this and best_so_far and copying this into
873 * bst_so_far as needed.
875 static void copy_split_if_better(struct scoreboard *sb,
876 struct blame_entry *best_so_far,
877 struct blame_entry *this)
881 if (!this[1].suspect)
883 if (best_so_far[1].suspect) {
884 if (ent_score(sb, &this[1]) < ent_score(sb, &best_so_far[1]))
888 for (i = 0; i < 3; i++)
889 origin_incref(this[i].suspect);
890 decref_split(best_so_far);
891 memcpy(best_so_far, this, sizeof(struct blame_entry [3]));
895 * We are looking at a part of the final image represented by
896 * ent (tlno and same are offset by ent->s_lno).
897 * tlno is where we are looking at in the final image.
898 * up to (but not including) same match preimage.
899 * plno is where we are looking at in the preimage.
901 * <-------------- final image ---------------------->
904 * <---------preimage----->
907 * All line numbers are 0-based.
909 static void handle_split(struct scoreboard *sb,
910 struct blame_entry *ent,
911 int tlno, int plno, int same,
912 struct origin *parent,
913 struct blame_entry *split)
915 if (ent->num_lines <= tlno)
918 struct blame_entry this[3];
921 split_overlap(this, ent, tlno, plno, same, parent);
922 copy_split_if_better(sb, split, this);
928 * Find the lines from parent that are the same as ent so that
929 * we can pass blames to it. file_p has the blob contents for
932 static void find_copy_in_blob(struct scoreboard *sb,
933 struct blame_entry *ent,
934 struct origin *parent,
935 struct blame_entry *split,
945 * Prepare mmfile that contains only the lines in ent.
947 cp = nth_line(sb, ent->lno);
948 file_o.ptr = (char*) cp;
949 cnt = ent->num_lines;
951 while (cnt && cp < sb->final_buf + sb->final_buf_size) {
955 file_o.size = cp - file_o.ptr;
957 patch = compare_buffer(file_p, &file_o, 1);
960 * file_o is a part of final image we are annotating.
961 * file_p partially may match that image.
963 memset(split, 0, sizeof(struct blame_entry [3]));
965 for (i = 0; i < patch->num; i++) {
966 struct chunk *chunk = &patch->chunks[i];
968 handle_split(sb, ent, tlno, plno, chunk->same, parent, split);
969 plno = chunk->p_next;
970 tlno = chunk->t_next;
972 /* remainder, if any, all match the preimage */
973 handle_split(sb, ent, tlno, plno, ent->num_lines, parent, split);
978 * See if lines currently target is suspected for can be attributed to
981 static int find_move_in_parent(struct scoreboard *sb,
982 struct origin *target,
983 struct origin *parent)
985 int last_in_target, made_progress;
986 struct blame_entry *e, split[3];
989 last_in_target = find_last_in_target(sb, target);
990 if (last_in_target < 0)
991 return 1; /* nothing remains for this target */
993 fill_origin_blob(parent, &file_p);
998 while (made_progress) {
1000 for (e = sb->ent; e; e = e->next) {
1001 if (e->guilty || !same_suspect(e->suspect, target))
1003 find_copy_in_blob(sb, e, parent, split, &file_p);
1004 if (split[1].suspect &&
1005 blame_move_score < ent_score(sb, &split[1])) {
1006 split_blame(sb, split, e);
1009 decref_split(split);
1016 struct blame_entry *ent;
1017 struct blame_entry split[3];
1021 * Count the number of entries the target is suspected for,
1022 * and prepare a list of entry and the best split.
1024 static struct blame_list *setup_blame_list(struct scoreboard *sb,
1025 struct origin *target,
1028 struct blame_entry *e;
1030 struct blame_list *blame_list = NULL;
1032 for (e = sb->ent, num_ents = 0; e; e = e->next)
1033 if (!e->guilty && same_suspect(e->suspect, target))
1036 blame_list = xcalloc(num_ents, sizeof(struct blame_list));
1037 for (e = sb->ent, i = 0; e; e = e->next)
1038 if (!e->guilty && same_suspect(e->suspect, target))
1039 blame_list[i++].ent = e;
1041 *num_ents_p = num_ents;
1046 * For lines target is suspected for, see if we can find code movement
1047 * across file boundary from the parent commit. porigin is the path
1048 * in the parent we already tried.
1050 static int find_copy_in_parent(struct scoreboard *sb,
1051 struct origin *target,
1052 struct commit *parent,
1053 struct origin *porigin,
1056 struct diff_options diff_opts;
1057 const char *paths[1];
1060 struct blame_list *blame_list;
1063 blame_list = setup_blame_list(sb, target, &num_ents);
1065 return 1; /* nothing remains for this target */
1067 diff_setup(&diff_opts);
1068 diff_opts.recursive = 1;
1069 diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1072 diff_tree_setup_paths(paths, &diff_opts);
1073 if (diff_setup_done(&diff_opts) < 0)
1076 /* Try "find copies harder" on new path if requested;
1077 * we do not want to use diffcore_rename() actually to
1078 * match things up; find_copies_harder is set only to
1079 * force diff_tree_sha1() to feed all filepairs to diff_queue,
1080 * and this code needs to be after diff_setup_done(), which
1081 * usually makes find-copies-harder imply copy detection.
1083 if ((opt & PICKAXE_BLAME_COPY_HARDEST)
1084 || ((opt & PICKAXE_BLAME_COPY_HARDER)
1085 && (!porigin || strcmp(target->path, porigin->path))))
1086 diff_opts.find_copies_harder = 1;
1088 if (is_null_sha1(target->commit->object.sha1))
1089 do_diff_cache(parent->tree->object.sha1, &diff_opts);
1091 diff_tree_sha1(parent->tree->object.sha1,
1092 target->commit->tree->object.sha1,
1095 if (!diff_opts.find_copies_harder)
1096 diffcore_std(&diff_opts);
1100 int made_progress = 0;
1102 for (i = 0; i < diff_queued_diff.nr; i++) {
1103 struct diff_filepair *p = diff_queued_diff.queue[i];
1104 struct origin *norigin;
1106 struct blame_entry this[3];
1108 if (!DIFF_FILE_VALID(p->one))
1109 continue; /* does not exist in parent */
1110 if (porigin && !strcmp(p->one->path, porigin->path))
1111 /* find_move already dealt with this path */
1114 norigin = get_origin(sb, parent, p->one->path);
1115 hashcpy(norigin->blob_sha1, p->one->sha1);
1116 fill_origin_blob(norigin, &file_p);
1120 for (j = 0; j < num_ents; j++) {
1121 find_copy_in_blob(sb, blame_list[j].ent,
1122 norigin, this, &file_p);
1123 copy_split_if_better(sb, blame_list[j].split,
1127 origin_decref(norigin);
1130 for (j = 0; j < num_ents; j++) {
1131 struct blame_entry *split = blame_list[j].split;
1132 if (split[1].suspect &&
1133 blame_copy_score < ent_score(sb, &split[1])) {
1134 split_blame(sb, split, blame_list[j].ent);
1137 decref_split(split);
1143 blame_list = setup_blame_list(sb, target, &num_ents);
1149 diff_flush(&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;
1177 #define MAXPARENT 16
1179 static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)
1182 struct commit *commit = origin->commit;
1183 struct commit_list *parent;
1184 struct origin *parent_origin[MAXPARENT], *porigin;
1186 memset(parent_origin, 0, sizeof(parent_origin));
1188 /* The first pass looks for unrenamed path to optimize for
1189 * common cases, then we look for renames in the second pass.
1191 for (pass = 0; pass < 2; pass++) {
1192 struct origin *(*find)(struct scoreboard *,
1193 struct commit *, struct origin *);
1194 find = pass ? find_rename : find_origin;
1196 for (i = 0, parent = commit->parents;
1197 i < MAXPARENT && parent;
1198 parent = parent->next, i++) {
1199 struct commit *p = parent->item;
1202 if (parent_origin[i])
1204 if (parse_commit(p))
1206 porigin = find(sb, p, origin);
1209 if (!hashcmp(porigin->blob_sha1, origin->blob_sha1)) {
1210 pass_whole_blame(sb, origin, porigin);
1211 origin_decref(porigin);
1214 for (j = same = 0; j < i; j++)
1215 if (parent_origin[j] &&
1216 !hashcmp(parent_origin[j]->blob_sha1,
1217 porigin->blob_sha1)) {
1222 parent_origin[i] = porigin;
1224 origin_decref(porigin);
1229 for (i = 0, parent = commit->parents;
1230 i < MAXPARENT && parent;
1231 parent = parent->next, i++) {
1232 struct origin *porigin = parent_origin[i];
1235 if (pass_blame_to_parent(sb, origin, porigin))
1240 * Optionally find moves in parents' files.
1242 if (opt & PICKAXE_BLAME_MOVE)
1243 for (i = 0, parent = commit->parents;
1244 i < MAXPARENT && parent;
1245 parent = parent->next, i++) {
1246 struct origin *porigin = parent_origin[i];
1249 if (find_move_in_parent(sb, origin, porigin))
1254 * Optionally find copies from parents' files.
1256 if (opt & PICKAXE_BLAME_COPY)
1257 for (i = 0, parent = commit->parents;
1258 i < MAXPARENT && parent;
1259 parent = parent->next, i++) {
1260 struct origin *porigin = parent_origin[i];
1261 if (find_copy_in_parent(sb, origin, parent->item,
1267 for (i = 0; i < MAXPARENT; i++)
1268 origin_decref(parent_origin[i]);
1272 * Information on commits, used for output.
1277 const char *author_mail;
1278 unsigned long author_time;
1279 const char *author_tz;
1281 /* filled only when asked for details */
1282 const char *committer;
1283 const char *committer_mail;
1284 unsigned long committer_time;
1285 const char *committer_tz;
1287 const char *summary;
1291 * Parse author/committer line in the commit object buffer
1293 static void get_ac_line(const char *inbuf, const char *what,
1294 int bufsz, char *person, const char **mail,
1295 unsigned long *time, const char **tz)
1300 tmp = strstr(inbuf, what);
1303 tmp += strlen(what);
1304 endp = strchr(tmp, '\n');
1312 *mail = *tz = "(unknown)";
1316 memcpy(person, tmp, len);
1328 *time = strtoul(tmp, NULL, 10);
1337 static void get_commit_info(struct commit *commit,
1338 struct commit_info *ret,
1343 static char author_buf[1024];
1344 static char committer_buf[1024];
1345 static char summary_buf[1024];
1348 * We've operated without save_commit_buffer, so
1349 * we now need to populate them for output.
1351 if (!commit->buffer) {
1352 enum object_type type;
1355 read_sha1_file(commit->object.sha1, &type, &size);
1357 ret->author = author_buf;
1358 get_ac_line(commit->buffer, "\nauthor ",
1359 sizeof(author_buf), author_buf, &ret->author_mail,
1360 &ret->author_time, &ret->author_tz);
1365 ret->committer = committer_buf;
1366 get_ac_line(commit->buffer, "\ncommitter ",
1367 sizeof(committer_buf), committer_buf, &ret->committer_mail,
1368 &ret->committer_time, &ret->committer_tz);
1370 ret->summary = summary_buf;
1371 tmp = strstr(commit->buffer, "\n\n");
1374 sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1));
1378 endp = strchr(tmp, '\n');
1380 endp = tmp + strlen(tmp);
1382 if (len >= sizeof(summary_buf) || len == 0)
1384 memcpy(summary_buf, tmp, len);
1385 summary_buf[len] = 0;
1389 * To allow LF and other nonportable characters in pathnames,
1390 * they are c-style quoted as needed.
1392 static void write_filename_info(const char *path)
1394 printf("filename ");
1395 write_name_quoted(NULL, 0, path, 1, stdout);
1400 * The blame_entry is found to be guilty for the range. Mark it
1401 * as such, and show it in incremental output.
1403 static void found_guilty_entry(struct blame_entry *ent)
1409 struct origin *suspect = ent->suspect;
1411 printf("%s %d %d %d\n",
1412 sha1_to_hex(suspect->commit->object.sha1),
1413 ent->s_lno + 1, ent->lno + 1, ent->num_lines);
1414 if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
1415 struct commit_info ci;
1416 suspect->commit->object.flags |= METAINFO_SHOWN;
1417 get_commit_info(suspect->commit, &ci, 1);
1418 printf("author %s\n", ci.author);
1419 printf("author-mail %s\n", ci.author_mail);
1420 printf("author-time %lu\n", ci.author_time);
1421 printf("author-tz %s\n", ci.author_tz);
1422 printf("committer %s\n", ci.committer);
1423 printf("committer-mail %s\n", ci.committer_mail);
1424 printf("committer-time %lu\n", ci.committer_time);
1425 printf("committer-tz %s\n", ci.committer_tz);
1426 printf("summary %s\n", ci.summary);
1427 if (suspect->commit->object.flags & UNINTERESTING)
1428 printf("boundary\n");
1430 write_filename_info(suspect->path);
1435 * The main loop -- while the scoreboard has lines whose true origin
1436 * is still unknown, pick one blame_entry, and allow its current
1437 * suspect to pass blames to its parents.
1439 static void assign_blame(struct scoreboard *sb, struct rev_info *revs, int opt)
1442 struct blame_entry *ent;
1443 struct commit *commit;
1444 struct origin *suspect = NULL;
1446 /* find one suspect to break down */
1447 for (ent = sb->ent; !suspect && ent; ent = ent->next)
1449 suspect = ent->suspect;
1451 return; /* all done */
1454 * We will use this suspect later in the loop,
1455 * so hold onto it in the meantime.
1457 origin_incref(suspect);
1458 commit = suspect->commit;
1459 if (!commit->object.parsed)
1460 parse_commit(commit);
1461 if (!(commit->object.flags & UNINTERESTING) &&
1462 !(revs->max_age != -1 && commit->date < revs->max_age))
1463 pass_blame(sb, suspect, opt);
1465 commit->object.flags |= UNINTERESTING;
1466 if (commit->object.parsed)
1467 mark_parents_uninteresting(commit);
1469 /* treat root commit as boundary */
1470 if (!commit->parents && !show_root)
1471 commit->object.flags |= UNINTERESTING;
1473 /* Take responsibility for the remaining entries */
1474 for (ent = sb->ent; ent; ent = ent->next)
1475 if (same_suspect(ent->suspect, suspect))
1476 found_guilty_entry(ent);
1477 origin_decref(suspect);
1479 if (DEBUG) /* sanity */
1480 sanity_check_refcnt(sb);
1484 static const char *format_time(unsigned long time, const char *tz_str,
1487 static char time_buf[128];
1492 if (show_raw_time) {
1493 sprintf(time_buf, "%lu %s", time, tz_str);
1498 minutes = tz < 0 ? -tz : tz;
1499 minutes = (minutes / 100)*60 + (minutes % 100);
1500 minutes = tz < 0 ? -minutes : minutes;
1501 t = time + minutes * 60;
1504 strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", tm);
1505 strcat(time_buf, tz_str);
1509 #define OUTPUT_ANNOTATE_COMPAT 001
1510 #define OUTPUT_LONG_OBJECT_NAME 002
1511 #define OUTPUT_RAW_TIMESTAMP 004
1512 #define OUTPUT_PORCELAIN 010
1513 #define OUTPUT_SHOW_NAME 020
1514 #define OUTPUT_SHOW_NUMBER 040
1515 #define OUTPUT_SHOW_SCORE 0100
1517 static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent)
1521 struct origin *suspect = ent->suspect;
1524 strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
1525 printf("%s%c%d %d %d\n",
1527 ent->guilty ? ' ' : '*', // purely for debugging
1531 if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
1532 struct commit_info ci;
1533 suspect->commit->object.flags |= METAINFO_SHOWN;
1534 get_commit_info(suspect->commit, &ci, 1);
1535 printf("author %s\n", ci.author);
1536 printf("author-mail %s\n", ci.author_mail);
1537 printf("author-time %lu\n", ci.author_time);
1538 printf("author-tz %s\n", ci.author_tz);
1539 printf("committer %s\n", ci.committer);
1540 printf("committer-mail %s\n", ci.committer_mail);
1541 printf("committer-time %lu\n", ci.committer_time);
1542 printf("committer-tz %s\n", ci.committer_tz);
1543 write_filename_info(suspect->path);
1544 printf("summary %s\n", ci.summary);
1545 if (suspect->commit->object.flags & UNINTERESTING)
1546 printf("boundary\n");
1548 else if (suspect->commit->object.flags & MORE_THAN_ONE_PATH)
1549 write_filename_info(suspect->path);
1551 cp = nth_line(sb, ent->lno);
1552 for (cnt = 0; cnt < ent->num_lines; cnt++) {
1555 printf("%s %d %d\n", hex,
1556 ent->s_lno + 1 + cnt,
1557 ent->lno + 1 + cnt);
1562 } while (ch != '\n' &&
1563 cp < sb->final_buf + sb->final_buf_size);
1567 static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
1571 struct origin *suspect = ent->suspect;
1572 struct commit_info ci;
1574 int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
1576 get_commit_info(suspect->commit, &ci, 1);
1577 strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
1579 cp = nth_line(sb, ent->lno);
1580 for (cnt = 0; cnt < ent->num_lines; cnt++) {
1582 int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? 40 : 8;
1584 if (suspect->commit->object.flags & UNINTERESTING) {
1586 memset(hex, ' ', length);
1587 else if (!cmd_is_annotate) {
1593 printf("%.*s", length, hex);
1594 if (opt & OUTPUT_ANNOTATE_COMPAT)
1595 printf("\t(%10s\t%10s\t%d)", ci.author,
1596 format_time(ci.author_time, ci.author_tz,
1598 ent->lno + 1 + cnt);
1600 if (opt & OUTPUT_SHOW_SCORE)
1602 max_score_digits, ent->score,
1603 ent->suspect->refcnt);
1604 if (opt & OUTPUT_SHOW_NAME)
1605 printf(" %-*.*s", longest_file, longest_file,
1607 if (opt & OUTPUT_SHOW_NUMBER)
1608 printf(" %*d", max_orig_digits,
1609 ent->s_lno + 1 + cnt);
1610 printf(" (%-*.*s %10s %*d) ",
1611 longest_author, longest_author, ci.author,
1612 format_time(ci.author_time, ci.author_tz,
1614 max_digits, ent->lno + 1 + cnt);
1619 } while (ch != '\n' &&
1620 cp < sb->final_buf + sb->final_buf_size);
1624 static void output(struct scoreboard *sb, int option)
1626 struct blame_entry *ent;
1628 if (option & OUTPUT_PORCELAIN) {
1629 for (ent = sb->ent; ent; ent = ent->next) {
1630 struct blame_entry *oth;
1631 struct origin *suspect = ent->suspect;
1632 struct commit *commit = suspect->commit;
1633 if (commit->object.flags & MORE_THAN_ONE_PATH)
1635 for (oth = ent->next; oth; oth = oth->next) {
1636 if ((oth->suspect->commit != commit) ||
1637 !strcmp(oth->suspect->path, suspect->path))
1639 commit->object.flags |= MORE_THAN_ONE_PATH;
1645 for (ent = sb->ent; ent; ent = ent->next) {
1646 if (option & OUTPUT_PORCELAIN)
1647 emit_porcelain(sb, ent);
1649 emit_other(sb, ent, option);
1655 * To allow quick access to the contents of nth line in the
1656 * final image, prepare an index in the scoreboard.
1658 static int prepare_lines(struct scoreboard *sb)
1660 const char *buf = sb->final_buf;
1661 unsigned long len = sb->final_buf_size;
1662 int num = 0, incomplete = 0, bol = 1;
1664 if (len && buf[len-1] != '\n')
1665 incomplete++; /* incomplete line at the end */
1668 sb->lineno = xrealloc(sb->lineno,
1669 sizeof(int* ) * (num + 1));
1670 sb->lineno[num] = buf - sb->final_buf;
1673 if (*buf++ == '\n') {
1678 sb->lineno = xrealloc(sb->lineno,
1679 sizeof(int* ) * (num + incomplete + 1));
1680 sb->lineno[num + incomplete] = buf - sb->final_buf;
1681 sb->num_lines = num + incomplete;
1682 return sb->num_lines;
1686 * Add phony grafts for use with -S; this is primarily to
1687 * support git-cvsserver that wants to give a linear history
1690 static int read_ancestry(const char *graft_file)
1692 FILE *fp = fopen(graft_file, "r");
1696 while (fgets(buf, sizeof(buf), fp)) {
1697 /* The format is just "Commit Parent1 Parent2 ...\n" */
1698 int len = strlen(buf);
1699 struct commit_graft *graft = read_graft_line(buf, len);
1701 register_commit_graft(graft, 0);
1708 * How many columns do we need to show line numbers in decimal?
1710 static int lineno_width(int lines)
1714 for (width = 1, i = 10; i <= lines + 1; width++)
1720 * How many columns do we need to show line numbers, authors,
1723 static void find_alignment(struct scoreboard *sb, int *option)
1725 int longest_src_lines = 0;
1726 int longest_dst_lines = 0;
1727 unsigned largest_score = 0;
1728 struct blame_entry *e;
1730 for (e = sb->ent; e; e = e->next) {
1731 struct origin *suspect = e->suspect;
1732 struct commit_info ci;
1735 if (strcmp(suspect->path, sb->path))
1736 *option |= OUTPUT_SHOW_NAME;
1737 num = strlen(suspect->path);
1738 if (longest_file < num)
1740 if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
1741 suspect->commit->object.flags |= METAINFO_SHOWN;
1742 get_commit_info(suspect->commit, &ci, 1);
1743 num = strlen(ci.author);
1744 if (longest_author < num)
1745 longest_author = num;
1747 num = e->s_lno + e->num_lines;
1748 if (longest_src_lines < num)
1749 longest_src_lines = num;
1750 num = e->lno + e->num_lines;
1751 if (longest_dst_lines < num)
1752 longest_dst_lines = num;
1753 if (largest_score < ent_score(sb, e))
1754 largest_score = ent_score(sb, e);
1756 max_orig_digits = lineno_width(longest_src_lines);
1757 max_digits = lineno_width(longest_dst_lines);
1758 max_score_digits = lineno_width(largest_score);
1762 * For debugging -- origin is refcounted, and this asserts that
1763 * we do not underflow.
1765 static void sanity_check_refcnt(struct scoreboard *sb)
1768 struct blame_entry *ent;
1770 for (ent = sb->ent; ent; ent = ent->next) {
1771 /* Nobody should have zero or negative refcnt */
1772 if (ent->suspect->refcnt <= 0) {
1773 fprintf(stderr, "%s in %s has negative refcnt %d\n",
1775 sha1_to_hex(ent->suspect->commit->object.sha1),
1776 ent->suspect->refcnt);
1780 for (ent = sb->ent; ent; ent = ent->next) {
1781 /* Mark the ones that haven't been checked */
1782 if (0 < ent->suspect->refcnt)
1783 ent->suspect->refcnt = -ent->suspect->refcnt;
1785 for (ent = sb->ent; ent; ent = ent->next) {
1787 * ... then pick each and see if they have the the
1791 struct blame_entry *e;
1792 struct origin *suspect = ent->suspect;
1794 if (0 < suspect->refcnt)
1796 suspect->refcnt = -suspect->refcnt; /* Unmark */
1797 for (found = 0, e = sb->ent; e; e = e->next) {
1798 if (e->suspect != suspect)
1802 if (suspect->refcnt != found) {
1803 fprintf(stderr, "%s in %s has refcnt %d, not %d\n",
1805 sha1_to_hex(ent->suspect->commit->object.sha1),
1806 ent->suspect->refcnt, found);
1812 find_alignment(sb, &opt);
1814 die("Baa %d!", baa);
1819 * Used for the command line parsing; check if the path exists
1820 * in the working tree.
1822 static int has_path_in_work_tree(const char *path)
1825 return !lstat(path, &st);
1828 static unsigned parse_score(const char *arg)
1831 unsigned long score = strtoul(arg, &end, 10);
1837 static const char *add_prefix(const char *prefix, const char *path)
1839 if (!prefix || !prefix[0])
1841 return prefix_path(prefix, strlen(prefix), path);
1845 * Parsing of (comma separated) one item in the -L option
1847 static const char *parse_loc(const char *spec,
1848 struct scoreboard *sb, long lno,
1849 long begin, long *ret)
1856 regmatch_t match[1];
1858 /* Allow "-L <something>,+20" to mean starting at <something>
1859 * for 20 lines, or "-L <something>,-5" for 5 lines ending at
1862 if (1 < begin && (spec[0] == '+' || spec[0] == '-')) {
1863 num = strtol(spec + 1, &term, 10);
1864 if (term != spec + 1) {
1868 *ret = begin + num - 2;
1877 num = strtol(spec, &term, 10);
1885 /* it could be a regexp of form /.../ */
1886 for (term = (char*) spec + 1; *term && *term != '/'; term++) {
1893 /* try [spec+1 .. term-1] as regexp */
1895 begin--; /* input is in human terms */
1896 line = nth_line(sb, begin);
1898 if (!(reg_error = regcomp(®exp, spec + 1, REG_NEWLINE)) &&
1899 !(reg_error = regexec(®exp, line, 1, match, 0))) {
1900 const char *cp = line + match[0].rm_so;
1903 while (begin++ < lno) {
1904 nline = nth_line(sb, begin);
1905 if (line <= cp && cp < nline)
1916 regerror(reg_error, ®exp, errbuf, 1024);
1917 die("-L parameter '%s': %s", spec + 1, errbuf);
1922 * Parsing of -L option
1924 static void prepare_blame_range(struct scoreboard *sb,
1925 const char *bottomtop,
1927 long *bottom, long *top)
1931 term = parse_loc(bottomtop, sb, lno, 1, bottom);
1933 term = parse_loc(term + 1, sb, lno, *bottom + 1, top);
1941 static int git_blame_config(const char *var, const char *value)
1943 if (!strcmp(var, "blame.showroot")) {
1944 show_root = git_config_bool(var, value);
1947 if (!strcmp(var, "blame.blankboundary")) {
1948 blank_boundary = git_config_bool(var, value);
1951 return git_default_config(var, value);
1954 static struct commit *fake_working_tree_commit(const char *path, const char *contents_from)
1956 struct commit *commit;
1957 struct origin *origin;
1958 unsigned char head_sha1[20];
1963 unsigned long fin_size;
1965 struct cache_entry *ce;
1968 if (get_sha1("HEAD", head_sha1))
1969 die("No such ref: HEAD");
1972 commit = xcalloc(1, sizeof(*commit));
1973 commit->parents = xcalloc(1, sizeof(*commit->parents));
1974 commit->parents->item = lookup_commit_reference(head_sha1);
1975 commit->object.parsed = 1;
1977 commit->object.type = OBJ_COMMIT;
1979 origin = make_origin(commit, path);
1981 if (!contents_from || strcmp("-", contents_from)) {
1983 const char *read_from;
1985 if (contents_from) {
1986 if (stat(contents_from, &st) < 0)
1987 die("Cannot stat %s", contents_from);
1988 read_from = contents_from;
1991 if (lstat(path, &st) < 0)
1992 die("Cannot lstat %s", path);
1995 fin_size = xsize_t(st.st_size);
1996 buf = xmalloc(fin_size+1);
1997 mode = canon_mode(st.st_mode);
1998 switch (st.st_mode & S_IFMT) {
2000 fd = open(read_from, O_RDONLY);
2002 die("cannot open %s", read_from);
2003 if (read_in_full(fd, buf, fin_size) != fin_size)
2004 die("cannot read %s", read_from);
2007 if (readlink(read_from, buf, fin_size+1) != fin_size)
2008 die("cannot readlink %s", read_from);
2011 die("unsupported file type %s", read_from);
2015 /* Reading from stdin */
2016 contents_from = "standard input";
2022 buf = xrealloc(buf, fin_size + cnt);
2023 cnt = xread(0, buf + fin_size, cnt);
2025 die("read error %s from stdin",
2031 buf = xrealloc(buf, fin_size + 1);
2034 origin->file.ptr = buf;
2035 origin->file.size = fin_size;
2036 pretend_sha1_file(buf, fin_size, OBJ_BLOB, origin->blob_sha1);
2037 commit->util = origin;
2040 * Read the current index, replace the path entry with
2041 * origin->blob_sha1 without mucking with its mode or type
2042 * bits; we are not going to write this index out -- we just
2043 * want to run "diff-index --cached".
2050 int pos = cache_name_pos(path, len);
2052 mode = ntohl(active_cache[pos]->ce_mode);
2054 /* Let's not bother reading from HEAD tree */
2055 mode = S_IFREG | 0644;
2057 size = cache_entry_size(len);
2058 ce = xcalloc(1, size);
2059 hashcpy(ce->sha1, origin->blob_sha1);
2060 memcpy(ce->name, path, len);
2061 ce->ce_flags = create_ce_flags(len, 0);
2062 ce->ce_mode = create_ce_mode(mode);
2063 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
2066 * We are not going to write this out, so this does not matter
2067 * right now, but someday we might optimize diff-index --cached
2068 * with cache-tree information.
2070 cache_tree_invalidate_path(active_cache_tree, path);
2072 commit->buffer = xmalloc(400);
2073 ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
2074 snprintf(commit->buffer, 400,
2075 "tree 0000000000000000000000000000000000000000\n"
2079 "Version of %s from %s\n",
2080 sha1_to_hex(head_sha1),
2081 ident, ident, path, contents_from ? contents_from : path);
2085 int cmd_blame(int argc, const char **argv, const char *prefix)
2087 struct rev_info revs;
2089 struct scoreboard sb;
2091 struct blame_entry *ent;
2092 int i, seen_dashdash, unk, opt;
2093 long bottom, top, lno;
2094 int output_option = 0;
2096 const char *revs_file = NULL;
2097 const char *final_commit_name = NULL;
2098 enum object_type type;
2099 const char *bottomtop = NULL;
2100 const char *contents_from = NULL;
2102 cmd_is_annotate = !strcmp(argv[0], "annotate");
2104 git_config(git_blame_config);
2105 save_commit_buffer = 0;
2109 for (unk = i = 1; i < argc; i++) {
2110 const char *arg = argv[i];
2113 else if (!strcmp("-b", arg))
2115 else if (!strcmp("--root", arg))
2117 else if (!strcmp(arg, "--show-stats"))
2119 else if (!strcmp("-c", arg))
2120 output_option |= OUTPUT_ANNOTATE_COMPAT;
2121 else if (!strcmp("-t", arg))
2122 output_option |= OUTPUT_RAW_TIMESTAMP;
2123 else if (!strcmp("-l", arg))
2124 output_option |= OUTPUT_LONG_OBJECT_NAME;
2125 else if (!strcmp("-S", arg) && ++i < argc)
2126 revs_file = argv[i];
2127 else if (!prefixcmp(arg, "-M")) {
2128 opt |= PICKAXE_BLAME_MOVE;
2129 blame_move_score = parse_score(arg+2);
2131 else if (!prefixcmp(arg, "-C")) {
2133 * -C enables copy from removed files;
2134 * -C -C enables copy from existing files, but only
2135 * when blaming a new file;
2136 * -C -C -C enables copy from existing files for
2139 if (opt & PICKAXE_BLAME_COPY_HARDER)
2140 opt |= PICKAXE_BLAME_COPY_HARDEST;
2141 if (opt & PICKAXE_BLAME_COPY)
2142 opt |= PICKAXE_BLAME_COPY_HARDER;
2143 opt |= PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE;
2144 blame_copy_score = parse_score(arg+2);
2146 else if (!prefixcmp(arg, "-L")) {
2155 die("More than one '-L n,m' option given");
2158 else if (!strcmp("--contents", arg)) {
2161 contents_from = argv[i];
2163 else if (!strcmp("--incremental", arg))
2165 else if (!strcmp("--score-debug", arg))
2166 output_option |= OUTPUT_SHOW_SCORE;
2167 else if (!strcmp("-f", arg) ||
2168 !strcmp("--show-name", arg))
2169 output_option |= OUTPUT_SHOW_NAME;
2170 else if (!strcmp("-n", arg) ||
2171 !strcmp("--show-number", arg))
2172 output_option |= OUTPUT_SHOW_NUMBER;
2173 else if (!strcmp("-p", arg) ||
2174 !strcmp("--porcelain", arg))
2175 output_option |= OUTPUT_PORCELAIN;
2176 else if (!strcmp("--", arg)) {
2188 if (!blame_move_score)
2189 blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
2190 if (!blame_copy_score)
2191 blame_copy_score = BLAME_DEFAULT_COPY_SCORE;
2194 * We have collected options unknown to us in argv[1..unk]
2195 * which are to be passed to revision machinery if we are
2196 * going to do the "bottom" processing.
2198 * The remaining are:
2200 * (1) if seen_dashdash, its either
2201 * "-options -- <path>" or
2202 * "-options -- <path> <rev>".
2203 * but the latter is allowed only if there is no
2204 * options that we passed to revision machinery.
2206 * (2) otherwise, we may have "--" somewhere later and
2207 * might be looking at the first one of multiple 'rev'
2208 * parameters (e.g. " master ^next ^maint -- path").
2209 * See if there is a dashdash first, and give the
2210 * arguments before that to revision machinery.
2211 * After that there must be one 'path'.
2213 * (3) otherwise, its one of the three:
2214 * "-options <path> <rev>"
2215 * "-options <rev> <path>"
2217 * but again the first one is allowed only if
2218 * there is no options that we passed to revision
2222 if (seen_dashdash) {
2226 path = add_prefix(prefix, argv[i]);
2227 if (i + 1 == argc - 1) {
2230 argv[unk++] = argv[i + 1];
2232 else if (i + 1 != argc)
2233 /* garbage at end */
2238 for (j = i; !seen_dashdash && j < argc; j++)
2239 if (!strcmp(argv[j], "--"))
2241 if (seen_dashdash) {
2243 if (seen_dashdash + 1 != argc - 1)
2245 path = add_prefix(prefix, argv[seen_dashdash + 1]);
2246 for (j = i; j < seen_dashdash; j++)
2247 argv[unk++] = argv[j];
2253 path = add_prefix(prefix, argv[i]);
2254 if (i + 1 == argc - 1) {
2255 final_commit_name = argv[i + 1];
2257 /* if (unk == 1) we could be getting
2260 if (unk == 1 && !has_path_in_work_tree(path)) {
2261 path = add_prefix(prefix, argv[i + 1]);
2262 final_commit_name = argv[i];
2265 else if (i != argc - 1)
2266 usage(blame_usage); /* garbage at end */
2268 if (!has_path_in_work_tree(path))
2269 die("cannot stat path %s: %s",
2270 path, strerror(errno));
2274 if (final_commit_name)
2275 argv[unk++] = final_commit_name;
2278 * Now we got rev and path. We do not want the path pruning
2279 * but we may want "bottom" processing.
2281 argv[unk++] = "--"; /* terminate the rev name */
2284 init_revisions(&revs, NULL);
2285 setup_revisions(unk, argv, &revs, NULL);
2286 memset(&sb, 0, sizeof(sb));
2289 * There must be one and only one positive commit in the
2290 * revs->pending array.
2292 for (i = 0; i < revs.pending.nr; i++) {
2293 struct object *obj = revs.pending.objects[i].item;
2294 if (obj->flags & UNINTERESTING)
2296 while (obj->type == OBJ_TAG)
2297 obj = deref_tag(obj, NULL, 0);
2298 if (obj->type != OBJ_COMMIT)
2299 die("Non commit %s?",
2300 revs.pending.objects[i].name);
2302 die("More than one commit to dig from %s and %s?",
2303 revs.pending.objects[i].name,
2305 sb.final = (struct commit *) obj;
2306 final_commit_name = revs.pending.objects[i].name;
2311 * "--not A B -- path" without anything positive;
2312 * do not default to HEAD, but use the working tree
2315 sb.final = fake_working_tree_commit(path, contents_from);
2316 add_pending_object(&revs, &(sb.final->object), ":");
2318 else if (contents_from)
2319 die("Cannot use --contents with final commit object name");
2322 * If we have bottom, this will mark the ancestors of the
2323 * bottom commits we would reach while traversing as
2326 prepare_revision_walk(&revs);
2328 if (is_null_sha1(sb.final->object.sha1)) {
2331 buf = xmalloc(o->file.size + 1);
2332 memcpy(buf, o->file.ptr, o->file.size + 1);
2334 sb.final_buf_size = o->file.size;
2337 o = get_origin(&sb, sb.final, path);
2338 if (fill_blob_sha1(o))
2339 die("no such path %s in %s", path, final_commit_name);
2341 sb.final_buf = read_sha1_file(o->blob_sha1, &type,
2342 &sb.final_buf_size);
2345 lno = prepare_lines(&sb);
2349 prepare_blame_range(&sb, bottomtop, lno, &bottom, &top);
2350 if (bottom && top && top < bottom) {
2352 tmp = top; top = bottom; bottom = tmp;
2360 die("file %s has only %lu lines", path, lno);
2362 ent = xcalloc(1, sizeof(*ent));
2364 ent->num_lines = top - bottom;
2366 ent->s_lno = bottom;
2371 if (revs_file && read_ancestry(revs_file))
2372 die("reading graft file %s failed: %s",
2373 revs_file, strerror(errno));
2375 assign_blame(&sb, &revs, opt);
2382 if (!(output_option & OUTPUT_PORCELAIN))
2383 find_alignment(&sb, &output_option);
2385 output(&sb, output_option);
2386 free((void *)sb.final_buf);
2387 for (ent = sb.ent; ent; ) {
2388 struct blame_entry *e = ent->next;
2394 printf("num read blob: %d\n", num_read_blob);
2395 printf("num get patch: %d\n", num_get_patch);
2396 printf("num commits: %d\n", num_commits);