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

[PATCH] diff-cache/tree compatible output for show-diff (take 2).

Browse Source 
This makes diff-tree-helper handle ("warn about") unmerged path entries

    U <path> <record-terminator>

This is emitted once per unmerged path, no matter how many unmerged
stages there are. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-04-26 17:39:01 -07:00 committed by Linus Torvalds
parent b8a55ce71d
commit 0b32ff0dd9
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
diff-tree-helper.c
View File

@ -44,6 +44,9 @@ static int parse_oneside_change(const char *cp, struct diff_spec *one,
return 0; return 0;
} }
#define PLEASE_WARN -1
#define WARNED_OURSELVES -2
static int parse_diff_tree_output(const char *buf, static int parse_diff_tree_output(const char *buf,
struct diff_spec *old, struct diff_spec *old,
struct diff_spec *new, struct diff_spec *new,
@ -52,6 +55,9 @@ static int parse_diff_tree_output(const char *buf,
int ch; int ch;
switch (*cp++) { switch (*cp++) {
case 'U':
fprintf(stderr, "warning: unmerged path %s\n", cp+1);
return WARNED_OURSELVES;
case '+': case '+':
old->file_valid = 0; old->file_valid = 0;
return parse_oneside_change(cp, new, path); return parse_oneside_change(cp, new, path);
@ -61,7 +67,7 @@ static int parse_diff_tree_output(const char *buf,
case '*': case '*':
break; break;
default: default:
return -1; return PLEASE_WARN;
} }
/* This is for '*' entries */ /* This is for '*' entries */
@ -74,26 +80,26 @@ static int parse_diff_tree_output(const char *buf,
cp++; cp++;
} }
if (strncmp(cp, "->", 2)) if (strncmp(cp, "->", 2))
return -1; return PLEASE_WARN;
cp += 2; cp += 2;
while ((ch = *cp) && ('0' <= ch && ch <= '7')) { while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
new->mode = (new->mode << 3) | (ch - '0'); new->mode = (new->mode << 3) | (ch - '0');
cp++; cp++;
} }
if (strncmp(cp, "\tblob\t", 6)) if (strncmp(cp, "\tblob\t", 6))
return -1; return PLEASE_WARN;
cp += 6; cp += 6;
if (get_sha1_hex(cp, old->u.sha1)) if (get_sha1_hex(cp, old->u.sha1))
return -1; return PLEASE_WARN;
cp += 40; cp += 40;
if (strncmp(cp, "->", 2)) if (strncmp(cp, "->", 2))
return -1; return PLEASE_WARN;
cp += 2; cp += 2;
if (get_sha1_hex(cp, new->u.sha1)) if (get_sha1_hex(cp, new->u.sha1))
return -1; return PLEASE_WARN;
cp += 40; cp += 40;
if (*cp++ != '\t') if (*cp++ != '\t')
return -1; return PLEASE_WARN;
strcpy(path, cp); strcpy(path, cp);
return 0; return 0;
} }
@ -120,13 +126,16 @@ int main(int ac, char **av) {
/* the remaining parameters are paths patterns */ /* the remaining parameters are paths patterns */
while (1) { while (1) {
int status;
struct diff_spec old, new; struct diff_spec old, new;
char path[PATH_MAX]; char path[PATH_MAX];
read_line(&sb, stdin, line_termination); read_line(&sb, stdin, line_termination);
if (sb.eof) if (sb.eof)
break; break;
if (parse_diff_tree_output(sb.buf, &old, &new, path)) { status = parse_diff_tree_output(sb.buf, &old, &new, path);
fprintf(stderr, "cannot parse %s\n", sb.buf); if (status) {
if (status == PLEASE_WARN)
fprintf(stderr, "cannot parse %s\n", sb.buf);
continue; continue;
} }
if (1 < ac && !matches_pathspec(path, av+1, ac-1)) if (1 < ac && !matches_pathspec(path, av+1, ac-1))