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

[PATCH] Show dissimilarity index for D and N case.

Browse Source 
The way broken deletes and creates are shown in the -p
(diff-patch) output format has become consistent with how
rename/copy edits are shown.  They will show "dissimilarity
index" value, immediately following the "deleted file mode" and
"new file mode" lines.

The git-apply is taught to grok such an extended header.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-05-30 16:40:16 -07:00 committed by Linus Torvalds
parent af5323e027
commit 70aadac081
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apply.c
View File

@ -336,6 +336,11 @@ static int gitdiff_similarity(const char *line, struct patch *patch)
return 0; return 0;
} }
static int gitdiff_dissimilarity(const char *line, struct patch *patch)
{
return 0;
}
/* /*
* This is normal for a diff that doesn't change anything: we'll fall through * This is normal for a diff that doesn't change anything: we'll fall through
* into the next diff. Tell the parser to break out. * into the next diff. Tell the parser to break out.
@ -437,6 +442,7 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch
{ "rename from ", gitdiff_renamesrc }, { "rename from ", gitdiff_renamesrc },
{ "rename to ", gitdiff_renamedst }, { "rename to ", gitdiff_renamedst },
{ "similarity index ", gitdiff_similarity }, { "similarity index ", gitdiff_similarity },
{ "dissimilarity index ", gitdiff_dissimilarity },
{ "", gitdiff_unrecognized }, { "", gitdiff_unrecognized },
}; };
int i; int i;

20
diff.c
View File

@ -132,10 +132,16 @@ static void builtin_diff(const char *name_a,
diff_arg, input_name_sq[0], input_name_sq[1]); diff_arg, input_name_sq[0], input_name_sq[1]);
printf("diff --git a/%s b/%s\n", name_a, name_b); printf("diff --git a/%s b/%s\n", name_a, name_b);
if (!path1[0][0]) if (!path1[0][0]) {
printf("new file mode %s\n", temp[1].mode); printf("new file mode %s\n", temp[1].mode);
else if (!path1[1][0]) if (xfrm_msg && xfrm_msg[0])
puts(xfrm_msg);
}
else if (!path1[1][0]) {
printf("deleted file mode %s\n", temp[0].mode); printf("deleted file mode %s\n", temp[0].mode);
if (xfrm_msg && xfrm_msg[0])
puts(xfrm_msg);
}
else { else {
if (strcmp(temp[0].mode, temp[1].mode)) { if (strcmp(temp[0].mode, temp[1].mode)) {
printf("old mode %s\n", temp[0].mode); printf("old mode %s\n", temp[0].mode);
@ -733,6 +739,16 @@ static void diff_flush_patch(struct diff_filepair *p)
p->one->path, p->two->path); p->one->path, p->two->path);
msg = msg_; msg = msg_;
break; break;
case 'D': case 'N':
if (DIFF_PAIR_BROKEN(p)) {
sprintf(msg_,
"dissimilarity index %d%%",
(int)(0.5 + p->score * 100.0/MAX_SCORE));
msg = msg_;
}
else
msg = NULL;
break;
default: default:
msg = NULL; msg = NULL;
} }