undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/blame'

Browse Source 
* jc/blame:
  blame -S <ancestry-file>
  Match ofs/cnt types in diff interface.
  blame: use built-in xdiff
  combine-diff: move the code to parse hunk-header into common library.
  combine-diff: refactor built-in xdiff interface.
  combine-diff: use built-in xdiff.
This commit is contained in:
Junio C Hamano 2006-04-07 17:57:46 -07:00
commit 45fa7608bd
7 changed files with 419 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -208,7 +208,7 @@ LIB_OBJS = \
quote.o read-cache.o refs.o run-command.o \ quote.o read-cache.o refs.o run-command.o \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
fetch-clone.o revision.o pager.o tree-walk.o \ fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
$(DIFF_OBJS) $(DIFF_OBJS)
GITLIBS = $(LIB_FILE) $(XDIFF_LIB) GITLIBS = $(LIB_FILE) $(XDIFF_LIB)

180
blame.c
View File

@ -16,6 +16,7 @@
#include "diff.h" #include "diff.h"
#include "diffcore.h" #include "diffcore.h"
#include "revision.h" #include "revision.h"
#include "xdiff-interface.h"
#define DEBUG 0 #define DEBUG 0
@ -57,92 +58,34 @@ static int num_get_patch = 0;
static int num_commits = 0; static int num_commits = 0;
static int patch_time = 0; static int patch_time = 0;
#define TEMPFILE_PATH_LEN 60 struct blame_diff_state {
static struct patch *get_patch(struct commit *commit, struct commit *other) struct xdiff_emit_state xm;
{
struct patch *ret; struct patch *ret;
struct util_info *info_c = (struct util_info *)commit->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];
ret = xmalloc(sizeof(struct patch)); static void process_u0_diff(void *state_, char *line, unsigned long len)
ret->chunks = NULL; {
ret->num = 0; struct blame_diff_state *state = state_;
get_blob(commit);
get_blob(other);
gettimeofday(&tv_start, NULL);
fd = git_mkstemp(tmp_path1, TEMPFILE_PATH_LEN, "git-blame-XXXXXX");
if (fd < 0)
die("unable to create temp-file: %s", strerror(errno));
if (xwrite(fd, info_c->buf, info_c->size) != info_c->size)
die("write failed: %s", strerror(errno));
close(fd);
fd = git_mkstemp(tmp_path2, TEMPFILE_PATH_LEN, "git-blame-XXXXXX");
if (fd < 0)
die("unable to create temp-file: %s", strerror(errno));
if (xwrite(fd, info_o->buf, info_o->size) != info_o->size)
die("write failed: %s", strerror(errno));
close(fd);
sprintf(diff_cmd, "diff -U 0 %s %s", tmp_path1, tmp_path2);
fin = popen(diff_cmd, "r");
if (!fin)
die("popen failed: %s", strerror(errno));
while (fgets(buf, sizeof(buf), fin)) {
struct chunk *chunk; struct chunk *chunk;
char *start, *sp;
if (buf[0] != '@' || buf[1] != '@') if (len < 4 || line[0] != '@' || line[1] != '@')
continue; return;
if (DEBUG) if (DEBUG)
printf("chunk line: %s", buf); printf("chunk line: %.*s", (int)len, line);
ret->num++; state->ret->num++;
ret->chunks = xrealloc(ret->chunks, state->ret->chunks = xrealloc(state->ret->chunks,
sizeof(struct chunk) * ret->num); sizeof(struct chunk) * state->ret->num);
chunk = &ret->chunks[ret->num - 1]; chunk = &state->ret->chunks[state->ret->num - 1];
assert(!strncmp(buf, "@@ -", 4)); assert(!strncmp(line, "@@ -", 4));
start = buf + 4; if (parse_hunk_header(line, len,
sp = index(start, ' '); &chunk->off1, &chunk->len1,
*sp = '\0'; &chunk->off2, &chunk->len2)) {
if (index(start, ',')) { state->ret->num--;
int ret = return;
sscanf(start, "%d,%d", &chunk->off1, &chunk->len1);
assert(ret == 2);
} else {
int ret = sscanf(start, "%d", &chunk->off1);
assert(ret == 1);
chunk->len1 = 1;
} }
*sp = ' ';
start = sp + 1;
sp = index(start, ' ');
*sp = '\0';
if (index(start, ',')) {
int ret =
sscanf(start, "%d,%d", &chunk->off2, &chunk->len2);
assert(ret == 2);
} else {
int ret = sscanf(start, "%d", &chunk->off2);
assert(ret == 1);
chunk->len2 = 1;
}
*sp = ' ';
if (chunk->len1 == 0) if (chunk->len1 == 0)
chunk->off1++; chunk->off1++;
@ -156,17 +99,48 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
assert(chunk->off1 >= 0); assert(chunk->off1 >= 0);
assert(chunk->off2 >= 0); assert(chunk->off2 >= 0);
} }
pclose(fin);
unlink(tmp_path1); static struct patch *get_patch(struct commit *commit, struct commit *other)
unlink(tmp_path2); {
struct blame_diff_state state;
xpparam_t xpp;
xdemitconf_t xecfg;
mmfile_t file_c, file_o;
xdemitcb_t ecb;
struct util_info *info_c = (struct util_info *)commit->object.util;
struct util_info *info_o = (struct util_info *)other->object.util;
struct timeval tv_start, tv_end;
get_blob(commit);
file_c.ptr = info_c->buf;
file_c.size = info_c->size;
get_blob(other);
file_o.ptr = info_o->buf;
file_o.size = info_o->size;
gettimeofday(&tv_start, NULL);
xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 0;
xecfg.flags = 0;
ecb.outf = xdiff_outf;
ecb.priv = &state;
memset(&state, 0, sizeof(state));
state.xm.consume = process_u0_diff;
state.ret = xmalloc(sizeof(struct patch));
state.ret->chunks = NULL;
state.ret->num = 0;
xdl_diff(&file_c, &file_o, &xpp, &xecfg, &ecb);
gettimeofday(&tv_end, NULL); gettimeofday(&tv_end, NULL);
patch_time += 1000000 * (tv_end.tv_sec - tv_start.tv_sec) + patch_time += 1000000 * (tv_end.tv_sec - tv_start.tv_sec) +
tv_end.tv_usec - tv_start.tv_usec; tv_end.tv_usec - tv_start.tv_usec;
num_get_patch++; num_get_patch++;
return ret; return state.ret;
} }
static void free_patch(struct patch *p) static void free_patch(struct patch *p)
@ -674,7 +648,7 @@ static void get_commit_info(struct commit* commit, struct commit_info* ret)
static char author_buf[1024]; static char author_buf[1024];
tmp = strstr(commit->buffer, "\nauthor ") + 8; tmp = strstr(commit->buffer, "\nauthor ") + 8;
len = index(tmp, '\n') - tmp; len = strchr(tmp, '\n') - tmp;
ret->author = author_buf; ret->author = author_buf;
memcpy(ret->author, tmp, len); memcpy(ret->author, tmp, len);
@ -729,11 +703,30 @@ static void* topo_getter(struct commit* c)
return util->topo_data; return util->topo_data;
} }
static int read_ancestry(const char *graft_file,
unsigned char **start_sha1)
{
FILE *fp = fopen(graft_file, "r");
char buf[1024];
if (!fp)
return -1;
while (fgets(buf, sizeof(buf), fp)) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf);
struct commit_graft *graft = read_graft_line(buf, len);
register_commit_graft(graft, 0);
if (!*start_sha1)
*start_sha1 = graft->sha1;
}
fclose(fp);
return 0;
}
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
int i; int i;
struct commit *initial = NULL; struct commit *initial = NULL;
unsigned char sha1[20]; unsigned char sha1[20], *sha1_p = NULL;
const char *filename = NULL, *commit = NULL; const char *filename = NULL, *commit = NULL;
char filename_buf[256]; char filename_buf[256];
@ -767,6 +760,14 @@ int main(int argc, const char **argv)
!strcmp(argv[i], "--compability")) { !strcmp(argv[i], "--compability")) {
compability = 1; compability = 1;
continue; continue;
} else if(!strcmp(argv[i], "-S")) {
if (i + 1 < argc &&
!read_ancestry(argv[i + 1], &sha1_p)) {
compability = 1;
i++;
continue;
}
usage(blame_usage);
} else if(!strcmp(argv[i], "--")) { } else if(!strcmp(argv[i], "--")) {
options = 0; options = 0;
continue; continue;
@ -788,7 +789,9 @@ int main(int argc, const char **argv)
if(!filename) if(!filename)
usage(blame_usage); usage(blame_usage);
if(!commit) if (commit && sha1_p)
usage(blame_usage);
else if(!commit)
commit = "HEAD"; commit = "HEAD";
if(prefix) if(prefix)
@ -797,9 +800,12 @@ int main(int argc, const char **argv)
strcpy(filename_buf, filename); strcpy(filename_buf, filename);
filename = filename_buf; filename = filename_buf;
if (!sha1_p) {
if (get_sha1(commit, sha1)) if (get_sha1(commit, sha1))
die("get_sha1 failed, commit '%s' not found", commit); die("get_sha1 failed, commit '%s' not found", commit);
start_commit = lookup_commit_reference(sha1); sha1_p = sha1;
}
start_commit = lookup_commit_reference(sha1_p);
get_util(start_commit)->pathname = filename; get_util(start_commit)->pathname = filename;
if (fill_util_info(start_commit)) { if (fill_util_info(start_commit)) {
printf("%s not found in %s\n", filename, commit); printf("%s not found in %s\n", filename, commit);
@ -876,7 +882,7 @@ int main(int argc, const char **argv)
if(blame_contents[blame_len-1] != '\n') if(blame_contents[blame_len-1] != '\n')
putc('\n', stdout); putc('\n', stdout);
} else { } else {
char* next_buf = index(buf, '\n') + 1; char* next_buf = strchr(buf, '\n') + 1;
fwrite(buf, next_buf - buf, 1, stdout); fwrite(buf, next_buf - buf, 1, stdout);
buf = next_buf; buf = next_buf;
} }

221
combine-diff.c
View File

@ -4,6 +4,7 @@
#include "diff.h" #include "diff.h"
#include "diffcore.h" #include "diffcore.h"
#include "quote.h" #include "quote.h"
#include "xdiff-interface.h"
static int uninteresting(struct diff_filepair *p) static int uninteresting(struct diff_filepair *p)
{ {
@ -110,78 +111,9 @@ static char *grab_blob(const unsigned char *sha1, unsigned long *size)
return blob; return blob;
} }
#define TMPPATHLEN 50 static void append_lost(struct sline *sline, int n, const char *line, int len)
#define MAXLINELEN 10240
static void write_to_temp_file(char *tmpfile, void *blob, unsigned long size)
{
int fd = git_mkstemp(tmpfile, TMPPATHLEN, ".diff_XXXXXX");
if (fd < 0)
die("unable to create temp-file");
if (write(fd, blob, size) != size)
die("unable to write temp-file");
close(fd);
}
static void write_temp_blob(char *tmpfile, const unsigned char *sha1)
{
unsigned long size;
void *blob;
blob = grab_blob(sha1, &size);
write_to_temp_file(tmpfile, blob, size);
free(blob);
}
static int parse_num(char **cp_p, unsigned int *num_p)
{
char *cp = *cp_p;
unsigned int num = 0;
int read_some;
while ('0' <= *cp && *cp <= '9')
num = num * 10 + *cp++ - '0';
if (!(read_some = cp - *cp_p))
return -1;
*cp_p = cp;
*num_p = num;
return 0;
}
static int parse_hunk_header(char *line, int len,
unsigned int *ob, unsigned int *on,
unsigned int *nb, unsigned int *nn)
{
char *cp;
cp = line + 4;
if (parse_num(&cp, ob)) {
bad_line:
return error("malformed diff output: %s", line);
}
if (*cp == ',') {
cp++;
if (parse_num(&cp, on))
goto bad_line;
}
else
*on = 1;
if (*cp++ != ' ' || *cp++ != '+')
goto bad_line;
if (parse_num(&cp, nb))
goto bad_line;
if (*cp == ',') {
cp++;
if (parse_num(&cp, nn))
goto bad_line;
}
else
*nn = 1;
return -!!memcmp(cp, " @@", 3);
}
static void append_lost(struct sline *sline, int n, const char *line)
{ {
struct lline *lline; struct lline *lline;
int len = strlen(line);
unsigned long this_mask = (1UL<<n); unsigned long this_mask = (1UL<<n);
if (line[len-1] == '\n') if (line[len-1] == '\n')
len--; len--;
@ -216,70 +148,93 @@ static void append_lost(struct sline *sline, int n, const char *line)
sline->lost_tail = &lline->next; sline->lost_tail = &lline->next;
} }
static void combine_diff(const unsigned char *parent, const char *ourtmp, struct combine_diff_state {
struct sline *sline, int cnt, int n, int num_parent) struct xdiff_emit_state xm;
unsigned int lno;
int ob, on, nb, nn;
unsigned long nmask;
int num_parent;
int n;
struct sline *sline;
struct sline *lost_bucket;
};
static void consume_line(void *state_, char *line, unsigned long len)
{ {
FILE *in; struct combine_diff_state *state = state_;
char parent_tmp[TMPPATHLEN];
char cmd[TMPPATHLEN * 2 + 1024];
char line[MAXLINELEN];
unsigned int lno, ob, on, nb, nn, p_lno;
unsigned long nmask = (1UL << n);
struct sline *lost_bucket = NULL;
if (!cnt)
return; /* result deleted */
write_temp_blob(parent_tmp, parent);
sprintf(cmd, "diff --unified=0 -La/x -Lb/x '%s' '%s'",
parent_tmp, ourtmp);
in = popen(cmd, "r");
if (!in)
die("cannot spawn %s", cmd);
lno = 1;
while (fgets(line, sizeof(line), in) != NULL) {
int len = strlen(line);
if (5 < len && !memcmp("@@ -", line, 4)) { if (5 < len && !memcmp("@@ -", line, 4)) {
if (parse_hunk_header(line, len, if (parse_hunk_header(line, len,
&ob, &on, &nb, &nn)) &state->ob, &state->on,
break; &state->nb, &state->nn))
lno = nb; return;
if (!nb) state->lno = state->nb;
if (!state->nb)
/* @@ -1,2 +0,0 @@ to remove the /* @@ -1,2 +0,0 @@ to remove the
* first two lines... * first two lines...
*/ */
nb = 1; state->nb = 1;
if (nn == 0) if (state->nn == 0)
/* @@ -X,Y +N,0 @@ removed Y lines /* @@ -X,Y +N,0 @@ removed Y lines
* that would have come *after* line N * that would have come *after* line N
* in the result. Our lost buckets hang * in the result. Our lost buckets hang
* to the line after the removed lines, * to the line after the removed lines,
*/ */
lost_bucket = &sline[nb]; state->lost_bucket = &state->sline[state->nb];
else else
lost_bucket = &sline[nb-1]; state->lost_bucket = &state->sline[state->nb-1];
if (!sline[nb-1].p_lno) if (!state->sline[state->nb-1].p_lno)
sline[nb-1].p_lno = state->sline[state->nb-1].p_lno =
xcalloc(num_parent, xcalloc(state->num_parent,
sizeof(unsigned long)); sizeof(unsigned long));
sline[nb-1].p_lno[n] = ob; state->sline[state->nb-1].p_lno[state->n] = state->ob;
continue; return;
} }
if (!lost_bucket) if (!state->lost_bucket)
continue; /* not in any hunk yet */ return; /* not in any hunk yet */
switch (line[0]) { switch (line[0]) {
case '-': case '-':
append_lost(lost_bucket, n, line+1); append_lost(state->lost_bucket, state->n, line+1, len-1);
break; break;
case '+': case '+':
sline[lno-1].flag |= nmask; state->sline[state->lno-1].flag |= state->nmask;
lno++; state->lno++;
break; break;
} }
} }
fclose(in);
unlink(parent_tmp); static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
struct sline *sline, int cnt, int n, int num_parent)
{
unsigned int p_lno, lno;
unsigned long nmask = (1UL << n);
xpparam_t xpp;
xdemitconf_t xecfg;
mmfile_t parent_file;
xdemitcb_t ecb;
struct combine_diff_state state;
unsigned long sz;
if (!cnt)
return; /* result deleted */
parent_file.ptr = grab_blob(parent, &sz);
parent_file.size = sz;
xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 0;
xecfg.flags = 0;
ecb.outf = xdiff_outf;
ecb.priv = &state;
memset(&state, 0, sizeof(state));
state.xm.consume = consume_line;
state.nmask = nmask;
state.sline = sline;
state.lno = 1;
state.num_parent = num_parent;
state.n = n;
xdl_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
free(parent_file.ptr);
/* Assign line numbers for this parent. /* Assign line numbers for this parent.
* *
@ -625,61 +580,56 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
int dense, const char *header, int dense, const char *header,
struct diff_options *opt) struct diff_options *opt)
{ {
unsigned long size, cnt, lno; unsigned long result_size, cnt, lno;
char *result, *cp, *ep; char *result, *cp, *ep;
struct sline *sline; /* survived lines */ struct sline *sline; /* survived lines */
int mode_differs = 0; int mode_differs = 0;
int i, show_hunks, shown_header = 0; int i, show_hunks, shown_header = 0;
char ourtmp_buf[TMPPATHLEN];
char *ourtmp = ourtmp_buf;
int working_tree_file = !memcmp(elem->sha1, null_sha1, 20); int working_tree_file = !memcmp(elem->sha1, null_sha1, 20);
int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV; int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV;
mmfile_t result_file;
/* Read the result of merge first */ /* Read the result of merge first */
if (!working_tree_file) { if (!working_tree_file)
result = grab_blob(elem->sha1, &size); result = grab_blob(elem->sha1, &result_size);
write_to_temp_file(ourtmp, result, size);
}
else { else {
/* Used by diff-tree to read from the working tree */ /* Used by diff-tree to read from the working tree */
struct stat st; struct stat st;
int fd; int fd;
ourtmp = elem->path; if (0 <= (fd = open(elem->path, O_RDONLY)) &&
if (0 <= (fd = open(ourtmp, O_RDONLY)) &&
!fstat(fd, &st)) { !fstat(fd, &st)) {
int len = st.st_size; int len = st.st_size;
int cnt = 0; int cnt = 0;
elem->mode = canon_mode(st.st_mode); elem->mode = canon_mode(st.st_mode);
size = len; result_size = len;
result = xmalloc(len + 1); result = xmalloc(len + 1);
while (cnt < len) { while (cnt < len) {
int done = xread(fd, result+cnt, len-cnt); int done = xread(fd, result+cnt, len-cnt);
if (done == 0) if (done == 0)
break; break;
if (done < 0) if (done < 0)
die("read error '%s'", ourtmp); die("read error '%s'", elem->path);
cnt += done; cnt += done;
} }
result[len] = 0; result[len] = 0;
} }
else { else {
/* deleted file */ /* deleted file */
size = 0; result_size = 0;
elem->mode = 0; elem->mode = 0;
result = xmalloc(1); result = xmalloc(1);
result[0] = 0; result[0] = 0;
ourtmp = "/dev/null";
} }
if (0 <= fd) if (0 <= fd)
close(fd); close(fd);
} }
for (cnt = 0, cp = result; cp - result < size; cp++) { for (cnt = 0, cp = result; cp - result < result_size; cp++) {
if (*cp == '\n') if (*cp == '\n')
cnt++; cnt++;
} }
if (size && result[size-1] != '\n') if (result_size && result[result_size-1] != '\n')
cnt++; /* incomplete line */ cnt++; /* incomplete line */
sline = xcalloc(cnt+1, sizeof(*sline)); sline = xcalloc(cnt+1, sizeof(*sline));
@ -689,7 +639,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
sline[lno].lost_tail = &sline[lno].lost_head; sline[lno].lost_tail = &sline[lno].lost_head;
sline[lno].flag = 0; sline[lno].flag = 0;
} }
for (lno = 0, cp = result; cp - result < size; cp++) { for (lno = 0, cp = result; cp - result < result_size; cp++) {
if (*cp == '\n') { if (*cp == '\n') {
sline[lno].len = cp - sline[lno].bol; sline[lno].len = cp - sline[lno].bol;
lno++; lno++;
@ -697,8 +647,11 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
sline[lno].bol = cp + 1; sline[lno].bol = cp + 1;
} }
} }
if (size && result[size-1] != '\n') if (result_size && result[result_size-1] != '\n')
sline[cnt-1].len = size - (sline[cnt-1].bol - result); sline[cnt-1].len = result_size - (sline[cnt-1].bol - result);
result_file.ptr = result;
result_file.size = result_size;
sline[0].p_lno = xcalloc((cnt+1) * num_parent, sizeof(unsigned long)); sline[0].p_lno = xcalloc((cnt+1) * num_parent, sizeof(unsigned long));
for (lno = 0; lno < cnt; lno++) for (lno = 0; lno < cnt; lno++)
@ -714,7 +667,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
} }
} }
if (i <= j) if (i <= j)
combine_diff(elem->parent[i].sha1, ourtmp, sline, combine_diff(elem->parent[i].sha1, &result_file, sline,
cnt, i, num_parent); cnt, i, num_parent);
if (elem->parent[i].mode != elem->mode) if (elem->parent[i].mode != elem->mode)
mode_differs = 1; mode_differs = 1;
@ -767,8 +720,6 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
} }
dump_sline(sline, cnt, num_parent); dump_sline(sline, cnt, num_parent);
} }
if (ourtmp == ourtmp_buf)
unlink(ourtmp);
free(result); free(result);
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {

94
commit.c
View File

@ -101,11 +101,7 @@ static unsigned long parse_commit_date(const char *buf)
return date; return date;
} }
static struct commit_graft { static struct commit_graft **commit_graft;
unsigned char sha1[20];
int nr_parent;
unsigned char parent[0][20]; /* more */
} **commit_graft;
static int commit_graft_alloc, commit_graft_nr; static int commit_graft_alloc, commit_graft_nr;
static int commit_graft_pos(const unsigned char *sha1) static int commit_graft_pos(const unsigned char *sha1)
@ -127,30 +123,50 @@ static int commit_graft_pos(const unsigned char *sha1)
return -lo - 1; return -lo - 1;
} }
static void prepare_commit_graft(void) int register_commit_graft(struct commit_graft *graft, int ignore_dups)
{ {
char *graft_file = get_graft_file(); int pos = commit_graft_pos(graft->sha1);
FILE *fp = fopen(graft_file, "r");
char buf[1024]; if (0 <= pos) {
if (!fp) { if (ignore_dups)
commit_graft = (struct commit_graft **) "hack"; free(graft);
return; else {
free(commit_graft[pos]);
commit_graft[pos] = graft;
} }
while (fgets(buf, sizeof(buf), fp)) { return 1;
}
pos = -pos - 1;
if (commit_graft_alloc <= ++commit_graft_nr) {
commit_graft_alloc = alloc_nr(commit_graft_alloc);
commit_graft = xrealloc(commit_graft,
sizeof(*commit_graft) *
commit_graft_alloc);
}
if (pos < commit_graft_nr)
memmove(commit_graft + pos + 1,
commit_graft + pos,
(commit_graft_nr - pos - 1) *
sizeof(*commit_graft));
commit_graft[pos] = graft;
return 0;
}
struct commit_graft *read_graft_line(char *buf, int len)
{
/* The format is just "Commit Parent1 Parent2 ...\n" */ /* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf);
int i; int i;
struct commit_graft *graft = NULL; struct commit_graft *graft = NULL;
if (buf[len-1] == '\n') if (buf[len-1] == '\n')
buf[--len] = 0; buf[--len] = 0;
if (buf[0] == '#') if (buf[0] == '#')
continue; return 0;
if ((len + 1) % 41) { if ((len + 1) % 41) {
bad_graft_data: bad_graft_data:
error("bad graft data: %s", buf); error("bad graft data: %s", buf);
free(graft); free(graft);
continue; return NULL;
} }
i = (len + 1) / 41 - 1; i = (len + 1) / 41 - 1;
graft = xmalloc(sizeof(*graft) + 20 * i); graft = xmalloc(sizeof(*graft) + 20 * i);
@ -163,33 +179,41 @@ static void prepare_commit_graft(void)
if (get_sha1_hex(buf + i + 1, graft->parent[i/41])) if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
goto bad_graft_data; goto bad_graft_data;
} }
i = commit_graft_pos(graft->sha1); return graft;
if (0 <= i) { }
int read_graft_file(const char *graft_file)
{
FILE *fp = fopen(graft_file, "r");
char buf[1024];
if (!fp)
return -1;
while (fgets(buf, sizeof(buf), fp)) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf);
struct commit_graft *graft = read_graft_line(buf, len);
if (register_commit_graft(graft, 1))
error("duplicate graft data: %s", buf); error("duplicate graft data: %s", buf);
free(graft);
continue;
}
i = -i - 1;
if (commit_graft_alloc <= ++commit_graft_nr) {
commit_graft_alloc = alloc_nr(commit_graft_alloc);
commit_graft = xrealloc(commit_graft,
sizeof(*commit_graft) *
commit_graft_alloc);
}
if (i < commit_graft_nr)
memmove(commit_graft + i + 1,
commit_graft + i,
(commit_graft_nr - i - 1) *
sizeof(*commit_graft));
commit_graft[i] = graft;
} }
fclose(fp); fclose(fp);
return 0;
}
static void prepare_commit_graft(void)
{
static int commit_graft_prepared;
char *graft_file;
if (commit_graft_prepared)
return;
graft_file = get_graft_file();
read_graft_file(graft_file);
commit_graft_prepared = 1;
} }
static struct commit_graft *lookup_commit_graft(const unsigned char *sha1) static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
{ {
int pos; int pos;
if (!commit_graft)
prepare_commit_graft(); prepare_commit_graft();
pos = commit_graft_pos(sha1); pos = commit_graft_pos(sha1);
if (pos < 0) if (pos < 0)

11
commit.h
View File

@ -90,4 +90,15 @@ void sort_in_topological_order(struct commit_list ** list, int lifo);
void sort_in_topological_order_fn(struct commit_list ** list, int lifo, void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
topo_sort_set_fn_t setter, topo_sort_set_fn_t setter,
topo_sort_get_fn_t getter); topo_sort_get_fn_t getter);
struct commit_graft {
unsigned char sha1[20];
int nr_parent;
unsigned char parent[FLEX_ARRAY][20]; /* more */
};
struct commit_graft *read_graft_line(char *buf, int len);
int register_commit_graft(struct commit_graft *, int);
int read_graft_file(const char *graft_file);
#endif /* COMMIT_H */ #endif /* COMMIT_H */

104
xdiff-interface.c Normal file
View File

@ -0,0 +1,104 @@
#include "cache.h"
#include "xdiff-interface.h"
static int parse_num(char **cp_p, int *num_p)
{
char *cp = *cp_p;
int num = 0;
int read_some;
while ('0' <= *cp && *cp <= '9')
num = num * 10 + *cp++ - '0';
if (!(read_some = cp - *cp_p))
return -1;
*cp_p = cp;
*num_p = num;
return 0;
}
int parse_hunk_header(char *line, int len,
int *ob, int *on,
int *nb, int *nn)
{
char *cp;
cp = line + 4;
if (parse_num(&cp, ob)) {
bad_line:
return error("malformed diff output: %s", line);
}
if (*cp == ',') {
cp++;
if (parse_num(&cp, on))
goto bad_line;
}
else
*on = 1;
if (*cp++ != ' ' || *cp++ != '+')
goto bad_line;
if (parse_num(&cp, nb))
goto bad_line;
if (*cp == ',') {
cp++;
if (parse_num(&cp, nn))
goto bad_line;
}
else
*nn = 1;
return -!!memcmp(cp, " @@", 3);
}
static void consume_one(void *priv_, char *s, unsigned long size)
{
struct xdiff_emit_state *priv = priv_;
char *ep;
while (size) {
unsigned long this_size;
ep = memchr(s, '\n', size);
this_size = (ep == NULL) ? size : (ep - s + 1);
priv->consume(priv, s, this_size);
size -= this_size;
s += this_size;
}
}
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
{
struct xdiff_emit_state *priv = priv_;
int i;
for (i = 0; i < nbuf; i++) {
if (mb[i].ptr[mb[i].size-1] != '\n') {
/* Incomplete line */
priv->remainder = realloc(priv->remainder,
priv->remainder_size +
mb[i].size);
memcpy(priv->remainder + priv->remainder_size,
mb[i].ptr, mb[i].size);
priv->remainder_size += mb[i].size;
continue;
}
/* we have a complete line */
if (!priv->remainder) {
consume_one(priv, mb[i].ptr, mb[i].size);
continue;
}
priv->remainder = realloc(priv->remainder,
priv->remainder_size +
mb[i].size);
memcpy(priv->remainder + priv->remainder_size,
mb[i].ptr, mb[i].size);
consume_one(priv, priv->remainder,
priv->remainder_size + mb[i].size);
free(priv->remainder);
priv->remainder = NULL;
priv->remainder_size = 0;
}
if (priv->remainder) {
consume_one(priv, priv->remainder, priv->remainder_size);
free(priv->remainder);
priv->remainder = NULL;
priv->remainder_size = 0;
}
return 0;
}

21
xdiff-interface.h Normal file
View File

@ -0,0 +1,21 @@
#ifndef XDIFF_INTERFACE_H
#define XDIFF_INTERFACE_H
#include "xdiff/xdiff.h"
struct xdiff_emit_state;
typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
struct xdiff_emit_state {
xdiff_emit_consume_fn consume;
char *remainder;
unsigned long remainder_size;
};
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
int parse_hunk_header(char *line, int len,
int *ob, int *on,
int *nb, int *nn);
#endif