2 * Copyright (C) 2006, Fredrik Kuivinen <freku045@student.liu.se>
19 #include "xdiff-interface.h"
23 static const char blame_usage[] = "[-c] [-l] [--] file [commit]\n"
24 " -c, --compability Use the same output mode as git-annotate (Default: off)\n"
25 " -l, --long Show long commit SHA1 (Default: off)\n"
26 " -h, --help This message";
28 static struct commit **blame_lines;
29 static int num_blame_lines;
30 static char* blame_contents;
35 unsigned char sha1[20]; /* blob sha, not commit! */
45 int off1, len1; // ---
46 int off2, len2; // +++
54 static void get_blob(struct commit *commit);
56 /* Only used for statistics */
57 static int num_get_patch = 0;
58 static int num_commits = 0;
59 static int patch_time = 0;
61 struct blame_diff_state {
62 struct xdiff_emit_state xm;
66 static void process_u0_diff(void *state_, char *line, unsigned long len)
68 struct blame_diff_state *state = state_;
71 if (len < 4 || line[0] != '@' || line[1] != '@')
75 printf("chunk line: %.*s", (int)len, line);
77 state->ret->chunks = xrealloc(state->ret->chunks,
78 sizeof(struct chunk) * state->ret->num);
79 chunk = &state->ret->chunks[state->ret->num - 1];
81 assert(!strncmp(line, "@@ -", 4));
83 if (parse_hunk_header(line, len,
84 &chunk->off1, &chunk->len1,
85 &chunk->off2, &chunk->len2)) {
100 assert(chunk->off1 >= 0);
101 assert(chunk->off2 >= 0);
104 static struct patch *get_patch(struct commit *commit, struct commit *other)
106 struct blame_diff_state state;
109 mmfile_t file_c, file_o;
111 struct util_info *info_c = (struct util_info *)commit->object.util;
112 struct util_info *info_o = (struct util_info *)other->object.util;
113 struct timeval tv_start, tv_end;
116 file_c.ptr = info_c->buf;
117 file_c.size = info_c->size;
120 file_o.ptr = info_o->buf;
121 file_o.size = info_o->size;
123 gettimeofday(&tv_start, NULL);
125 xpp.flags = XDF_NEED_MINIMAL;
128 ecb.outf = xdiff_outf;
130 memset(&state, 0, sizeof(state));
131 state.xm.consume = process_u0_diff;
132 state.ret = xmalloc(sizeof(struct patch));
133 state.ret->chunks = NULL;
136 xdl_diff(&file_c, &file_o, &xpp, &xecfg, &ecb);
138 gettimeofday(&tv_end, NULL);
139 patch_time += 1000000 * (tv_end.tv_sec - tv_start.tv_sec) +
140 tv_end.tv_usec - tv_start.tv_usec;
146 static void free_patch(struct patch *p)
152 static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
153 int baselen, const char *pathname,
154 unsigned mode, int stage);
156 static unsigned char blob_sha1[20];
157 static const char* blame_file;
158 static int get_blob_sha1(struct tree *t, const char *pathname,
162 const char *pathspec[2];
163 blame_file = pathname;
164 pathspec[0] = pathname;
166 memset(blob_sha1, 0, sizeof(blob_sha1));
167 read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal);
169 for (i = 0; i < 20; i++) {
170 if (blob_sha1[i] != 0)
177 memcpy(sha1, blob_sha1, 20);
181 static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
182 int baselen, const char *pathname,
183 unsigned mode, int stage)
186 return READ_TREE_RECURSIVE;
188 if (strncmp(blame_file, base, baselen) ||
189 strcmp(blame_file + baselen, pathname))
192 memcpy(blob_sha1, sha1, 20);
196 static void get_blob(struct commit *commit)
198 struct util_info *info = commit->object.util;
204 info->buf = read_sha1_file(info->sha1, type, &info->size);
206 assert(!strcmp(type, blob_type));
209 /* For debugging only */
210 static void print_patch(struct patch *p)
213 printf("Num chunks: %d\n", p->num);
214 for (i = 0; i < p->num; i++) {
215 printf("%d,%d %d,%d\n", p->chunks[i].off1, p->chunks[i].len1,
216 p->chunks[i].off2, p->chunks[i].len2);
221 /* For debugging only */
222 static void print_map(struct commit *cmit, struct commit *other)
224 struct util_info *util = cmit->object.util;
225 struct util_info *util2 = other->object.util;
230 util2->num_lines ? util->num_lines : util2->num_lines;
233 for (i = 0; i < max; i++) {
237 if (i < util->num_lines) {
238 num = util->line_map[i];
243 if (i < util2->num_lines) {
244 int num2 = util2->line_map[i];
245 printf("%d\t", num2);
246 if (num != -1 && num2 != num)
256 // p is a patch from commit to other.
257 static void fill_line_map(struct commit *commit, struct commit *other,
260 struct util_info *util = commit->object.util;
261 struct util_info *util2 = other->object.util;
262 int *map = util->line_map;
263 int *map2 = util2->line_map;
271 printf("num lines 1: %d num lines 2: %d\n", util->num_lines,
274 for (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) {
275 struct chunk *chunk = NULL;
276 if (cur_chunk < p->num)
277 chunk = &p->chunks[cur_chunk];
279 if (chunk && chunk->off1 == i1) {
280 if (DEBUG && i2 != chunk->off2)
281 printf("i2: %d off2: %d\n", i2, chunk->off2);
283 assert(i2 == chunk->off2);
295 if (i2 >= util2->num_lines)
298 if (map[i1] != map2[i2] && map[i1] != -1) {
300 printf("map: i1: %d %d %p i2: %d %d %p\n",
302 i1 != -1 ? blame_lines[map[i1]] : NULL,
304 i2 != -1 ? blame_lines[map2[i2]] : NULL);
305 if (map2[i2] != -1 &&
306 blame_lines[map[i1]] &&
307 !blame_lines[map2[i2]])
311 if (map[i1] == -1 && map2[i2] != -1)
316 printf("l1: %d l2: %d i1: %d i2: %d\n",
317 map[i1], map2[i2], i1, i2);
321 static int map_line(struct commit *commit, int line)
323 struct util_info *info = commit->object.util;
324 assert(line >= 0 && line < info->num_lines);
325 return info->line_map[line];
328 static struct util_info* get_util(struct commit *commit)
330 struct util_info *util = commit->object.util;
335 util = xmalloc(sizeof(struct util_info));
338 util->line_map = NULL;
339 util->num_lines = -1;
340 util->pathname = NULL;
341 commit->object.util = util;
345 static int fill_util_info(struct commit *commit)
347 struct util_info *util = commit->object.util;
350 assert(util->pathname);
352 if (get_blob_sha1(commit->tree, util->pathname, util->sha1))
358 static void alloc_line_map(struct commit *commit)
360 struct util_info *util = commit->object.util;
369 for (i = 0; i < util->size; i++) {
370 if (util->buf[i] == '\n')
373 if(util->buf[util->size - 1] != '\n')
376 util->line_map = xmalloc(sizeof(int) * util->num_lines);
378 for (i = 0; i < util->num_lines; i++)
379 util->line_map[i] = -1;
382 static void init_first_commit(struct commit* commit, const char* filename)
384 struct util_info* util = commit->object.util;
387 util->pathname = filename;
388 if (fill_util_info(commit))
389 die("fill_util_info failed");
391 alloc_line_map(commit);
393 util = commit->object.util;
395 for (i = 0; i < util->num_lines; i++)
396 util->line_map[i] = i;
400 static void process_commits(struct rev_info *rev, const char *path,
401 struct commit** initial)
404 struct util_info* util;
410 struct commit* commit = get_revision(rev);
412 init_first_commit(commit, path);
414 util = commit->object.util;
415 num_blame_lines = util->num_lines;
416 blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
417 blame_contents = util->buf;
418 blame_len = util->size;
420 for (i = 0; i < num_blame_lines; i++)
421 blame_lines[i] = NULL;
423 lines_left = num_blame_lines;
424 blame_p = xmalloc(sizeof(int) * num_blame_lines);
425 new_lines = xmalloc(sizeof(int) * num_blame_lines);
427 struct commit_list *parents;
429 struct util_info *util;
432 printf("\nProcessing commit: %d %s\n", num_commits,
433 sha1_to_hex(commit->object.sha1));
439 memset(blame_p, 0, sizeof(int) * num_blame_lines);
442 for (parents = commit->parents;
443 parents != NULL; parents = parents->next)
449 if (fill_util_info(commit))
452 alloc_line_map(commit);
453 util = commit->object.util;
455 for (parents = commit->parents;
456 parents != NULL; parents = parents->next) {
457 struct commit *parent = parents->item;
460 if (parse_commit(parent) < 0)
461 die("parse_commit error");
464 printf("parent: %s\n",
465 sha1_to_hex(parent->object.sha1));
467 if (fill_util_info(parent)) {
472 patch = get_patch(parent, commit);
473 alloc_line_map(parent);
474 fill_line_map(parent, commit, patch);
476 for (i = 0; i < patch->num; i++) {
478 for (l = 0; l < patch->chunks[i].len2; l++) {
480 map_line(commit, patch->chunks[i].off2 + l);
481 if (mapped_line != -1) {
482 blame_p[mapped_line]++;
483 if (blame_p[mapped_line] == num_parents)
484 new_lines[new_lines_len++] = mapped_line;
492 printf("parents: %d\n", num_parents);
494 for (i = 0; i < new_lines_len; i++) {
495 int mapped_line = new_lines[i];
496 if (blame_lines[mapped_line] == NULL) {
497 blame_lines[mapped_line] = commit;
500 printf("blame: mapped: %d i: %d\n",
504 } while ((commit = get_revision(rev)) != NULL);
508 static int compare_tree_path(struct rev_info* revs,
509 struct commit* c1, struct commit* c2)
512 const char* paths[2];
513 struct util_info* util = c2->object.util;
514 paths[0] = util->pathname;
517 diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
519 ret = rev_compare_tree(revs, c1->tree, c2->tree);
520 diff_tree_release_paths(&revs->diffopt);
525 static int same_tree_as_empty_path(struct rev_info *revs, struct tree* t1,
529 const char* paths[2];
533 diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
535 ret = rev_same_tree_as_empty(revs, t1);
536 diff_tree_release_paths(&revs->diffopt);
540 static const char* find_rename(struct commit* commit, struct commit* parent)
542 struct util_info* cutil = commit->object.util;
543 struct diff_options diff_opts;
544 const char *paths[1];
548 printf("find_rename commit: %s ",
549 sha1_to_hex(commit->object.sha1));
550 puts(sha1_to_hex(parent->object.sha1));
553 diff_setup(&diff_opts);
554 diff_opts.recursive = 1;
555 diff_opts.detect_rename = DIFF_DETECT_RENAME;
557 diff_tree_setup_paths(paths, &diff_opts);
558 if (diff_setup_done(&diff_opts) < 0)
559 die("diff_setup_done failed");
561 diff_tree_sha1(commit->tree->object.sha1, parent->tree->object.sha1,
563 diffcore_std(&diff_opts);
565 for (i = 0; i < diff_queued_diff.nr; i++) {
566 struct diff_filepair *p = diff_queued_diff.queue[i];
568 if (p->status == 'R' && !strcmp(p->one->path, cutil->pathname)) {
570 printf("rename %s -> %s\n", p->one->path, p->two->path);
578 static void simplify_commit(struct rev_info *revs, struct commit *commit)
580 struct commit_list **pp, *parent;
585 if (!commit->parents) {
586 struct util_info* util = commit->object.util;
587 if (!same_tree_as_empty_path(revs, commit->tree,
589 commit->object.flags |= TREECHANGE;
593 pp = &commit->parents;
594 while ((parent = *pp) != NULL) {
595 struct commit *p = parent->item;
597 if (p->object.flags & UNINTERESTING) {
603 switch (compare_tree_path(revs, p, commit)) {
606 commit->parents = parent;
607 get_util(p)->pathname = get_util(commit)->pathname;
613 struct util_info* util = commit->object.util;
614 if (revs->remove_empty_trees &&
615 same_tree_as_empty_path(revs, p->tree,
617 const char* new_name = find_rename(commit, p);
619 struct util_info* putil = get_util(p);
620 if (!putil->pathname)
621 putil->pathname = strdup(new_name);
630 case REV_TREE_DIFFERENT:
632 if (!get_util(p)->pathname)
633 get_util(p)->pathname =
634 get_util(commit)->pathname;
637 die("bad tree compare for commit %s",
638 sha1_to_hex(commit->object.sha1));
640 commit->object.flags |= TREECHANGE;
648 unsigned long author_time;
652 static void get_commit_info(struct commit* commit, struct commit_info* ret)
656 static char author_buf[1024];
658 tmp = strstr(commit->buffer, "\nauthor ") + 8;
659 len = strchr(tmp, '\n') - tmp;
660 ret->author = author_buf;
661 memcpy(ret->author, tmp, len);
668 ret->author_tz = tmp+1;
673 ret->author_time = strtoul(tmp, NULL, 10);
678 ret->author_mail = tmp + 1;
683 static const char* format_time(unsigned long time, const char* tz_str)
685 static char time_buf[128];
691 minutes = tz < 0 ? -tz : tz;
692 minutes = (minutes / 100)*60 + (minutes % 100);
693 minutes = tz < 0 ? -minutes : minutes;
694 t = time + minutes * 60;
697 strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", tm);
698 strcat(time_buf, tz_str);
702 static void topo_setter(struct commit* c, void* data)
704 struct util_info* util = c->object.util;
705 util->topo_data = data;
708 static void* topo_getter(struct commit* c)
710 struct util_info* util = c->object.util;
711 return util->topo_data;
714 static int read_ancestry(const char *graft_file,
715 unsigned char **start_sha1)
717 FILE *fp = fopen(graft_file, "r");
721 while (fgets(buf, sizeof(buf), fp)) {
722 /* The format is just "Commit Parent1 Parent2 ...\n" */
723 int len = strlen(buf);
724 struct commit_graft *graft = read_graft_line(buf, len);
725 register_commit_graft(graft, 0);
727 *start_sha1 = graft->sha1;
733 int main(int argc, const char **argv)
736 struct commit *initial = NULL;
737 unsigned char sha1[20], *sha1_p = NULL;
739 const char *filename = NULL, *commit = NULL;
740 char filename_buf[256];
744 struct commit* start_commit;
746 const char* args[10];
749 struct commit_info ci;
752 int longest_file, longest_author;
755 const char* prefix = setup_git_directory();
756 git_config(git_default_config);
758 for(i = 1; i < argc; i++) {
760 if(!strcmp(argv[i], "-h") ||
761 !strcmp(argv[i], "--help"))
763 else if(!strcmp(argv[i], "-l") ||
764 !strcmp(argv[i], "--long")) {
767 } else if(!strcmp(argv[i], "-c") ||
768 !strcmp(argv[i], "--compability")) {
771 } else if(!strcmp(argv[i], "-S")) {
773 !read_ancestry(argv[i + 1], &sha1_p)) {
779 } else if(!strcmp(argv[i], "--")) {
782 } else if(argv[i][0] == '-')
800 if (commit && sha1_p)
806 sprintf(filename_buf, "%s%s", prefix, filename);
808 strcpy(filename_buf, filename);
809 filename = filename_buf;
812 if (get_sha1(commit, sha1))
813 die("get_sha1 failed, commit '%s' not found", commit);
816 start_commit = lookup_commit_reference(sha1_p);
817 get_util(start_commit)->pathname = filename;
818 if (fill_util_info(start_commit)) {
819 printf("%s not found in %s\n", filename, commit);
824 init_revisions(&rev);
825 rev.remove_empty_trees = 1;
827 rev.prune_fn = simplify_commit;
828 rev.topo_setter = topo_setter;
829 rev.topo_getter = topo_getter;
833 commit_list_insert(start_commit, &rev.commits);
837 diff_tree_setup_paths(args, &rev.diffopt);
838 prepare_revision_walk(&rev);
839 process_commits(&rev, filename, &initial);
841 buf = blame_contents;
842 for (max_digits = 1, i = 10; i <= num_blame_lines + 1; max_digits++)
848 for (i = 0; i < num_blame_lines; i++) {
849 struct commit *c = blame_lines[i];
855 if (!found_rename && strcmp(filename, u->pathname))
857 if (longest_file < strlen(u->pathname))
858 longest_file = strlen(u->pathname);
859 get_commit_info(c, &ci);
860 if (longest_author < strlen(ci.author))
861 longest_author = strlen(ci.author);
864 for (i = 0; i < num_blame_lines; i++) {
865 struct commit *c = blame_lines[i];
872 get_commit_info(c, &ci);
873 fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
875 printf("\t(%10s\t%10s\t%d)", ci.author,
876 format_time(ci.author_time, ci.author_tz), i+1);
879 printf(" %-*.*s", longest_file, longest_file,
881 printf(" (%-*.*s %10s %*d) ",
882 longest_author, longest_author, ci.author,
883 format_time(ci.author_time, ci.author_tz),
887 if(i == num_blame_lines - 1) {
888 fwrite(buf, blame_len - (buf - blame_contents),
890 if(blame_contents[blame_len-1] != '\n')
893 char* next_buf = strchr(buf, '\n') + 1;
894 fwrite(buf, next_buf - buf, 1, stdout);
900 printf("num get patch: %d\n", num_get_patch);
901 printf("num commits: %d\n", num_commits);
902 printf("patch time: %f\n", patch_time / 1000000.0);
903 printf("initial: %s\n", sha1_to_hex(initial->object.sha1));