4 * Copyright (c) 2006, 2014 by its authors
5 * See COPYING for licensing conditions
12 #include "repository.h"
17 #include "string-list.h"
19 #include "parse-options.h"
20 #include "prio-queue.h"
23 #include "line-range.h"
27 #include "object-store.h"
32 static char blame_usage
[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
34 static const char *blame_opt_usage
[] = {
37 N_("<rev-opts> are documented in git-rev-list(1)"),
41 static int longest_file
;
42 static int longest_author
;
43 static int max_orig_digits
;
44 static int max_digits
;
45 static int max_score_digits
;
48 static int blank_boundary
;
49 static int incremental
;
51 static int abbrev
= -1;
52 static int no_whole_file_rename
;
53 static int show_progress
;
54 static char repeated_meta_color
[COLOR_MAXLEN
];
55 static int coloring_mode
;
56 static struct string_list ignore_revs_file_list
= STRING_LIST_INIT_NODUP
;
57 static int mark_unblamable_lines
;
58 static int mark_ignored_lines
;
60 static struct date_mode blame_date_mode
= { DATE_ISO8601
};
61 static size_t blame_date_width
;
63 static struct string_list mailmap
= STRING_LIST_INIT_NODUP
;
69 static unsigned blame_move_score
;
70 static unsigned blame_copy_score
;
72 /* Remember to update object flag allocation in object.h */
73 #define METAINFO_SHOWN (1u<<12)
74 #define MORE_THAN_ONE_PATH (1u<<13)
76 struct progress_info
{
77 struct progress
*progress
;
81 static const char *nth_line_cb(void *data
, long lno
)
83 return blame_nth_line((struct blame_scoreboard
*)data
, lno
);
87 * Information on commits, used for output.
91 struct strbuf author_mail
;
92 timestamp_t author_time
;
93 struct strbuf author_tz
;
95 /* filled only when asked for details */
96 struct strbuf committer
;
97 struct strbuf committer_mail
;
98 timestamp_t committer_time
;
99 struct strbuf committer_tz
;
101 struct strbuf summary
;
105 * Parse author/committer line in the commit object buffer
107 static void get_ac_line(const char *inbuf
, const char *what
,
108 struct strbuf
*name
, struct strbuf
*mail
,
109 timestamp_t
*time
, struct strbuf
*tz
)
111 struct ident_split ident
;
112 size_t len
, maillen
, namelen
;
114 const char *namebuf
, *mailbuf
;
116 tmp
= strstr(inbuf
, what
);
120 endp
= strchr(tmp
, '\n');
126 if (split_ident_line(&ident
, tmp
, len
)) {
130 strbuf_addstr(name
, tmp
);
131 strbuf_addstr(mail
, tmp
);
132 strbuf_addstr(tz
, tmp
);
137 namelen
= ident
.name_end
- ident
.name_begin
;
138 namebuf
= ident
.name_begin
;
140 maillen
= ident
.mail_end
- ident
.mail_begin
;
141 mailbuf
= ident
.mail_begin
;
143 if (ident
.date_begin
&& ident
.date_end
)
144 *time
= strtoul(ident
.date_begin
, NULL
, 10);
148 if (ident
.tz_begin
&& ident
.tz_end
)
149 strbuf_add(tz
, ident
.tz_begin
, ident
.tz_end
- ident
.tz_begin
);
151 strbuf_addstr(tz
, "(unknown)");
154 * Now, convert both name and e-mail using mailmap
156 map_user(&mailmap
, &mailbuf
, &maillen
,
159 strbuf_addf(mail
, "<%.*s>", (int)maillen
, mailbuf
);
160 strbuf_add(name
, namebuf
, namelen
);
163 static void commit_info_init(struct commit_info
*ci
)
166 strbuf_init(&ci
->author
, 0);
167 strbuf_init(&ci
->author_mail
, 0);
168 strbuf_init(&ci
->author_tz
, 0);
169 strbuf_init(&ci
->committer
, 0);
170 strbuf_init(&ci
->committer_mail
, 0);
171 strbuf_init(&ci
->committer_tz
, 0);
172 strbuf_init(&ci
->summary
, 0);
175 static void commit_info_destroy(struct commit_info
*ci
)
178 strbuf_release(&ci
->author
);
179 strbuf_release(&ci
->author_mail
);
180 strbuf_release(&ci
->author_tz
);
181 strbuf_release(&ci
->committer
);
182 strbuf_release(&ci
->committer_mail
);
183 strbuf_release(&ci
->committer_tz
);
184 strbuf_release(&ci
->summary
);
187 static void get_commit_info(struct commit
*commit
,
188 struct commit_info
*ret
,
192 const char *subject
, *encoding
;
195 commit_info_init(ret
);
197 encoding
= get_log_output_encoding();
198 message
= logmsg_reencode(commit
, NULL
, encoding
);
199 get_ac_line(message
, "\nauthor ",
200 &ret
->author
, &ret
->author_mail
,
201 &ret
->author_time
, &ret
->author_tz
);
204 unuse_commit_buffer(commit
, message
);
208 get_ac_line(message
, "\ncommitter ",
209 &ret
->committer
, &ret
->committer_mail
,
210 &ret
->committer_time
, &ret
->committer_tz
);
212 len
= find_commit_subject(message
, &subject
);
214 strbuf_add(&ret
->summary
, subject
, len
);
216 strbuf_addf(&ret
->summary
, "(%s)", oid_to_hex(&commit
->object
.oid
));
218 unuse_commit_buffer(commit
, message
);
222 * Write out any suspect information which depends on the path. This must be
223 * handled separately from emit_one_suspect_detail(), because a given commit
224 * may have changes in multiple paths. So this needs to appear each time
225 * we mention a new group.
227 * To allow LF and other nonportable characters in pathnames,
228 * they are c-style quoted as needed.
230 static void write_filename_info(struct blame_origin
*suspect
)
232 if (suspect
->previous
) {
233 struct blame_origin
*prev
= suspect
->previous
;
234 printf("previous %s ", oid_to_hex(&prev
->commit
->object
.oid
));
235 write_name_quoted(prev
->path
, stdout
, '\n');
238 write_name_quoted(suspect
->path
, stdout
, '\n');
242 * Porcelain/Incremental format wants to show a lot of details per
243 * commit. Instead of repeating this every line, emit it only once,
244 * the first time each commit appears in the output (unless the
245 * user has specifically asked for us to repeat).
247 static int emit_one_suspect_detail(struct blame_origin
*suspect
, int repeat
)
249 struct commit_info ci
;
251 if (!repeat
&& (suspect
->commit
->object
.flags
& METAINFO_SHOWN
))
254 suspect
->commit
->object
.flags
|= METAINFO_SHOWN
;
255 get_commit_info(suspect
->commit
, &ci
, 1);
256 printf("author %s\n", ci
.author
.buf
);
257 printf("author-mail %s\n", ci
.author_mail
.buf
);
258 printf("author-time %"PRItime
"\n", ci
.author_time
);
259 printf("author-tz %s\n", ci
.author_tz
.buf
);
260 printf("committer %s\n", ci
.committer
.buf
);
261 printf("committer-mail %s\n", ci
.committer_mail
.buf
);
262 printf("committer-time %"PRItime
"\n", ci
.committer_time
);
263 printf("committer-tz %s\n", ci
.committer_tz
.buf
);
264 printf("summary %s\n", ci
.summary
.buf
);
265 if (suspect
->commit
->object
.flags
& UNINTERESTING
)
266 printf("boundary\n");
268 commit_info_destroy(&ci
);
274 * The blame_entry is found to be guilty for the range.
275 * Show it in incremental output.
277 static void found_guilty_entry(struct blame_entry
*ent
, void *data
)
279 struct progress_info
*pi
= (struct progress_info
*)data
;
282 struct blame_origin
*suspect
= ent
->suspect
;
284 printf("%s %d %d %d\n",
285 oid_to_hex(&suspect
->commit
->object
.oid
),
286 ent
->s_lno
+ 1, ent
->lno
+ 1, ent
->num_lines
);
287 emit_one_suspect_detail(suspect
, 0);
288 write_filename_info(suspect
);
289 maybe_flush_or_die(stdout
, "stdout");
291 pi
->blamed_lines
+= ent
->num_lines
;
292 display_progress(pi
->progress
, pi
->blamed_lines
);
295 static const char *format_time(timestamp_t time
, const char *tz_str
,
298 static struct strbuf time_buf
= STRBUF_INIT
;
300 strbuf_reset(&time_buf
);
302 strbuf_addf(&time_buf
, "%"PRItime
" %s", time
, tz_str
);
305 const char *time_str
;
309 time_str
= show_date(time
, tz
, &blame_date_mode
);
310 strbuf_addstr(&time_buf
, time_str
);
312 * Add space paddings to time_buf to display a fixed width
313 * string, and use time_width for display width calibration.
315 for (time_width
= utf8_strwidth(time_str
);
316 time_width
< blame_date_width
;
318 strbuf_addch(&time_buf
, ' ');
323 #define OUTPUT_ANNOTATE_COMPAT (1U<<0)
324 #define OUTPUT_LONG_OBJECT_NAME (1U<<1)
325 #define OUTPUT_RAW_TIMESTAMP (1U<<2)
326 #define OUTPUT_PORCELAIN (1U<<3)
327 #define OUTPUT_SHOW_NAME (1U<<4)
328 #define OUTPUT_SHOW_NUMBER (1U<<5)
329 #define OUTPUT_SHOW_SCORE (1U<<6)
330 #define OUTPUT_NO_AUTHOR (1U<<7)
331 #define OUTPUT_SHOW_EMAIL (1U<<8)
332 #define OUTPUT_LINE_PORCELAIN (1U<<9)
333 #define OUTPUT_COLOR_LINE (1U<<10)
334 #define OUTPUT_SHOW_AGE_WITH_COLOR (1U<<11)
336 static void emit_porcelain_details(struct blame_origin
*suspect
, int repeat
)
338 if (emit_one_suspect_detail(suspect
, repeat
) ||
339 (suspect
->commit
->object
.flags
& MORE_THAN_ONE_PATH
))
340 write_filename_info(suspect
);
343 static void emit_porcelain(struct blame_scoreboard
*sb
, struct blame_entry
*ent
,
346 int repeat
= opt
& OUTPUT_LINE_PORCELAIN
;
349 struct blame_origin
*suspect
= ent
->suspect
;
350 char hex
[GIT_MAX_HEXSZ
+ 1];
352 oid_to_hex_r(hex
, &suspect
->commit
->object
.oid
);
353 printf("%s %d %d %d\n",
358 emit_porcelain_details(suspect
, repeat
);
360 cp
= blame_nth_line(sb
, ent
->lno
);
361 for (cnt
= 0; cnt
< ent
->num_lines
; cnt
++) {
364 printf("%s %d %d\n", hex
,
365 ent
->s_lno
+ 1 + cnt
,
368 emit_porcelain_details(suspect
, 1);
374 } while (ch
!= '\n' &&
375 cp
< sb
->final_buf
+ sb
->final_buf_size
);
378 if (sb
->final_buf_size
&& cp
[-1] != '\n')
382 static struct color_field
{
384 char col
[COLOR_MAXLEN
];
386 static int colorfield_nr
, colorfield_alloc
;
388 static void parse_color_fields(const char *s
)
390 struct string_list l
= STRING_LIST_INIT_DUP
;
391 struct string_list_item
*item
;
392 enum { EXPECT_DATE
, EXPECT_COLOR
} next
= EXPECT_COLOR
;
396 /* Ideally this would be stripped and split at the same time? */
397 string_list_split(&l
, s
, ',', -1);
398 ALLOC_GROW(colorfield
, colorfield_nr
+ 1, colorfield_alloc
);
400 for_each_string_list_item(item
, &l
) {
403 colorfield
[colorfield_nr
].hop
= approxidate(item
->string
);
406 ALLOC_GROW(colorfield
, colorfield_nr
+ 1, colorfield_alloc
);
409 if (color_parse(item
->string
, colorfield
[colorfield_nr
].col
))
410 die(_("expecting a color: %s"), item
->string
);
416 if (next
== EXPECT_COLOR
)
417 die(_("must end with a color"));
419 colorfield
[colorfield_nr
].hop
= TIME_MAX
;
420 string_list_clear(&l
, 0);
423 static void setup_default_color_by_age(void)
425 parse_color_fields("blue,12 month ago,white,1 month ago,red");
428 static void determine_line_heat(struct commit_info
*ci
, const char **dest_color
)
432 while (i
< colorfield_nr
&& ci
->author_time
> colorfield
[i
].hop
)
435 *dest_color
= colorfield
[i
].col
;
438 static void emit_other(struct blame_scoreboard
*sb
, struct blame_entry
*ent
, int opt
)
442 struct blame_origin
*suspect
= ent
->suspect
;
443 struct commit_info ci
;
444 char hex
[GIT_MAX_HEXSZ
+ 1];
445 int show_raw_time
= !!(opt
& OUTPUT_RAW_TIMESTAMP
);
446 const char *default_color
= NULL
, *color
= NULL
, *reset
= NULL
;
448 get_commit_info(suspect
->commit
, &ci
, 1);
449 oid_to_hex_r(hex
, &suspect
->commit
->object
.oid
);
451 cp
= blame_nth_line(sb
, ent
->lno
);
453 if (opt
& OUTPUT_SHOW_AGE_WITH_COLOR
) {
454 determine_line_heat(&ci
, &default_color
);
455 color
= default_color
;
456 reset
= GIT_COLOR_RESET
;
459 for (cnt
= 0; cnt
< ent
->num_lines
; cnt
++) {
461 int length
= (opt
& OUTPUT_LONG_OBJECT_NAME
) ? the_hash_algo
->hexsz
: abbrev
;
463 if (opt
& OUTPUT_COLOR_LINE
) {
465 color
= repeated_meta_color
;
466 reset
= GIT_COLOR_RESET
;
468 color
= default_color
? default_color
: NULL
;
469 reset
= default_color
? GIT_COLOR_RESET
: NULL
;
473 fputs(color
, stdout
);
475 if (suspect
->commit
->object
.flags
& UNINTERESTING
) {
477 memset(hex
, ' ', length
);
478 else if (!(opt
& OUTPUT_ANNOTATE_COMPAT
)) {
484 if (mark_unblamable_lines
&& ent
->unblamable
) {
488 if (mark_ignored_lines
&& ent
->ignored
) {
492 printf("%.*s", length
, hex
);
493 if (opt
& OUTPUT_ANNOTATE_COMPAT
) {
495 if (opt
& OUTPUT_SHOW_EMAIL
)
496 name
= ci
.author_mail
.buf
;
498 name
= ci
.author
.buf
;
499 printf("\t(%10s\t%10s\t%d)", name
,
500 format_time(ci
.author_time
, ci
.author_tz
.buf
,
504 if (opt
& OUTPUT_SHOW_SCORE
)
506 max_score_digits
, ent
->score
,
507 ent
->suspect
->refcnt
);
508 if (opt
& OUTPUT_SHOW_NAME
)
509 printf(" %-*.*s", longest_file
, longest_file
,
511 if (opt
& OUTPUT_SHOW_NUMBER
)
512 printf(" %*d", max_orig_digits
,
513 ent
->s_lno
+ 1 + cnt
);
515 if (!(opt
& OUTPUT_NO_AUTHOR
)) {
518 if (opt
& OUTPUT_SHOW_EMAIL
)
519 name
= ci
.author_mail
.buf
;
521 name
= ci
.author
.buf
;
522 pad
= longest_author
- utf8_strwidth(name
);
523 printf(" (%s%*s %10s",
525 format_time(ci
.author_time
,
530 max_digits
, ent
->lno
+ 1 + cnt
);
533 fputs(reset
, stdout
);
537 } while (ch
!= '\n' &&
538 cp
< sb
->final_buf
+ sb
->final_buf_size
);
541 if (sb
->final_buf_size
&& cp
[-1] != '\n')
544 commit_info_destroy(&ci
);
547 static void output(struct blame_scoreboard
*sb
, int option
)
549 struct blame_entry
*ent
;
551 if (option
& OUTPUT_PORCELAIN
) {
552 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
554 struct blame_origin
*suspect
;
555 struct commit
*commit
= ent
->suspect
->commit
;
556 if (commit
->object
.flags
& MORE_THAN_ONE_PATH
)
558 for (suspect
= get_blame_suspects(commit
); suspect
; suspect
= suspect
->next
) {
559 if (suspect
->guilty
&& count
++) {
560 commit
->object
.flags
|= MORE_THAN_ONE_PATH
;
567 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
568 if (option
& OUTPUT_PORCELAIN
)
569 emit_porcelain(sb
, ent
, option
);
571 emit_other(sb
, ent
, option
);
577 * Add phony grafts for use with -S; this is primarily to
578 * support git's cvsserver that wants to give a linear history
581 static int read_ancestry(const char *graft_file
)
583 FILE *fp
= fopen_or_warn(graft_file
, "r");
584 struct strbuf buf
= STRBUF_INIT
;
587 while (!strbuf_getwholeline(&buf
, fp
, '\n')) {
588 /* The format is just "Commit Parent1 Parent2 ...\n" */
589 struct commit_graft
*graft
= read_graft_line(&buf
);
591 register_commit_graft(the_repository
, graft
, 0);
594 strbuf_release(&buf
);
598 static int update_auto_abbrev(int auto_abbrev
, struct blame_origin
*suspect
)
600 const char *uniq
= find_unique_abbrev(&suspect
->commit
->object
.oid
,
602 int len
= strlen(uniq
);
603 if (auto_abbrev
< len
)
609 * How many columns do we need to show line numbers, authors,
612 static void find_alignment(struct blame_scoreboard
*sb
, int *option
)
614 int longest_src_lines
= 0;
615 int longest_dst_lines
= 0;
616 unsigned largest_score
= 0;
617 struct blame_entry
*e
;
618 int compute_auto_abbrev
= (abbrev
< 0);
619 int auto_abbrev
= DEFAULT_ABBREV
;
621 for (e
= sb
->ent
; e
; e
= e
->next
) {
622 struct blame_origin
*suspect
= e
->suspect
;
625 if (compute_auto_abbrev
)
626 auto_abbrev
= update_auto_abbrev(auto_abbrev
, suspect
);
627 if (strcmp(suspect
->path
, sb
->path
))
628 *option
|= OUTPUT_SHOW_NAME
;
629 num
= strlen(suspect
->path
);
630 if (longest_file
< num
)
632 if (!(suspect
->commit
->object
.flags
& METAINFO_SHOWN
)) {
633 struct commit_info ci
;
634 suspect
->commit
->object
.flags
|= METAINFO_SHOWN
;
635 get_commit_info(suspect
->commit
, &ci
, 1);
636 if (*option
& OUTPUT_SHOW_EMAIL
)
637 num
= utf8_strwidth(ci
.author_mail
.buf
);
639 num
= utf8_strwidth(ci
.author
.buf
);
640 if (longest_author
< num
)
641 longest_author
= num
;
642 commit_info_destroy(&ci
);
644 num
= e
->s_lno
+ e
->num_lines
;
645 if (longest_src_lines
< num
)
646 longest_src_lines
= num
;
647 num
= e
->lno
+ e
->num_lines
;
648 if (longest_dst_lines
< num
)
649 longest_dst_lines
= num
;
650 if (largest_score
< blame_entry_score(sb
, e
))
651 largest_score
= blame_entry_score(sb
, e
);
653 max_orig_digits
= decimal_width(longest_src_lines
);
654 max_digits
= decimal_width(longest_dst_lines
);
655 max_score_digits
= decimal_width(largest_score
);
657 if (compute_auto_abbrev
)
658 /* one more abbrev length is needed for the boundary commit */
659 abbrev
= auto_abbrev
+ 1;
662 static void sanity_check_on_fail(struct blame_scoreboard
*sb
, int baa
)
664 int opt
= OUTPUT_SHOW_SCORE
| OUTPUT_SHOW_NUMBER
| OUTPUT_SHOW_NAME
;
665 find_alignment(sb
, &opt
);
670 static unsigned parse_score(const char *arg
)
673 unsigned long score
= strtoul(arg
, &end
, 10);
679 static const char *add_prefix(const char *prefix
, const char *path
)
681 return prefix_path(prefix
, prefix
? strlen(prefix
) : 0, path
);
684 static int git_blame_config(const char *var
, const char *value
, void *cb
)
686 if (!strcmp(var
, "blame.showroot")) {
687 show_root
= git_config_bool(var
, value
);
690 if (!strcmp(var
, "blame.blankboundary")) {
691 blank_boundary
= git_config_bool(var
, value
);
694 if (!strcmp(var
, "blame.showemail")) {
695 int *output_option
= cb
;
696 if (git_config_bool(var
, value
))
697 *output_option
|= OUTPUT_SHOW_EMAIL
;
699 *output_option
&= ~OUTPUT_SHOW_EMAIL
;
702 if (!strcmp(var
, "blame.date")) {
704 return config_error_nonbool(var
);
705 parse_date_format(value
, &blame_date_mode
);
708 if (!strcmp(var
, "blame.ignorerevsfile")) {
712 ret
= git_config_pathname(&str
, var
, value
);
715 string_list_insert(&ignore_revs_file_list
, str
);
718 if (!strcmp(var
, "blame.markunblamablelines")) {
719 mark_unblamable_lines
= git_config_bool(var
, value
);
722 if (!strcmp(var
, "blame.markignoredlines")) {
723 mark_ignored_lines
= git_config_bool(var
, value
);
726 if (!strcmp(var
, "color.blame.repeatedlines")) {
727 if (color_parse_mem(value
, strlen(value
), repeated_meta_color
))
728 warning(_("invalid color '%s' in color.blame.repeatedLines"),
732 if (!strcmp(var
, "color.blame.highlightrecent")) {
733 parse_color_fields(value
);
737 if (!strcmp(var
, "blame.coloring")) {
738 if (!strcmp(value
, "repeatedLines")) {
739 coloring_mode
|= OUTPUT_COLOR_LINE
;
740 } else if (!strcmp(value
, "highlightRecent")) {
741 coloring_mode
|= OUTPUT_SHOW_AGE_WITH_COLOR
;
742 } else if (!strcmp(value
, "none")) {
743 coloring_mode
&= ~(OUTPUT_COLOR_LINE
|
744 OUTPUT_SHOW_AGE_WITH_COLOR
);
746 warning(_("invalid value for blame.coloring"));
751 if (git_diff_heuristic_config(var
, value
, cb
) < 0)
753 if (userdiff_config(var
, value
) < 0)
756 return git_default_config(var
, value
, cb
);
759 static int blame_copy_callback(const struct option
*option
, const char *arg
, int unset
)
761 int *opt
= option
->value
;
763 BUG_ON_OPT_NEG(unset
);
766 * -C enables copy from removed files;
767 * -C -C enables copy from existing files, but only
768 * when blaming a new file;
769 * -C -C -C enables copy from existing files for
772 if (*opt
& PICKAXE_BLAME_COPY_HARDER
)
773 *opt
|= PICKAXE_BLAME_COPY_HARDEST
;
774 if (*opt
& PICKAXE_BLAME_COPY
)
775 *opt
|= PICKAXE_BLAME_COPY_HARDER
;
776 *opt
|= PICKAXE_BLAME_COPY
| PICKAXE_BLAME_MOVE
;
779 blame_copy_score
= parse_score(arg
);
783 static int blame_move_callback(const struct option
*option
, const char *arg
, int unset
)
785 int *opt
= option
->value
;
787 BUG_ON_OPT_NEG(unset
);
789 *opt
|= PICKAXE_BLAME_MOVE
;
792 blame_move_score
= parse_score(arg
);
796 static int is_a_rev(const char *name
)
798 struct object_id oid
;
800 if (get_oid(name
, &oid
))
802 return OBJ_NONE
< oid_object_info(the_repository
, &oid
, NULL
);
805 static int peel_to_commit_oid(struct object_id
*oid_ret
, void *cbdata
)
807 struct repository
*r
= ((struct blame_scoreboard
*)cbdata
)->repo
;
808 struct object_id oid
;
810 oidcpy(&oid
, oid_ret
);
813 int kind
= oid_object_info(r
, &oid
, NULL
);
814 if (kind
== OBJ_COMMIT
) {
815 oidcpy(oid_ret
, &oid
);
820 obj
= deref_tag(r
, parse_object(r
, &oid
), NULL
, 0);
823 oidcpy(&oid
, &obj
->oid
);
827 static void build_ignorelist(struct blame_scoreboard
*sb
,
828 struct string_list
*ignore_revs_file_list
,
829 struct string_list
*ignore_rev_list
)
831 struct string_list_item
*i
;
832 struct object_id oid
;
834 oidset_init(&sb
->ignore_list
, 0);
835 for_each_string_list_item(i
, ignore_revs_file_list
) {
836 if (!strcmp(i
->string
, ""))
837 oidset_clear(&sb
->ignore_list
);
839 oidset_parse_file_carefully(&sb
->ignore_list
, i
->string
,
840 peel_to_commit_oid
, sb
);
842 for_each_string_list_item(i
, ignore_rev_list
) {
843 if (get_oid_committish(i
->string
, &oid
) ||
844 peel_to_commit_oid(&oid
, sb
))
845 die(_("cannot find revision %s to ignore"), i
->string
);
846 oidset_insert(&sb
->ignore_list
, &oid
);
850 int cmd_blame(int argc
, const char **argv
, const char *prefix
)
852 struct rev_info revs
;
854 struct blame_scoreboard sb
;
855 struct blame_origin
*o
;
856 struct blame_entry
*ent
= NULL
;
857 long dashdash_pos
, lno
;
858 struct progress_info pi
= { NULL
, 0 };
860 struct string_list range_list
= STRING_LIST_INIT_NODUP
;
861 struct string_list ignore_rev_list
= STRING_LIST_INIT_NODUP
;
862 int output_option
= 0, opt
= 0;
864 const char *revs_file
= NULL
;
865 const char *contents_from
= NULL
;
866 const struct option options
[] = {
867 OPT_BOOL(0, "incremental", &incremental
, N_("show blame entries as we find them, incrementally")),
868 OPT_BOOL('b', NULL
, &blank_boundary
, N_("do not show object names of boundary commits (Default: off)")),
869 OPT_BOOL(0, "root", &show_root
, N_("do not treat root commits as boundaries (Default: off)")),
870 OPT_BOOL(0, "show-stats", &show_stats
, N_("show work cost statistics")),
871 OPT_BOOL(0, "progress", &show_progress
, N_("force progress reporting")),
872 OPT_BIT(0, "score-debug", &output_option
, N_("show output score for blame entries"), OUTPUT_SHOW_SCORE
),
873 OPT_BIT('f', "show-name", &output_option
, N_("show original filename (Default: auto)"), OUTPUT_SHOW_NAME
),
874 OPT_BIT('n', "show-number", &output_option
, N_("show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER
),
875 OPT_BIT('p', "porcelain", &output_option
, N_("show in a format designed for machine consumption"), OUTPUT_PORCELAIN
),
876 OPT_BIT(0, "line-porcelain", &output_option
, N_("show porcelain format with per-line commit information"), OUTPUT_PORCELAIN
|OUTPUT_LINE_PORCELAIN
),
877 OPT_BIT('c', NULL
, &output_option
, N_("use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT
),
878 OPT_BIT('t', NULL
, &output_option
, N_("show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP
),
879 OPT_BIT('l', NULL
, &output_option
, N_("show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME
),
880 OPT_BIT('s', NULL
, &output_option
, N_("suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR
),
881 OPT_BIT('e', "show-email", &output_option
, N_("show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL
),
882 OPT_BIT('w', NULL
, &xdl_opts
, N_("ignore whitespace differences"), XDF_IGNORE_WHITESPACE
),
883 OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list
, N_("rev"), N_("ignore <rev> when blaming")),
884 OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list
, N_("file"), N_("ignore revisions from <file>")),
885 OPT_BIT(0, "color-lines", &output_option
, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE
),
886 OPT_BIT(0, "color-by-age", &output_option
, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR
),
887 OPT_BIT(0, "minimal", &xdl_opts
, N_("spend extra cycles to find better match"), XDF_NEED_MINIMAL
),
888 OPT_STRING('S', NULL
, &revs_file
, N_("file"), N_("use revisions from <file> instead of calling git-rev-list")),
889 OPT_STRING(0, "contents", &contents_from
, N_("file"), N_("use <file>'s contents as the final image")),
890 OPT_CALLBACK_F('C', NULL
, &opt
, N_("score"), N_("find line copies within and across files"), PARSE_OPT_OPTARG
, blame_copy_callback
),
891 OPT_CALLBACK_F('M', NULL
, &opt
, N_("score"), N_("find line movements within and across files"), PARSE_OPT_OPTARG
, blame_move_callback
),
892 OPT_STRING_LIST('L', NULL
, &range_list
, N_("range"),
893 N_("process only line range <start>,<end> or function :<funcname>")),
894 OPT__ABBREV(&abbrev
),
898 struct parse_opt_ctx_t ctx
;
899 int cmd_is_annotate
= !strcmp(argv
[0], "annotate");
900 struct range_set ranges
;
901 unsigned int range_i
;
903 const int hexsz
= the_hash_algo
->hexsz
;
905 setup_default_color_by_age();
906 git_config(git_blame_config
, &output_option
);
907 repo_init_revisions(the_repository
, &revs
, NULL
);
908 revs
.date_mode
= blame_date_mode
;
909 revs
.diffopt
.flags
.allow_textconv
= 1;
910 revs
.diffopt
.flags
.follow_renames
= 1;
912 save_commit_buffer
= 0;
916 parse_options_start(&ctx
, argc
, argv
, prefix
, options
,
917 PARSE_OPT_KEEP_DASHDASH
| PARSE_OPT_KEEP_ARGV0
);
919 switch (parse_options_step(&ctx
, options
, blame_opt_usage
)) {
921 case PARSE_OPT_ERROR
:
923 case PARSE_OPT_COMPLETE
:
927 dashdash_pos
= ctx
.cpidx
;
931 if (!strcmp(ctx
.argv
[0], "--reverse")) {
932 ctx
.argv
[0] = "--children";
935 parse_revision_opt(&revs
, &ctx
, options
, blame_opt_usage
);
938 no_whole_file_rename
= !revs
.diffopt
.flags
.follow_renames
;
939 xdl_opts
|= revs
.diffopt
.xdl_opts
& XDF_INDENT_HEURISTIC
;
940 revs
.diffopt
.flags
.follow_renames
= 0;
941 argc
= parse_options_end(&ctx
);
943 if (incremental
|| (output_option
& OUTPUT_PORCELAIN
)) {
944 if (show_progress
> 0)
945 die(_("--progress can't be used with --incremental or porcelain formats"));
947 } else if (show_progress
< 0)
948 show_progress
= isatty(2);
950 if (0 < abbrev
&& abbrev
< hexsz
)
951 /* one more abbrev length is needed for the boundary commit */
956 if (revs_file
&& read_ancestry(revs_file
))
957 die_errno("reading graft file '%s' failed", revs_file
);
959 if (cmd_is_annotate
) {
960 output_option
|= OUTPUT_ANNOTATE_COMPAT
;
961 blame_date_mode
.type
= DATE_ISO8601
;
963 blame_date_mode
= revs
.date_mode
;
966 /* The maximum width used to show the dates */
967 switch (blame_date_mode
.type
) {
969 blame_date_width
= sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
971 case DATE_ISO8601_STRICT
:
972 blame_date_width
= sizeof("2006-10-19T16:00:04-07:00");
975 blame_date_width
= sizeof("2006-10-19 16:00:04 -0700");
978 blame_date_width
= sizeof("1161298804 -0700");
981 blame_date_width
= sizeof("1161298804");
984 blame_date_width
= sizeof("2006-10-19");
988 * TRANSLATORS: This string is used to tell us the
989 * maximum display width for a relative timestamp in
990 * "git blame" output. For C locale, "4 years, 11
991 * months ago", which takes 22 places, is the longest
992 * among various forms of relative timestamps, but
993 * your language may need more or fewer display
996 blame_date_width
= utf8_strwidth(_("4 years, 11 months ago")) + 1; /* add the null */
999 /* If the year is shown, no time is shown */
1000 blame_date_width
= sizeof("Thu Oct 19 16:00");
1003 blame_date_width
= sizeof("Thu Oct 19 16:00:04 2006 -0700");
1006 blame_date_width
= strlen(show_date(0, 0, &blame_date_mode
)) + 1; /* add the null */
1009 blame_date_width
-= 1; /* strip the null */
1011 if (revs
.diffopt
.flags
.find_copies_harder
)
1012 opt
|= (PICKAXE_BLAME_COPY
| PICKAXE_BLAME_MOVE
|
1013 PICKAXE_BLAME_COPY_HARDER
);
1016 * We have collected options unknown to us in argv[1..unk]
1017 * which are to be passed to revision machinery if we are
1018 * going to do the "bottom" processing.
1020 * The remaining are:
1022 * (1) if dashdash_pos != 0, it is either
1023 * "blame [revisions] -- <path>" or
1024 * "blame -- <path> <rev>"
1026 * (2) otherwise, it is one of the two:
1027 * "blame [revisions] <path>"
1028 * "blame <path> <rev>"
1030 * Note that we must strip out <path> from the arguments: we do not
1031 * want the path pruning but we may want "bottom" processing.
1034 switch (argc
- dashdash_pos
- 1) {
1037 usage_with_options(blame_opt_usage
, options
);
1038 /* reorder for the new way: <rev> -- <path> */
1044 path
= add_prefix(prefix
, argv
[--argc
]);
1048 usage_with_options(blame_opt_usage
, options
);
1052 usage_with_options(blame_opt_usage
, options
);
1053 if (argc
== 3 && is_a_rev(argv
[argc
- 1])) { /* (2b) */
1054 path
= add_prefix(prefix
, argv
[1]);
1057 if (argc
== 2 && is_a_rev(argv
[1]) && !get_git_work_tree())
1058 die("missing <path> to blame");
1059 path
= add_prefix(prefix
, argv
[argc
- 1]);
1061 argv
[argc
- 1] = "--";
1064 revs
.disable_stdin
= 1;
1065 setup_revisions(argc
, argv
, &revs
, NULL
);
1066 if (!revs
.pending
.nr
&& is_bare_repository()) {
1067 struct commit
*head_commit
;
1068 struct object_id head_oid
;
1070 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
,
1072 !(head_commit
= lookup_commit_reference_gently(revs
.repo
,
1074 die("no such ref: HEAD");
1076 add_pending_object(&revs
, &head_commit
->object
, "HEAD");
1079 init_scoreboard(&sb
);
1081 sb
.contents_from
= contents_from
;
1082 sb
.reverse
= reverse
;
1083 sb
.repo
= the_repository
;
1085 build_ignorelist(&sb
, &ignore_revs_file_list
, &ignore_rev_list
);
1086 string_list_clear(&ignore_revs_file_list
, 0);
1087 string_list_clear(&ignore_rev_list
, 0);
1088 setup_scoreboard(&sb
, &o
);
1091 * Changed-path Bloom filters are disabled when looking
1094 if (!(opt
& PICKAXE_BLAME_COPY
))
1095 setup_blame_bloom_data(&sb
);
1099 if (lno
&& !range_list
.nr
)
1100 string_list_append(&range_list
, "1");
1103 range_set_init(&ranges
, range_list
.nr
);
1104 for (range_i
= 0; range_i
< range_list
.nr
; ++range_i
) {
1106 if (parse_range_arg(range_list
.items
[range_i
].string
,
1107 nth_line_cb
, &sb
, lno
, anchor
,
1108 &bottom
, &top
, sb
.path
,
1109 the_repository
->index
))
1111 if ((!lno
&& (top
|| bottom
)) || lno
< bottom
)
1112 die(Q_("file %s has only %lu line",
1113 "file %s has only %lu lines",
1114 lno
), sb
.path
, lno
);
1117 if (top
< 1 || lno
< top
)
1120 range_set_append_unsafe(&ranges
, bottom
, top
);
1123 sort_and_merge_range_set(&ranges
);
1125 for (range_i
= ranges
.nr
; range_i
> 0; --range_i
) {
1126 const struct range
*r
= &ranges
.ranges
[range_i
- 1];
1127 ent
= blame_entry_prepend(ent
, r
->start
, r
->end
, o
);
1131 prio_queue_put(&sb
.commits
, o
->commit
);
1133 blame_origin_decref(o
);
1135 range_set_release(&ranges
);
1136 string_list_clear(&range_list
, 0);
1140 if (blame_move_score
)
1141 sb
.move_score
= blame_move_score
;
1142 if (blame_copy_score
)
1143 sb
.copy_score
= blame_copy_score
;
1145 sb
.debug
= DEBUG_BLAME
;
1146 sb
.on_sanity_fail
= &sanity_check_on_fail
;
1148 sb
.show_root
= show_root
;
1149 sb
.xdl_opts
= xdl_opts
;
1150 sb
.no_whole_file_rename
= no_whole_file_rename
;
1152 read_mailmap(&mailmap
);
1154 sb
.found_guilty_entry
= &found_guilty_entry
;
1155 sb
.found_guilty_entry_data
= &pi
;
1157 pi
.progress
= start_delayed_progress(_("Blaming lines"), sb
.num_lines
);
1159 assign_blame(&sb
, opt
);
1161 stop_progress(&pi
.progress
);
1168 blame_sort_final(&sb
);
1170 blame_coalesce(&sb
);
1172 if (!(output_option
& (OUTPUT_COLOR_LINE
| OUTPUT_SHOW_AGE_WITH_COLOR
)))
1173 output_option
|= coloring_mode
;
1175 if (!(output_option
& OUTPUT_PORCELAIN
)) {
1176 find_alignment(&sb
, &output_option
);
1177 if (!*repeated_meta_color
&&
1178 (output_option
& OUTPUT_COLOR_LINE
))
1179 xsnprintf(repeated_meta_color
,
1180 sizeof(repeated_meta_color
),
1181 "%s", GIT_COLOR_CYAN
);
1183 if (output_option
& OUTPUT_ANNOTATE_COMPAT
)
1184 output_option
&= ~(OUTPUT_COLOR_LINE
| OUTPUT_SHOW_AGE_WITH_COLOR
);
1186 output(&sb
, output_option
);
1187 free((void *)sb
.final_buf
);
1188 for (ent
= sb
.ent
; ent
; ) {
1189 struct blame_entry
*e
= ent
->next
;
1195 printf("num read blob: %d\n", sb
.num_read_blob
);
1196 printf("num get patch: %d\n", sb
.num_get_patch
);
1197 printf("num commits: %d\n", sb
.num_commits
);
1200 cleanup_scoreboard(&sb
);