mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 06:54:55 +01:00
Code Activity

Merge branch 'fk/blame' into next

Browse source 
* fk/blame:
  git-blame, take 2
  Merge part of 'lt/rev-list' into 'fk/blame'
This commit is contained in:
Junio C Hamano 2006-03-02 21:15:56 -08:00
commit 262cc77dab
1 changed files with 433 additions and 313 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

484
blame.c
View file

@ -1,4 +1,10 @@
/*
* Copyright (C) 2006, Fredrik Kuivinen <freku045@student.liu.se>
*/
#include <assert.h> #include <assert.h>
#include <time.h>
#include <sys/time.h>
#include "cache.h" #include "cache.h"
#include "refs.h" #include "refs.h"
@ -7,92 +13,104 @@
#include "tree.h" #include "tree.h"
#include "blob.h" #include "blob.h"
#include "diff.h" #include "diff.h"
#include "revision.h"
#define DEBUG 0 #define DEBUG 0
struct commit **blame_lines; struct commit **blame_lines;
int num_blame_lines; int num_blame_lines;
struct util_info struct util_info {
{
int *line_map; int *line_map;
int num_lines;
unsigned char sha1[20]; /* blob sha, not commit! */ unsigned char sha1[20]; /* blob sha, not commit! */
char *buf; char *buf;
unsigned long size; unsigned long size;
int num_lines;
// const char* path; // const char* path;
}; };
struct chunk struct chunk {
{
int off1, len1; // --- int off1, len1; // ---
int off2, len2; // +++ int off2, len2; // +++
}; };
struct patch struct patch {
{
struct chunk *chunks; struct chunk *chunks;
int num; int num;
}; };
static void get_blob(struct commit *commit); static void get_blob(struct commit *commit);
int num_get_patch = 0; /* Only used for statistics */
int num_commits = 0; static int num_get_patch = 0;
static int num_commits = 0;
static int patch_time = 0;
struct patch* get_patch(struct commit* commit, struct commit* other) #define TEMPFILE_PATH_LEN 60
static struct patch *get_patch(struct commit *commit, struct commit *other)
{ {
struct patch* ret = xmalloc(sizeof(struct patch)); struct patch *ret;
ret->chunks = NULL;
ret->num = 0;
struct util_info *info_c = (struct util_info *)commit->object.util; struct util_info *info_c = (struct util_info *)commit->object.util;
struct util_info *info_o = (struct util_info *)other->object.util; struct util_info *info_o = (struct util_info *)other->object.util;
char tmp_path1[TEMPFILE_PATH_LEN], tmp_path2[TEMPFILE_PATH_LEN];
char diff_cmd[TEMPFILE_PATH_LEN*2 + 20];
struct timeval tv_start, tv_end;
int fd;
FILE *fin;
char buf[1024];
if(!memcmp(info_c->sha1, info_o->sha1, 20)) ret = xmalloc(sizeof(struct patch));
return ret; ret->chunks = NULL;
ret->num = 0;
get_blob(commit); get_blob(commit);
get_blob(other); get_blob(other);
FILE* fout = fopen("/tmp/git-blame-tmp1", "w"); gettimeofday(&tv_start, NULL);
if(!fout)
die("fopen tmp1 failed: %s", strerror(errno));
if(fwrite(info_c->buf, info_c->size, 1, fout) != 1) fd = git_mkstemp(tmp_path1, TEMPFILE_PATH_LEN, "git-blame-XXXXXX");
die("fwrite 1 failed: %s", strerror(errno)); if (fd < 0)
fclose(fout); die("unable to create temp-file: %s", strerror(errno));
fout = fopen("/tmp/git-blame-tmp2", "w"); if (xwrite(fd, info_c->buf, info_c->size) != info_c->size)
if(!fout) die("write failed: %s", strerror(errno));
die("fopen tmp2 failed: %s", strerror(errno)); close(fd);
if(fwrite(info_o->buf, info_o->size, 1, fout) != 1) fd = git_mkstemp(tmp_path2, TEMPFILE_PATH_LEN, "git-blame-XXXXXX");
die("fwrite 2 failed: %s", strerror(errno)); if (fd < 0)
fclose(fout); die("unable to create temp-file: %s", strerror(errno));
FILE* fin = popen("diff -u0 /tmp/git-blame-tmp1 /tmp/git-blame-tmp2", "r"); if (xwrite(fd, info_o->buf, info_o->size) != info_o->size)
die("write failed: %s", strerror(errno));
close(fd);
sprintf(diff_cmd, "diff -u0 %s %s", tmp_path1, tmp_path2);
fin = popen(diff_cmd, "r");
if (!fin) if (!fin)
die("popen failed: %s", strerror(errno)); die("popen failed: %s", strerror(errno));
char buf[1024];
while (fgets(buf, sizeof(buf), fin)) { while (fgets(buf, sizeof(buf), fin)) {
struct chunk *chunk;
char *start, *sp;
if (buf[0] != '@' || buf[1] != '@') if (buf[0] != '@' || buf[1] != '@')
continue; continue;
if (DEBUG) if (DEBUG)
printf("chunk line: %s", buf); printf("chunk line: %s", buf);
ret->num++; ret->num++;
ret->chunks = xrealloc(ret->chunks, sizeof(struct chunk)*ret->num); ret->chunks = xrealloc(ret->chunks,
struct chunk* chunk = &ret->chunks[ret->num-1]; sizeof(struct chunk) * ret->num);
chunk = &ret->chunks[ret->num - 1];
assert(!strncmp(buf, "@@ -", 4)); assert(!strncmp(buf, "@@ -", 4));
char* start = buf+4; start = buf + 4;
char* sp = index(start, ' '); sp = index(start, ' ');
*sp = '\0'; *sp = '\0';
if (index(start, ',')) { if (index(start, ',')) {
int ret = sscanf(start, "%d,%d", &chunk->off1, &chunk->len1); int ret =
sscanf(start, "%d,%d", &chunk->off1, &chunk->len1);
assert(ret == 2); assert(ret == 2);
} else { } else {
int ret = sscanf(start, "%d", &chunk->off1); int ret = sscanf(start, "%d", &chunk->off1);
@ -105,7 +123,8 @@ struct patch* get_patch(struct commit* commit, struct commit* other)
sp = index(start, ' '); sp = index(start, ' ');
*sp = '\0'; *sp = '\0';
if (index(start, ',')) { if (index(start, ',')) {
int ret = sscanf(start, "%d,%d", &chunk->off2, &chunk->len2); int ret =
sscanf(start, "%d,%d", &chunk->off2, &chunk->len2);
assert(ret == 2); assert(ret == 2);
} else { } else {
int ret = sscanf(start, "%d", &chunk->off2); int ret = sscanf(start, "%d", &chunk->off2);
@ -114,40 +133,52 @@ struct patch* get_patch(struct commit* commit, struct commit* other)
} }
*sp = ' '; *sp = ' ';
if (chunk->len1 == 0)
chunk->off1++;
if (chunk->len2 == 0)
chunk->off2++;
if (chunk->off1 > 0) if (chunk->off1 > 0)
chunk->off1 -= 1; chunk->off1--;
if (chunk->off2 > 0) if (chunk->off2 > 0)
chunk->off2 -= 1; chunk->off2--;
assert(chunk->off1 >= 0); assert(chunk->off1 >= 0);
assert(chunk->off2 >= 0); assert(chunk->off2 >= 0);
} }
fclose(fin); pclose(fin);
unlink(tmp_path1);
unlink(tmp_path2);
gettimeofday(&tv_end, NULL);
patch_time += 1000000 * (tv_end.tv_sec - tv_start.tv_sec) +
tv_end.tv_usec - tv_start.tv_usec;
num_get_patch++; num_get_patch++;
return ret; return ret;
} }
void free_patch(struct patch* p) static void free_patch(struct patch *p)
{ {
free(p->chunks); free(p->chunks);
free(p); free(p);
} }
static int get_blob_sha1_internal(unsigned char *sha1, const char *base, int baselen, static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
const char *pathname, unsigned mode, int stage); int baselen, const char *pathname,
unsigned mode, int stage);
static unsigned char blob_sha1[20]; static unsigned char blob_sha1[20];
static int get_blob_sha1(struct tree* t, const char* pathname, unsigned char* sha1) static int get_blob_sha1(struct tree *t, const char *pathname,
unsigned char *sha1)
{ {
int i;
const char *pathspec[2]; const char *pathspec[2];
pathspec[0] = pathname; pathspec[0] = pathname;
pathspec[1] = NULL; pathspec[1] = NULL;
memset(blob_sha1, 0, sizeof(blob_sha1)); memset(blob_sha1, 0, sizeof(blob_sha1));
read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal); read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal);
int i;
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
if (blob_sha1[i] != 0) if (blob_sha1[i] != 0)
break; break;
@ -160,12 +191,10 @@ static int get_blob_sha1(struct tree* t, const char* pathname, unsigned char* sh
return 0; return 0;
} }
static int get_blob_sha1_internal(unsigned char *sha1, const char *base, int baselen, static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
const char *pathname, unsigned mode, int stage) int baselen, const char *pathname,
unsigned mode, int stage)
{ {
// printf("Got blob: %s base: '%s' baselen: %d pathname: '%s' mode: %o stage: %d\n",
// sha1_to_hex(sha1), base, baselen, pathname, mode, stage);
if (S_ISDIR(mode)) if (S_ISDIR(mode))
return READ_TREE_RECURSIVE; return READ_TREE_RECURSIVE;
@ -182,260 +211,351 @@ static void get_blob(struct commit* commit)
return; return;
info->buf = read_sha1_file(info->sha1, type, &info->size); info->buf = read_sha1_file(info->sha1, type, &info->size);
assert(!strcmp(type, "blob")); assert(!strcmp(type, "blob"));
} }
void print_patch(struct patch* p) /* For debugging only */
static void print_patch(struct patch *p)
{ {
printf("Num chunks: %d\n", p->num);
int i; int i;
printf("Num chunks: %d\n", p->num);
for (i = 0; i < p->num; i++) { for (i = 0; i < p->num; i++) {
printf("%d,%d %d,%d\n", p->chunks[i].off1, p->chunks[i].len1, p->chunks[i].off2, p->chunks[i].len2); printf("%d,%d %d,%d\n", p->chunks[i].off1, p->chunks[i].len1,
p->chunks[i].off2, p->chunks[i].len2);
} }
} }
/* For debugging only */
static void print_map(struct commit *cmit, struct commit *other)
{
struct util_info *util = cmit->object.util;
struct util_info *util2 = other->object.util;
int i;
int max =
util->num_lines >
util2->num_lines ? util->num_lines : util2->num_lines;
int num;
for (i = 0; i < max; i++) {
printf("i: %d ", i);
num = -1;
if (i < util->num_lines) {
num = util->line_map[i];
printf("%d\t", num);
} else
printf("\t");
if (i < util2->num_lines) {
int num2 = util2->line_map[i];
printf("%d\t", num2);
if (num != -1 && num2 != num)
printf("---");
} else
printf("\t");
printf("\n");
}
}
// p is a patch from commit to other. // p is a patch from commit to other.
void fill_line_map(struct commit* commit, struct commit* other, struct patch* p) static void fill_line_map(struct commit *commit, struct commit *other,
struct patch *p)
{ {
int num_lines = ((struct util_info*) commit->object.util)->num_lines; struct util_info *util = commit->object.util;
int* line_map = ((struct util_info*) commit->object.util)->line_map; struct util_info *util2 = other->object.util;
int num_lines2 = ((struct util_info*) other->object.util)->num_lines; int *map = util->line_map;
int* line_map2 = ((struct util_info*) other->object.util)->line_map; int *map2 = util2->line_map;
int cur_chunk = 0; int cur_chunk = 0;
int i1, i2; int i1, i2;
if (p->num && DEBUG) if (p->num && DEBUG)
print_patch(p); print_patch(p);
for(i1 = 0; i1 < num_lines; i1++)
line_map[i1] = -1;
if (DEBUG) if (DEBUG)
printf("num lines 1: %d num lines 2: %d\n", num_lines, num_lines2); printf("num lines 1: %d num lines 2: %d\n", util->num_lines,
util2->num_lines);
for(i1 = 0, i2 = 0; i1 < num_lines; i1++, i2++) {
if(DEBUG > 1)
printf("%d %d\n", i1, i2);
if(i2 >= num_lines2)
break;
line_map[i1] = line_map2[i2];
for (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) {
struct chunk *chunk = NULL; struct chunk *chunk = NULL;
if (cur_chunk < p->num) if (cur_chunk < p->num)
chunk = &p->chunks[cur_chunk]; chunk = &p->chunks[cur_chunk];
if (chunk && chunk->off1 == i1) { if (chunk && chunk->off1 == i1) {
i2 = chunk->off2; if (DEBUG && i2 != chunk->off2)
printf("i2: %d off2: %d\n", i2, chunk->off2);
assert(i2 == chunk->off2);
i1--;
i2--;
if (chunk->len1 > 0) if (chunk->len1 > 0)
i1 += chunk->len1-1; i1 += chunk->len1;
if (chunk->len2 > 0) if (chunk->len2 > 0)
i2 += chunk->len2-1; i2 += chunk->len2;
cur_chunk++; cur_chunk++;
} else {
if (i2 >= util2->num_lines)
break;
if (map[i1] != map2[i2] && map[i1] != -1) {
if (DEBUG)
printf("map: i1: %d %d %p i2: %d %d %p\n",
i1, map[i1],
i1 != -1 ? blame_lines[map[i1]] : NULL,
i2, map2[i2],
i2 != -1 ? blame_lines[map2[i2]] : NULL);
if (map2[i2] != -1 &&
blame_lines[map[i1]] &&
!blame_lines[map2[i2]])
map[i1] = map2[i2];
} }
if (map[i1] == -1 && map2[i2] != -1)
map[i1] = map2[i2];
}
if (DEBUG > 1)
printf("l1: %d l2: %d i1: %d i2: %d\n",
map[i1], map2[i2], i1, i2);
} }
} }
int map_line(struct commit* commit, int line) static int map_line(struct commit *commit, int line)
{ {
struct util_info *info = commit->object.util; struct util_info *info = commit->object.util;
assert(line >= 0 && line < info->num_lines); assert(line >= 0 && line < info->num_lines);
return info->line_map[line]; return info->line_map[line];
} }
int fill_util_info(struct commit* commit, const char* path) static int fill_util_info(struct commit *commit, const char *path)
{ {
struct util_info *util;
if (commit->object.util) if (commit->object.util)
return 0; return 0;
struct util_info* util = xmalloc(sizeof(struct util_info)); util = xmalloc(sizeof(struct util_info));
if (get_blob_sha1(commit->tree, path, util->sha1)) {
free(util);
return 1;
} else {
util->buf = NULL; util->buf = NULL;
util->size = 0; util->size = 0;
util->num_lines = -1;
util->line_map = NULL; util->line_map = NULL;
util->num_lines = -1;
commit->object.util = util; commit->object.util = util;
if(get_blob_sha1(commit->tree, path, util->sha1))
return -1;
return 0; return 0;
} }
}
void alloc_line_map(struct commit* commit) static void alloc_line_map(struct commit *commit)
{ {
struct util_info *util = commit->object.util; struct util_info *util = commit->object.util;
int i;
if (util->line_map) if (util->line_map)
return; return;
get_blob(commit); get_blob(commit);
int i;
util->num_lines = 0; util->num_lines = 0;
for (i = 0; i < util->size; i++) { for (i = 0; i < util->size; i++) {
if (util->buf[i] == '\n') if (util->buf[i] == '\n')
util->num_lines++; util->num_lines++;
} }
if(util->buf[util->size - 1] != '\n')
util->num_lines++;
util->line_map = xmalloc(sizeof(int) * util->num_lines); util->line_map = xmalloc(sizeof(int) * util->num_lines);
for (i = 0; i < util->num_lines; i++)
util->line_map[i] = -1;
} }
void copy_line_map(struct commit* dst, struct commit* src) static void init_first_commit(struct commit* commit, const char* filename)
{
struct util_info* u_dst = dst->object.util;
struct util_info* u_src = src->object.util;
u_dst->line_map = u_src->line_map;
u_dst->num_lines = u_src->num_lines;
u_dst->buf = u_src->buf;
u_dst->size = u_src->size;
}
void process_commits(struct commit_list* list, const char* path)
{ {
struct util_info* util;
int i; int i;
while(list) { if (fill_util_info(commit, filename))
struct commit* commit = pop_commit(&list); die("fill_util_info failed");
struct commit_list* parents;
struct util_info* info; alloc_line_map(commit);
util = commit->object.util;
num_blame_lines = util->num_lines;
for (i = 0; i < num_blame_lines; i++)
util->line_map[i] = i;
}
static void process_commits(struct rev_info *rev, const char *path,
struct commit** initial)
{
int i;
struct util_info* util;
int lines_left;
int *blame_p;
int *new_lines;
int new_lines_len;
struct commit* commit = get_revision(rev);
assert(commit);
init_first_commit(commit, path);
util = commit->object.util;
num_blame_lines = util->num_lines;
blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
for (i = 0; i < num_blame_lines; i++)
blame_lines[i] = NULL;
lines_left = num_blame_lines;
blame_p = xmalloc(sizeof(int) * num_blame_lines);
new_lines = xmalloc(sizeof(int) * num_blame_lines);
do {
struct commit_list *parents;
int num_parents;
struct util_info *util;
info = commit->object.util;
num_commits++;
if (DEBUG) if (DEBUG)
printf("\nProcessing commit: %d %s\n", num_commits, sha1_to_hex(commit->object.sha1)); printf("\nProcessing commit: %d %s\n", num_commits,
sha1_to_hex(commit->object.sha1));
if (lines_left == 0)
return;
num_commits++;
memset(blame_p, 0, sizeof(int) * num_blame_lines);
new_lines_len = 0;
num_parents = 0;
for (parents = commit->parents;
parents != NULL; parents = parents->next)
num_parents++;
if(num_parents == 0)
*initial = commit;
if(fill_util_info(commit, path))
continue;
alloc_line_map(commit);
util = commit->object.util;
for (parents = commit->parents; for (parents = commit->parents;
parents != NULL; parents = parents->next) { parents != NULL; parents = parents->next) {
struct commit *parent = parents->item; struct commit *parent = parents->item;
struct patch *patch;
if (parse_commit(parent) < 0) if (parse_commit(parent) < 0)
die("parse_commit error"); die("parse_commit error");
if (DEBUG) if (DEBUG)
printf("parent: %s\n", sha1_to_hex(parent->object.sha1)); printf("parent: %s\n",
sha1_to_hex(parent->object.sha1));
if(fill_util_info(parent, path)) if(fill_util_info(parent, path)) {
num_parents--;
continue; continue;
// Temporarily assign everything to the parent.
int num_blame = 0;
for(i = 0; i < num_blame_lines; i++) {
if(blame_lines[i] == commit) {
num_blame++;
blame_lines[i] = parent;
}
} }
if(num_blame == 0) patch = get_patch(parent, commit);
continue;
struct patch* patch = get_patch(parent, commit);
if(patch->num == 0) {
copy_line_map(parent, commit);
} else {
alloc_line_map(parent); alloc_line_map(parent);
fill_line_map(parent, commit, patch); fill_line_map(parent, commit, patch);
}
for (i = 0; i < patch->num; i++) { for (i = 0; i < patch->num; i++) {
int l; int l;
for (l = 0; l < patch->chunks[i].len2; l++) { for (l = 0; l < patch->chunks[i].len2; l++) {
int mapped_line = map_line(commit, patch->chunks[i].off2 + l); int mapped_line =
if(mapped_line != -1 && blame_lines[mapped_line] == parent) map_line(commit, patch->chunks[i].off2 + l);
blame_lines[mapped_line] = commit; if (mapped_line != -1) {
blame_p[mapped_line]++;
if (blame_p[mapped_line] == num_parents)
new_lines[new_lines_len++] = mapped_line;
}
} }
} }
free_patch(patch); free_patch(patch);
} }
if (DEBUG)
printf("parents: %d\n", num_parents);
for (i = 0; i < new_lines_len; i++) {
int mapped_line = new_lines[i];
if (blame_lines[mapped_line] == NULL) {
blame_lines[mapped_line] = commit;
lines_left--;
if (DEBUG)
printf("blame: mapped: %d i: %d\n",
mapped_line, i);
} }
} }
} while ((commit = get_revision(rev)) != NULL);
#define SEEN 1
struct commit_list* get_commit_list(struct commit* commit, const char* pathname)
{
struct commit_list* ret = NULL;
struct commit_list* process = NULL;
unsigned char sha1[20];
commit_list_insert(commit, &process);
while(process) {
struct commit* com = pop_commit(&process);
if(com->object.flags & SEEN)
continue;
com->object.flags |= SEEN;
commit_list_insert(com, &ret);
struct commit_list* parents;
parse_commit(com);
for(parents = com->parents;
parents != NULL; parents = parents->next) {
struct commit* parent = parents->item;
parse_commit(parent);
if(!get_blob_sha1(parent->tree, pathname, sha1))
commit_list_insert(parent, &process);
}
}
return ret;
} }
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
unsigned char sha1[20];
struct commit *commit;
const char* filename;
int i; int i;
struct commit *initial = NULL;
unsigned char sha1[20];
const char* filename;
int num_args;
const char* args[10];
struct rev_info rev;
setup_git_directory(); setup_git_directory();
if (argc != 3) if (argc != 3)
die("Usage: blame commit-ish file"); die("Usage: blame commit-ish file");
if (get_sha1(argv[1], sha1))
die("get_sha1 failed");
commit = lookup_commit_reference(sha1);
filename = argv[2]; filename = argv[2];
struct commit_list* list = get_commit_list(commit, filename); {
sort_in_topological_order(&list, 1); struct commit* commit;
if (get_sha1(argv[1], sha1))
die("get_sha1 failed");
commit = lookup_commit_reference(sha1);
if (fill_util_info(commit, filename)) { if (fill_util_info(commit, filename)) {
printf("%s not found in %s\n", filename, argv[1]); printf("%s not found in %s\n", filename, argv[1]);
return 0; return 1;
} }
alloc_line_map(commit);
struct util_info* util = commit->object.util;
num_blame_lines = util->num_lines;
blame_lines = xmalloc(sizeof(struct commit*)*num_blame_lines);
for(i = 0; i < num_blame_lines; i++) {
blame_lines[i] = commit;
((struct util_info*) commit->object.util)->line_map[i] = i;
} }
process_commits(list, filename); num_args = 0;
args[num_args++] = NULL;
args[num_args++] = "--topo-order";
args[num_args++] = "--remove-empty";
args[num_args++] = argv[1];
args[num_args++] = "--";
args[num_args++] = filename;
args[num_args] = NULL;
setup_revisions(num_args, args, &rev, "HEAD");
prepare_revision_walk(&rev);
process_commits(&rev, filename, &initial);
for (i = 0; i < num_blame_lines; i++) { for (i = 0; i < num_blame_lines; i++) {
printf("%d %s\n", i+1-1, sha1_to_hex(blame_lines[i]->object.sha1)); struct commit *c = blame_lines[i];
// printf("%d %s\n", i+1-1, find_unique_abbrev(blame_lines[i]->object.sha1, 6)); if (!c)
c = initial;
printf("%d %.8s\n", i, sha1_to_hex(c->object.sha1));
// printf("%d %s\n", i, find_unique_abbrev(blame_lines[i]->object.sha1, 6));
} }
if (DEBUG) { if (DEBUG) {
printf("num get patch: %d\n", num_get_patch); printf("num get patch: %d\n", num_get_patch);
printf("num commits: %d\n", num_commits); printf("num commits: %d\n", num_commits);
printf("patch time: %f\n", patch_time / 1000000.0);
printf("initial: %s\n", sha1_to_hex(initial->object.sha1));
} }
return 0; return 0;