4 * Copyright (c) 2006, 2014 by its authors
5 * See COPYING for licensing conditions
8 #include "git-compat-util.h"
12 #include "environment.h"
15 #include "repository.h"
20 #include "string-list.h"
22 #include "parse-options.h"
23 #include "prio-queue.h"
26 #include "line-range.h"
29 #include "object-name.h"
30 #include "object-store-ll.h"
36 #include "write-or-die.h"
38 static char blame_usage
[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
39 static char annotate_usage
[] = N_("git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>");
41 static const char *blame_opt_usage
[] = {
44 N_("<rev-opts> are documented in git-rev-list(1)"),
48 static const char *annotate_opt_usage
[] = {
51 N_("<rev-opts> are documented in git-rev-list(1)"),
55 static int longest_file
;
56 static int longest_author
;
57 static int max_orig_digits
;
58 static int max_digits
;
59 static int max_score_digits
;
62 static int blank_boundary
;
63 static int incremental
;
65 static int abbrev
= -1;
66 static int no_whole_file_rename
;
67 static int show_progress
;
68 static char repeated_meta_color
[COLOR_MAXLEN
];
69 static int coloring_mode
;
70 static struct string_list ignore_revs_file_list
= STRING_LIST_INIT_NODUP
;
71 static int mark_unblamable_lines
;
72 static int mark_ignored_lines
;
74 static struct date_mode blame_date_mode
= { DATE_ISO8601
};
75 static size_t blame_date_width
;
77 static struct string_list mailmap
= STRING_LIST_INIT_NODUP
;
83 static unsigned blame_move_score
;
84 static unsigned blame_copy_score
;
86 /* Remember to update object flag allocation in object.h */
87 #define METAINFO_SHOWN (1u<<12)
88 #define MORE_THAN_ONE_PATH (1u<<13)
90 struct progress_info
{
91 struct progress
*progress
;
95 static const char *nth_line_cb(void *data
, long lno
)
97 return blame_nth_line((struct blame_scoreboard
*)data
, lno
);
101 * Information on commits, used for output.
104 struct strbuf author
;
105 struct strbuf author_mail
;
106 timestamp_t author_time
;
107 struct strbuf author_tz
;
109 /* filled only when asked for details */
110 struct strbuf committer
;
111 struct strbuf committer_mail
;
112 timestamp_t committer_time
;
113 struct strbuf committer_tz
;
115 struct strbuf summary
;
118 #define COMMIT_INFO_INIT { \
119 .author = STRBUF_INIT, \
120 .author_mail = STRBUF_INIT, \
121 .author_tz = STRBUF_INIT, \
122 .committer = STRBUF_INIT, \
123 .committer_mail = STRBUF_INIT, \
124 .committer_tz = STRBUF_INIT, \
125 .summary = STRBUF_INIT, \
129 * Parse author/committer line in the commit object buffer
131 static void get_ac_line(const char *inbuf
, const char *what
,
132 struct strbuf
*name
, struct strbuf
*mail
,
133 timestamp_t
*time
, struct strbuf
*tz
)
135 struct ident_split ident
;
136 size_t len
, maillen
, namelen
;
138 const char *namebuf
, *mailbuf
;
140 tmp
= strstr(inbuf
, what
);
144 endp
= strchr(tmp
, '\n');
150 if (split_ident_line(&ident
, tmp
, len
)) {
154 strbuf_addstr(name
, tmp
);
155 strbuf_addstr(mail
, tmp
);
156 strbuf_addstr(tz
, tmp
);
161 namelen
= ident
.name_end
- ident
.name_begin
;
162 namebuf
= ident
.name_begin
;
164 maillen
= ident
.mail_end
- ident
.mail_begin
;
165 mailbuf
= ident
.mail_begin
;
167 if (ident
.date_begin
&& ident
.date_end
)
168 *time
= strtoul(ident
.date_begin
, NULL
, 10);
172 if (ident
.tz_begin
&& ident
.tz_end
)
173 strbuf_add(tz
, ident
.tz_begin
, ident
.tz_end
- ident
.tz_begin
);
175 strbuf_addstr(tz
, "(unknown)");
178 * Now, convert both name and e-mail using mailmap
180 map_user(&mailmap
, &mailbuf
, &maillen
,
183 strbuf_addf(mail
, "<%.*s>", (int)maillen
, mailbuf
);
184 strbuf_add(name
, namebuf
, namelen
);
187 static void commit_info_destroy(struct commit_info
*ci
)
190 strbuf_release(&ci
->author
);
191 strbuf_release(&ci
->author_mail
);
192 strbuf_release(&ci
->author_tz
);
193 strbuf_release(&ci
->committer
);
194 strbuf_release(&ci
->committer_mail
);
195 strbuf_release(&ci
->committer_tz
);
196 strbuf_release(&ci
->summary
);
199 static void get_commit_info(struct commit
*commit
,
200 struct commit_info
*ret
,
204 const char *subject
, *encoding
;
207 encoding
= get_log_output_encoding();
208 message
= repo_logmsg_reencode(the_repository
, commit
, NULL
, encoding
);
209 get_ac_line(message
, "\nauthor ",
210 &ret
->author
, &ret
->author_mail
,
211 &ret
->author_time
, &ret
->author_tz
);
214 repo_unuse_commit_buffer(the_repository
, commit
, message
);
218 get_ac_line(message
, "\ncommitter ",
219 &ret
->committer
, &ret
->committer_mail
,
220 &ret
->committer_time
, &ret
->committer_tz
);
222 len
= find_commit_subject(message
, &subject
);
224 strbuf_add(&ret
->summary
, subject
, len
);
226 strbuf_addf(&ret
->summary
, "(%s)", oid_to_hex(&commit
->object
.oid
));
228 repo_unuse_commit_buffer(the_repository
, commit
, message
);
232 * Write out any suspect information which depends on the path. This must be
233 * handled separately from emit_one_suspect_detail(), because a given commit
234 * may have changes in multiple paths. So this needs to appear each time
235 * we mention a new group.
237 * To allow LF and other nonportable characters in pathnames,
238 * they are c-style quoted as needed.
240 static void write_filename_info(struct blame_origin
*suspect
)
242 if (suspect
->previous
) {
243 struct blame_origin
*prev
= suspect
->previous
;
244 printf("previous %s ", oid_to_hex(&prev
->commit
->object
.oid
));
245 write_name_quoted(prev
->path
, stdout
, '\n');
248 write_name_quoted(suspect
->path
, stdout
, '\n');
252 * Porcelain/Incremental format wants to show a lot of details per
253 * commit. Instead of repeating this every line, emit it only once,
254 * the first time each commit appears in the output (unless the
255 * user has specifically asked for us to repeat).
257 static int emit_one_suspect_detail(struct blame_origin
*suspect
, int repeat
)
259 struct commit_info ci
= COMMIT_INFO_INIT
;
261 if (!repeat
&& (suspect
->commit
->object
.flags
& METAINFO_SHOWN
))
264 suspect
->commit
->object
.flags
|= METAINFO_SHOWN
;
265 get_commit_info(suspect
->commit
, &ci
, 1);
266 printf("author %s\n", ci
.author
.buf
);
267 printf("author-mail %s\n", ci
.author_mail
.buf
);
268 printf("author-time %"PRItime
"\n", ci
.author_time
);
269 printf("author-tz %s\n", ci
.author_tz
.buf
);
270 printf("committer %s\n", ci
.committer
.buf
);
271 printf("committer-mail %s\n", ci
.committer_mail
.buf
);
272 printf("committer-time %"PRItime
"\n", ci
.committer_time
);
273 printf("committer-tz %s\n", ci
.committer_tz
.buf
);
274 printf("summary %s\n", ci
.summary
.buf
);
275 if (suspect
->commit
->object
.flags
& UNINTERESTING
)
276 printf("boundary\n");
278 commit_info_destroy(&ci
);
284 * The blame_entry is found to be guilty for the range.
285 * Show it in incremental output.
287 static void found_guilty_entry(struct blame_entry
*ent
, void *data
)
289 struct progress_info
*pi
= (struct progress_info
*)data
;
292 struct blame_origin
*suspect
= ent
->suspect
;
294 printf("%s %d %d %d\n",
295 oid_to_hex(&suspect
->commit
->object
.oid
),
296 ent
->s_lno
+ 1, ent
->lno
+ 1, ent
->num_lines
);
297 emit_one_suspect_detail(suspect
, 0);
298 write_filename_info(suspect
);
299 maybe_flush_or_die(stdout
, "stdout");
301 pi
->blamed_lines
+= ent
->num_lines
;
302 display_progress(pi
->progress
, pi
->blamed_lines
);
305 static const char *format_time(timestamp_t time
, const char *tz_str
,
308 static struct strbuf time_buf
= STRBUF_INIT
;
310 strbuf_reset(&time_buf
);
312 strbuf_addf(&time_buf
, "%"PRItime
" %s", time
, tz_str
);
315 const char *time_str
;
319 time_str
= show_date(time
, tz
, &blame_date_mode
);
320 strbuf_addstr(&time_buf
, time_str
);
322 * Add space paddings to time_buf to display a fixed width
323 * string, and use time_width for display width calibration.
325 for (time_width
= utf8_strwidth(time_str
);
326 time_width
< blame_date_width
;
328 strbuf_addch(&time_buf
, ' ');
333 #define OUTPUT_ANNOTATE_COMPAT (1U<<0)
334 #define OUTPUT_LONG_OBJECT_NAME (1U<<1)
335 #define OUTPUT_RAW_TIMESTAMP (1U<<2)
336 #define OUTPUT_PORCELAIN (1U<<3)
337 #define OUTPUT_SHOW_NAME (1U<<4)
338 #define OUTPUT_SHOW_NUMBER (1U<<5)
339 #define OUTPUT_SHOW_SCORE (1U<<6)
340 #define OUTPUT_NO_AUTHOR (1U<<7)
341 #define OUTPUT_SHOW_EMAIL (1U<<8)
342 #define OUTPUT_LINE_PORCELAIN (1U<<9)
343 #define OUTPUT_COLOR_LINE (1U<<10)
344 #define OUTPUT_SHOW_AGE_WITH_COLOR (1U<<11)
346 static void emit_porcelain_details(struct blame_origin
*suspect
, int repeat
)
348 if (emit_one_suspect_detail(suspect
, repeat
) ||
349 (suspect
->commit
->object
.flags
& MORE_THAN_ONE_PATH
))
350 write_filename_info(suspect
);
353 static void emit_porcelain(struct blame_scoreboard
*sb
, struct blame_entry
*ent
,
356 int repeat
= opt
& OUTPUT_LINE_PORCELAIN
;
359 struct blame_origin
*suspect
= ent
->suspect
;
360 char hex
[GIT_MAX_HEXSZ
+ 1];
362 oid_to_hex_r(hex
, &suspect
->commit
->object
.oid
);
363 printf("%s %d %d %d\n",
368 emit_porcelain_details(suspect
, repeat
);
370 cp
= blame_nth_line(sb
, ent
->lno
);
371 for (cnt
= 0; cnt
< ent
->num_lines
; cnt
++) {
374 printf("%s %d %d\n", hex
,
375 ent
->s_lno
+ 1 + cnt
,
378 emit_porcelain_details(suspect
, 1);
384 } while (ch
!= '\n' &&
385 cp
< sb
->final_buf
+ sb
->final_buf_size
);
388 if (sb
->final_buf_size
&& cp
[-1] != '\n')
392 static struct color_field
{
394 char col
[COLOR_MAXLEN
];
396 static int colorfield_nr
, colorfield_alloc
;
398 static void parse_color_fields(const char *s
)
400 struct string_list l
= STRING_LIST_INIT_DUP
;
401 struct string_list_item
*item
;
402 enum { EXPECT_DATE
, EXPECT_COLOR
} next
= EXPECT_COLOR
;
406 /* Ideally this would be stripped and split at the same time? */
407 string_list_split(&l
, s
, ',', -1);
408 ALLOC_GROW(colorfield
, colorfield_nr
+ 1, colorfield_alloc
);
410 for_each_string_list_item(item
, &l
) {
413 colorfield
[colorfield_nr
].hop
= approxidate(item
->string
);
416 ALLOC_GROW(colorfield
, colorfield_nr
+ 1, colorfield_alloc
);
419 if (color_parse(item
->string
, colorfield
[colorfield_nr
].col
))
420 die(_("expecting a color: %s"), item
->string
);
426 if (next
== EXPECT_COLOR
)
427 die(_("must end with a color"));
429 colorfield
[colorfield_nr
].hop
= TIME_MAX
;
430 string_list_clear(&l
, 0);
433 static void setup_default_color_by_age(void)
435 parse_color_fields("blue,12 month ago,white,1 month ago,red");
438 static void determine_line_heat(struct commit_info
*ci
, const char **dest_color
)
442 while (i
< colorfield_nr
&& ci
->author_time
> colorfield
[i
].hop
)
445 *dest_color
= colorfield
[i
].col
;
448 static void emit_other(struct blame_scoreboard
*sb
, struct blame_entry
*ent
, int opt
)
452 struct blame_origin
*suspect
= ent
->suspect
;
453 struct commit_info ci
= COMMIT_INFO_INIT
;
454 char hex
[GIT_MAX_HEXSZ
+ 1];
455 int show_raw_time
= !!(opt
& OUTPUT_RAW_TIMESTAMP
);
456 const char *default_color
= NULL
, *color
= NULL
, *reset
= NULL
;
458 get_commit_info(suspect
->commit
, &ci
, 1);
459 oid_to_hex_r(hex
, &suspect
->commit
->object
.oid
);
461 cp
= blame_nth_line(sb
, ent
->lno
);
463 if (opt
& OUTPUT_SHOW_AGE_WITH_COLOR
) {
464 determine_line_heat(&ci
, &default_color
);
465 color
= default_color
;
466 reset
= GIT_COLOR_RESET
;
469 for (cnt
= 0; cnt
< ent
->num_lines
; cnt
++) {
471 int length
= (opt
& OUTPUT_LONG_OBJECT_NAME
) ? the_hash_algo
->hexsz
: abbrev
;
473 if (opt
& OUTPUT_COLOR_LINE
) {
475 color
= repeated_meta_color
;
476 reset
= GIT_COLOR_RESET
;
478 color
= default_color
? default_color
: NULL
;
479 reset
= default_color
? GIT_COLOR_RESET
: NULL
;
483 fputs(color
, stdout
);
485 if (suspect
->commit
->object
.flags
& UNINTERESTING
) {
487 memset(hex
, ' ', length
);
488 else if (!(opt
& OUTPUT_ANNOTATE_COMPAT
)) {
494 if (mark_unblamable_lines
&& ent
->unblamable
) {
498 if (mark_ignored_lines
&& ent
->ignored
) {
502 printf("%.*s", length
, hex
);
503 if (opt
& OUTPUT_ANNOTATE_COMPAT
) {
505 if (opt
& OUTPUT_SHOW_EMAIL
)
506 name
= ci
.author_mail
.buf
;
508 name
= ci
.author
.buf
;
509 printf("\t(%10s\t%10s\t%d)", name
,
510 format_time(ci
.author_time
, ci
.author_tz
.buf
,
514 if (opt
& OUTPUT_SHOW_SCORE
)
516 max_score_digits
, ent
->score
,
517 ent
->suspect
->refcnt
);
518 if (opt
& OUTPUT_SHOW_NAME
)
519 printf(" %-*.*s", longest_file
, longest_file
,
521 if (opt
& OUTPUT_SHOW_NUMBER
)
522 printf(" %*d", max_orig_digits
,
523 ent
->s_lno
+ 1 + cnt
);
525 if (!(opt
& OUTPUT_NO_AUTHOR
)) {
528 if (opt
& OUTPUT_SHOW_EMAIL
)
529 name
= ci
.author_mail
.buf
;
531 name
= ci
.author
.buf
;
532 pad
= longest_author
- utf8_strwidth(name
);
533 printf(" (%s%*s %10s",
535 format_time(ci
.author_time
,
540 max_digits
, ent
->lno
+ 1 + cnt
);
543 fputs(reset
, stdout
);
547 } while (ch
!= '\n' &&
548 cp
< sb
->final_buf
+ sb
->final_buf_size
);
551 if (sb
->final_buf_size
&& cp
[-1] != '\n')
554 commit_info_destroy(&ci
);
557 static void output(struct blame_scoreboard
*sb
, int option
)
559 struct blame_entry
*ent
;
561 if (option
& OUTPUT_PORCELAIN
) {
562 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
564 struct blame_origin
*suspect
;
565 struct commit
*commit
= ent
->suspect
->commit
;
566 if (commit
->object
.flags
& MORE_THAN_ONE_PATH
)
568 for (suspect
= get_blame_suspects(commit
); suspect
; suspect
= suspect
->next
) {
569 if (suspect
->guilty
&& count
++) {
570 commit
->object
.flags
|= MORE_THAN_ONE_PATH
;
577 for (ent
= sb
->ent
; ent
; ent
= ent
->next
) {
578 if (option
& OUTPUT_PORCELAIN
)
579 emit_porcelain(sb
, ent
, option
);
581 emit_other(sb
, ent
, option
);
587 * Add phony grafts for use with -S; this is primarily to
588 * support git's cvsserver that wants to give a linear history
591 static int read_ancestry(const char *graft_file
)
593 FILE *fp
= fopen_or_warn(graft_file
, "r");
594 struct strbuf buf
= STRBUF_INIT
;
597 while (!strbuf_getwholeline(&buf
, fp
, '\n')) {
598 /* The format is just "Commit Parent1 Parent2 ...\n" */
599 struct commit_graft
*graft
= read_graft_line(&buf
);
601 register_commit_graft(the_repository
, graft
, 0);
604 strbuf_release(&buf
);
608 static int update_auto_abbrev(int auto_abbrev
, struct blame_origin
*suspect
)
610 const char *uniq
= repo_find_unique_abbrev(the_repository
,
611 &suspect
->commit
->object
.oid
,
613 int len
= strlen(uniq
);
614 if (auto_abbrev
< len
)
620 * How many columns do we need to show line numbers, authors,
623 static void find_alignment(struct blame_scoreboard
*sb
, int *option
)
625 int longest_src_lines
= 0;
626 int longest_dst_lines
= 0;
627 unsigned largest_score
= 0;
628 struct blame_entry
*e
;
629 int compute_auto_abbrev
= (abbrev
< 0);
630 int auto_abbrev
= DEFAULT_ABBREV
;
632 for (e
= sb
->ent
; e
; e
= e
->next
) {
633 struct blame_origin
*suspect
= e
->suspect
;
636 if (compute_auto_abbrev
)
637 auto_abbrev
= update_auto_abbrev(auto_abbrev
, suspect
);
638 if (strcmp(suspect
->path
, sb
->path
))
639 *option
|= OUTPUT_SHOW_NAME
;
640 num
= strlen(suspect
->path
);
641 if (longest_file
< num
)
643 if (!(suspect
->commit
->object
.flags
& METAINFO_SHOWN
)) {
644 struct commit_info ci
= COMMIT_INFO_INIT
;
645 suspect
->commit
->object
.flags
|= METAINFO_SHOWN
;
646 get_commit_info(suspect
->commit
, &ci
, 1);
647 if (*option
& OUTPUT_SHOW_EMAIL
)
648 num
= utf8_strwidth(ci
.author_mail
.buf
);
650 num
= utf8_strwidth(ci
.author
.buf
);
651 if (longest_author
< num
)
652 longest_author
= num
;
653 commit_info_destroy(&ci
);
655 num
= e
->s_lno
+ e
->num_lines
;
656 if (longest_src_lines
< num
)
657 longest_src_lines
= num
;
658 num
= e
->lno
+ e
->num_lines
;
659 if (longest_dst_lines
< num
)
660 longest_dst_lines
= num
;
661 if (largest_score
< blame_entry_score(sb
, e
))
662 largest_score
= blame_entry_score(sb
, e
);
664 max_orig_digits
= decimal_width(longest_src_lines
);
665 max_digits
= decimal_width(longest_dst_lines
);
666 max_score_digits
= decimal_width(largest_score
);
668 if (compute_auto_abbrev
)
669 /* one more abbrev length is needed for the boundary commit */
670 abbrev
= auto_abbrev
+ 1;
673 static void sanity_check_on_fail(struct blame_scoreboard
*sb
, int baa
)
675 int opt
= OUTPUT_SHOW_SCORE
| OUTPUT_SHOW_NUMBER
| OUTPUT_SHOW_NAME
;
676 find_alignment(sb
, &opt
);
681 static unsigned parse_score(const char *arg
)
684 unsigned long score
= strtoul(arg
, &end
, 10);
690 static const char *add_prefix(const char *prefix
, const char *path
)
692 return prefix_path(prefix
, prefix
? strlen(prefix
) : 0, path
);
695 static int git_blame_config(const char *var
, const char *value
,
696 const struct config_context
*ctx
, void *cb
)
698 if (!strcmp(var
, "blame.showroot")) {
699 show_root
= git_config_bool(var
, value
);
702 if (!strcmp(var
, "blame.blankboundary")) {
703 blank_boundary
= git_config_bool(var
, value
);
706 if (!strcmp(var
, "blame.showemail")) {
707 int *output_option
= cb
;
708 if (git_config_bool(var
, value
))
709 *output_option
|= OUTPUT_SHOW_EMAIL
;
711 *output_option
&= ~OUTPUT_SHOW_EMAIL
;
714 if (!strcmp(var
, "blame.date")) {
716 return config_error_nonbool(var
);
717 parse_date_format(value
, &blame_date_mode
);
720 if (!strcmp(var
, "blame.ignorerevsfile")) {
724 ret
= git_config_pathname(&str
, var
, value
);
727 string_list_insert(&ignore_revs_file_list
, str
);
730 if (!strcmp(var
, "blame.markunblamablelines")) {
731 mark_unblamable_lines
= git_config_bool(var
, value
);
734 if (!strcmp(var
, "blame.markignoredlines")) {
735 mark_ignored_lines
= git_config_bool(var
, value
);
738 if (!strcmp(var
, "color.blame.repeatedlines")) {
739 if (color_parse_mem(value
, strlen(value
), repeated_meta_color
))
740 warning(_("invalid value for '%s': '%s'"),
741 "color.blame.repeatedLines", value
);
744 if (!strcmp(var
, "color.blame.highlightrecent")) {
745 parse_color_fields(value
);
749 if (!strcmp(var
, "blame.coloring")) {
751 return config_error_nonbool(var
);
752 if (!strcmp(value
, "repeatedLines")) {
753 coloring_mode
|= OUTPUT_COLOR_LINE
;
754 } else if (!strcmp(value
, "highlightRecent")) {
755 coloring_mode
|= OUTPUT_SHOW_AGE_WITH_COLOR
;
756 } else if (!strcmp(value
, "none")) {
757 coloring_mode
&= ~(OUTPUT_COLOR_LINE
|
758 OUTPUT_SHOW_AGE_WITH_COLOR
);
760 warning(_("invalid value for '%s': '%s'"),
761 "blame.coloring", value
);
766 if (git_diff_heuristic_config(var
, value
, cb
) < 0)
768 if (userdiff_config(var
, value
) < 0)
771 return git_default_config(var
, value
, ctx
, cb
);
774 static int blame_copy_callback(const struct option
*option
, const char *arg
, int unset
)
776 int *opt
= option
->value
;
778 BUG_ON_OPT_NEG(unset
);
781 * -C enables copy from removed files;
782 * -C -C enables copy from existing files, but only
783 * when blaming a new file;
784 * -C -C -C enables copy from existing files for
787 if (*opt
& PICKAXE_BLAME_COPY_HARDER
)
788 *opt
|= PICKAXE_BLAME_COPY_HARDEST
;
789 if (*opt
& PICKAXE_BLAME_COPY
)
790 *opt
|= PICKAXE_BLAME_COPY_HARDER
;
791 *opt
|= PICKAXE_BLAME_COPY
| PICKAXE_BLAME_MOVE
;
794 blame_copy_score
= parse_score(arg
);
798 static int blame_move_callback(const struct option
*option
, const char *arg
, int unset
)
800 int *opt
= option
->value
;
802 BUG_ON_OPT_NEG(unset
);
804 *opt
|= PICKAXE_BLAME_MOVE
;
807 blame_move_score
= parse_score(arg
);
811 static int is_a_rev(const char *name
)
813 struct object_id oid
;
815 if (repo_get_oid(the_repository
, name
, &oid
))
817 return OBJ_NONE
< oid_object_info(the_repository
, &oid
, NULL
);
820 static int peel_to_commit_oid(struct object_id
*oid_ret
, void *cbdata
)
822 struct repository
*r
= ((struct blame_scoreboard
*)cbdata
)->repo
;
823 struct object_id oid
;
825 oidcpy(&oid
, oid_ret
);
828 int kind
= oid_object_info(r
, &oid
, NULL
);
829 if (kind
== OBJ_COMMIT
) {
830 oidcpy(oid_ret
, &oid
);
835 obj
= deref_tag(r
, parse_object(r
, &oid
), NULL
, 0);
838 oidcpy(&oid
, &obj
->oid
);
842 static void build_ignorelist(struct blame_scoreboard
*sb
,
843 struct string_list
*ignore_revs_file_list
,
844 struct string_list
*ignore_rev_list
)
846 struct string_list_item
*i
;
847 struct object_id oid
;
849 oidset_init(&sb
->ignore_list
, 0);
850 for_each_string_list_item(i
, ignore_revs_file_list
) {
851 if (!strcmp(i
->string
, ""))
852 oidset_clear(&sb
->ignore_list
);
854 oidset_parse_file_carefully(&sb
->ignore_list
, i
->string
,
855 peel_to_commit_oid
, sb
);
857 for_each_string_list_item(i
, ignore_rev_list
) {
858 if (repo_get_oid_committish(the_repository
, i
->string
, &oid
) ||
859 peel_to_commit_oid(&oid
, sb
))
860 die(_("cannot find revision %s to ignore"), i
->string
);
861 oidset_insert(&sb
->ignore_list
, &oid
);
865 int cmd_blame(int argc
, const char **argv
, const char *prefix
)
867 struct rev_info revs
;
869 struct blame_scoreboard sb
;
870 struct blame_origin
*o
;
871 struct blame_entry
*ent
= NULL
;
872 long dashdash_pos
, lno
;
873 struct progress_info pi
= { NULL
, 0 };
875 struct string_list range_list
= STRING_LIST_INIT_NODUP
;
876 struct string_list ignore_rev_list
= STRING_LIST_INIT_NODUP
;
877 int output_option
= 0, opt
= 0;
879 const char *revs_file
= NULL
;
880 const char *contents_from
= NULL
;
881 const struct option options
[] = {
882 OPT_BOOL(0, "incremental", &incremental
, N_("show blame entries as we find them, incrementally")),
883 OPT_BOOL('b', NULL
, &blank_boundary
, N_("do not show object names of boundary commits (Default: off)")),
884 OPT_BOOL(0, "root", &show_root
, N_("do not treat root commits as boundaries (Default: off)")),
885 OPT_BOOL(0, "show-stats", &show_stats
, N_("show work cost statistics")),
886 OPT_BOOL(0, "progress", &show_progress
, N_("force progress reporting")),
887 OPT_BIT(0, "score-debug", &output_option
, N_("show output score for blame entries"), OUTPUT_SHOW_SCORE
),
888 OPT_BIT('f', "show-name", &output_option
, N_("show original filename (Default: auto)"), OUTPUT_SHOW_NAME
),
889 OPT_BIT('n', "show-number", &output_option
, N_("show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER
),
890 OPT_BIT('p', "porcelain", &output_option
, N_("show in a format designed for machine consumption"), OUTPUT_PORCELAIN
),
891 OPT_BIT(0, "line-porcelain", &output_option
, N_("show porcelain format with per-line commit information"), OUTPUT_PORCELAIN
|OUTPUT_LINE_PORCELAIN
),
892 OPT_BIT('c', NULL
, &output_option
, N_("use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT
),
893 OPT_BIT('t', NULL
, &output_option
, N_("show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP
),
894 OPT_BIT('l', NULL
, &output_option
, N_("show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME
),
895 OPT_BIT('s', NULL
, &output_option
, N_("suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR
),
896 OPT_BIT('e', "show-email", &output_option
, N_("show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL
),
897 OPT_BIT('w', NULL
, &xdl_opts
, N_("ignore whitespace differences"), XDF_IGNORE_WHITESPACE
),
898 OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list
, N_("rev"), N_("ignore <rev> when blaming")),
899 OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list
, N_("file"), N_("ignore revisions from <file>")),
900 OPT_BIT(0, "color-lines", &output_option
, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE
),
901 OPT_BIT(0, "color-by-age", &output_option
, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR
),
902 OPT_BIT(0, "minimal", &xdl_opts
, N_("spend extra cycles to find better match"), XDF_NEED_MINIMAL
),
903 OPT_STRING('S', NULL
, &revs_file
, N_("file"), N_("use revisions from <file> instead of calling git-rev-list")),
904 OPT_STRING(0, "contents", &contents_from
, N_("file"), N_("use <file>'s contents as the final image")),
905 OPT_CALLBACK_F('C', NULL
, &opt
, N_("score"), N_("find line copies within and across files"), PARSE_OPT_OPTARG
, blame_copy_callback
),
906 OPT_CALLBACK_F('M', NULL
, &opt
, N_("score"), N_("find line movements within and across files"), PARSE_OPT_OPTARG
, blame_move_callback
),
907 OPT_STRING_LIST('L', NULL
, &range_list
, N_("range"),
908 N_("process only line range <start>,<end> or function :<funcname>")),
909 OPT__ABBREV(&abbrev
),
913 struct parse_opt_ctx_t ctx
;
914 int cmd_is_annotate
= !strcmp(argv
[0], "annotate");
915 struct range_set ranges
;
916 unsigned int range_i
;
918 const int hexsz
= the_hash_algo
->hexsz
;
920 const char *str_usage
= cmd_is_annotate
? annotate_usage
: blame_usage
;
921 const char **opt_usage
= cmd_is_annotate
? annotate_opt_usage
: blame_opt_usage
;
923 setup_default_color_by_age();
924 git_config(git_blame_config
, &output_option
);
925 repo_init_revisions(the_repository
, &revs
, NULL
);
926 revs
.date_mode
= blame_date_mode
;
927 revs
.diffopt
.flags
.allow_textconv
= 1;
928 revs
.diffopt
.flags
.follow_renames
= 1;
930 save_commit_buffer
= 0;
934 parse_options_start(&ctx
, argc
, argv
, prefix
, options
,
935 PARSE_OPT_KEEP_DASHDASH
| PARSE_OPT_KEEP_ARGV0
);
937 switch (parse_options_step(&ctx
, options
, opt_usage
)) {
938 case PARSE_OPT_NON_OPTION
:
939 case PARSE_OPT_UNKNOWN
:
942 case PARSE_OPT_ERROR
:
943 case PARSE_OPT_SUBCOMMAND
:
945 case PARSE_OPT_COMPLETE
:
949 dashdash_pos
= ctx
.cpidx
;
953 if (!strcmp(ctx
.argv
[0], "--reverse")) {
954 ctx
.argv
[0] = "--children";
957 parse_revision_opt(&revs
, &ctx
, options
, opt_usage
);
960 revision_opts_finish(&revs
);
961 no_whole_file_rename
= !revs
.diffopt
.flags
.follow_renames
;
962 xdl_opts
|= revs
.diffopt
.xdl_opts
& XDF_INDENT_HEURISTIC
;
963 revs
.diffopt
.flags
.follow_renames
= 0;
964 argc
= parse_options_end(&ctx
);
966 prepare_repo_settings(the_repository
);
967 the_repository
->settings
.command_requires_full_index
= 0;
969 if (incremental
|| (output_option
& OUTPUT_PORCELAIN
)) {
970 if (show_progress
> 0)
971 die(_("--progress can't be used with --incremental or porcelain formats"));
973 } else if (show_progress
< 0)
974 show_progress
= isatty(2);
976 if (0 < abbrev
&& abbrev
< hexsz
)
977 /* one more abbrev length is needed for the boundary commit */
982 if (revs_file
&& read_ancestry(revs_file
))
983 die_errno("reading graft file '%s' failed", revs_file
);
985 if (cmd_is_annotate
) {
986 output_option
|= OUTPUT_ANNOTATE_COMPAT
;
987 blame_date_mode
.type
= DATE_ISO8601
;
989 blame_date_mode
= revs
.date_mode
;
992 /* The maximum width used to show the dates */
993 switch (blame_date_mode
.type
) {
995 blame_date_width
= sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
997 case DATE_ISO8601_STRICT
:
998 blame_date_width
= sizeof("2006-10-19T16:00:04-07:00");
1001 blame_date_width
= sizeof("2006-10-19 16:00:04 -0700");
1004 blame_date_width
= sizeof("1161298804 -0700");
1007 blame_date_width
= sizeof("1161298804");
1010 blame_date_width
= sizeof("2006-10-19");
1014 * TRANSLATORS: This string is used to tell us the
1015 * maximum display width for a relative timestamp in
1016 * "git blame" output. For C locale, "4 years, 11
1017 * months ago", which takes 22 places, is the longest
1018 * among various forms of relative timestamps, but
1019 * your language may need more or fewer display
1022 blame_date_width
= utf8_strwidth(_("4 years, 11 months ago")) + 1; /* add the null */
1025 /* If the year is shown, no time is shown */
1026 blame_date_width
= sizeof("Thu Oct 19 16:00");
1029 blame_date_width
= sizeof("Thu Oct 19 16:00:04 2006 -0700");
1032 blame_date_width
= strlen(show_date(0, 0, &blame_date_mode
)) + 1; /* add the null */
1035 blame_date_width
-= 1; /* strip the null */
1037 if (revs
.diffopt
.flags
.find_copies_harder
)
1038 opt
|= (PICKAXE_BLAME_COPY
| PICKAXE_BLAME_MOVE
|
1039 PICKAXE_BLAME_COPY_HARDER
);
1042 * We have collected options unknown to us in argv[1..unk]
1043 * which are to be passed to revision machinery if we are
1044 * going to do the "bottom" processing.
1046 * The remaining are:
1048 * (1) if dashdash_pos != 0, it is either
1049 * "blame [revisions] -- <path>" or
1050 * "blame -- <path> <rev>"
1052 * (2) otherwise, it is one of the two:
1053 * "blame [revisions] <path>"
1054 * "blame <path> <rev>"
1056 * Note that we must strip out <path> from the arguments: we do not
1057 * want the path pruning but we may want "bottom" processing.
1060 switch (argc
- dashdash_pos
- 1) {
1063 usage_with_options(opt_usage
, options
);
1064 /* reorder for the new way: <rev> -- <path> */
1070 path
= add_prefix(prefix
, argv
[--argc
]);
1074 usage_with_options(opt_usage
, options
);
1078 usage_with_options(opt_usage
, options
);
1079 if (argc
== 3 && is_a_rev(argv
[argc
- 1])) { /* (2b) */
1080 path
= add_prefix(prefix
, argv
[1]);
1083 if (argc
== 2 && is_a_rev(argv
[1]) && !get_git_work_tree())
1084 die("missing <path> to blame");
1085 path
= add_prefix(prefix
, argv
[argc
- 1]);
1087 argv
[argc
- 1] = "--";
1090 revs
.disable_stdin
= 1;
1091 setup_revisions(argc
, argv
, &revs
, NULL
);
1092 if (!revs
.pending
.nr
&& is_bare_repository()) {
1093 struct commit
*head_commit
;
1094 struct object_id head_oid
;
1096 if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
,
1098 !(head_commit
= lookup_commit_reference_gently(revs
.repo
,
1100 die("no such ref: HEAD");
1102 add_pending_object(&revs
, &head_commit
->object
, "HEAD");
1105 init_scoreboard(&sb
);
1107 sb
.contents_from
= contents_from
;
1108 sb
.reverse
= reverse
;
1109 sb
.repo
= the_repository
;
1111 build_ignorelist(&sb
, &ignore_revs_file_list
, &ignore_rev_list
);
1112 string_list_clear(&ignore_revs_file_list
, 0);
1113 string_list_clear(&ignore_rev_list
, 0);
1114 setup_scoreboard(&sb
, &o
);
1117 * Changed-path Bloom filters are disabled when looking
1120 if (!(opt
& PICKAXE_BLAME_COPY
))
1121 setup_blame_bloom_data(&sb
);
1125 if (lno
&& !range_list
.nr
)
1126 string_list_append(&range_list
, "1");
1129 range_set_init(&ranges
, range_list
.nr
);
1130 for (range_i
= 0; range_i
< range_list
.nr
; ++range_i
) {
1132 if (parse_range_arg(range_list
.items
[range_i
].string
,
1133 nth_line_cb
, &sb
, lno
, anchor
,
1134 &bottom
, &top
, sb
.path
,
1135 the_repository
->index
))
1137 if ((!lno
&& (top
|| bottom
)) || lno
< bottom
)
1138 die(Q_("file %s has only %lu line",
1139 "file %s has only %lu lines",
1140 lno
), sb
.path
, lno
);
1143 if (top
< 1 || lno
< top
)
1146 range_set_append_unsafe(&ranges
, bottom
, top
);
1149 sort_and_merge_range_set(&ranges
);
1151 for (range_i
= ranges
.nr
; range_i
> 0; --range_i
) {
1152 const struct range
*r
= &ranges
.ranges
[range_i
- 1];
1153 ent
= blame_entry_prepend(ent
, r
->start
, r
->end
, o
);
1154 num_lines
+= (r
->end
- r
->start
);
1157 num_lines
= sb
.num_lines
;
1160 prio_queue_put(&sb
.commits
, o
->commit
);
1162 blame_origin_decref(o
);
1164 range_set_release(&ranges
);
1165 string_list_clear(&range_list
, 0);
1169 if (blame_move_score
)
1170 sb
.move_score
= blame_move_score
;
1171 if (blame_copy_score
)
1172 sb
.copy_score
= blame_copy_score
;
1174 sb
.debug
= DEBUG_BLAME
;
1175 sb
.on_sanity_fail
= &sanity_check_on_fail
;
1177 sb
.show_root
= show_root
;
1178 sb
.xdl_opts
= xdl_opts
;
1179 sb
.no_whole_file_rename
= no_whole_file_rename
;
1181 read_mailmap(&mailmap
);
1183 sb
.found_guilty_entry
= &found_guilty_entry
;
1184 sb
.found_guilty_entry_data
= &pi
;
1186 pi
.progress
= start_delayed_progress(_("Blaming lines"), num_lines
);
1188 assign_blame(&sb
, opt
);
1190 stop_progress(&pi
.progress
);
1197 blame_sort_final(&sb
);
1199 blame_coalesce(&sb
);
1201 if (!(output_option
& (OUTPUT_COLOR_LINE
| OUTPUT_SHOW_AGE_WITH_COLOR
)))
1202 output_option
|= coloring_mode
;
1204 if (!(output_option
& OUTPUT_PORCELAIN
)) {
1205 find_alignment(&sb
, &output_option
);
1206 if (!*repeated_meta_color
&&
1207 (output_option
& OUTPUT_COLOR_LINE
))
1208 xsnprintf(repeated_meta_color
,
1209 sizeof(repeated_meta_color
),
1210 "%s", GIT_COLOR_CYAN
);
1212 if (output_option
& OUTPUT_ANNOTATE_COMPAT
)
1213 output_option
&= ~(OUTPUT_COLOR_LINE
| OUTPUT_SHOW_AGE_WITH_COLOR
);
1215 output(&sb
, output_option
);
1216 free((void *)sb
.final_buf
);
1217 for (ent
= sb
.ent
; ent
; ) {
1218 struct blame_entry
*e
= ent
->next
;
1224 printf("num read blob: %d\n", sb
.num_read_blob
);
1225 printf("num get patch: %d\n", sb
.num_get_patch
);
1226 printf("num commits: %d\n", sb
.num_commits
);
1230 cleanup_scoreboard(&sb
);
1231 release_revisions(&revs
);