kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: round down similarity index 

Rounding down the printed (dis)similarity index allows us to use
"100%" as a special value that indicates complete rewrites and
fully equal file contents, respectively.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2007-06-25 00:23:34 +02:00 committed by Junio C Hamano
parent cfc0aef1ff
commit 125b763052
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/diff-format.txt
View File

@ -126,6 +126,13 @@ the file that rename/copy produces, respectively.
If there is need for such substitution then the whole If there is need for such substitution then the whole
pathname is put in double quotes. pathname is put in double quotes.


The similarity index is the percentage of unchanged lines, and
the dissimilarity index is the percentage of changed lines. It
is a rounded down integer, followed by a percent sign. The
similarity index value of 100% is thus reserved for two equal
files, while 100% dissimilarity means that no line from the old
file made it into the new one.



combined diff format combined diff format
-------------------- --------------------

22
diff.c
View File

@ -1813,6 +1813,11 @@ static void diff_fill_sha1_info(struct diff_filespec *one)
hashclr(one->sha1); hashclr(one->sha1);
} }


static int similarity_index(struct diff_filepair *p)
{
return p->score * 100 / MAX_SCORE;
}

static void run_diff(struct diff_filepair *p, struct diff_options *o) static void run_diff(struct diff_filepair *p, struct diff_options *o)
{ {
const char *pgm = external_diff(); const char *pgm = external_diff();
@ -1847,23 +1852,20 @@ static void run_diff(struct diff_filepair *p, struct diff_options *o)
"similarity index %d%%\n" "similarity index %d%%\n"
"copy from %s\n" "copy from %s\n"
"copy to %s\n", "copy to %s\n",
(int)(0.5 + p->score * 100.0/MAX_SCORE), similarity_index(p), name_munged, other_munged);
name_munged, other_munged);
break; break;
case DIFF_STATUS_RENAMED: case DIFF_STATUS_RENAMED:
len += snprintf(msg + len, sizeof(msg) - len, len += snprintf(msg + len, sizeof(msg) - len,
"similarity index %d%%\n" "similarity index %d%%\n"
"rename from %s\n" "rename from %s\n"
"rename to %s\n", "rename to %s\n",
(int)(0.5 + p->score * 100.0/MAX_SCORE), similarity_index(p), name_munged, other_munged);
name_munged, other_munged);
break; break;
case DIFF_STATUS_MODIFIED: case DIFF_STATUS_MODIFIED:
if (p->score) { if (p->score) {
len += snprintf(msg + len, sizeof(msg) - len, len += snprintf(msg + len, sizeof(msg) - len,
"dissimilarity index %d%%\n", "dissimilarity index %d%%\n",
(int)(0.5 + p->score * similarity_index(p));
100.0/MAX_SCORE));
complete_rewrite = 1; complete_rewrite = 1;
break; break;
} }
@ -2387,8 +2389,7 @@ static void diff_flush_raw(struct diff_filepair *p,
} }


if (p->score) if (p->score)
sprintf(status, "%c%03d", p->status, sprintf(status, "%c%03d", p->status, similarity_index(p));
(int)(0.5 + p->score * 100.0/MAX_SCORE));
else { else {
status[0] = p->status; status[0] = p->status;
status[1] = 0; status[1] = 0;
@ -2670,8 +2671,7 @@ static void show_rename_copy(const char *renamecopy, struct diff_filepair *p)
{ {
char *names = pprint_rename(p->one->path, p->two->path); char *names = pprint_rename(p->one->path, p->two->path);


printf(" %s %s (%d%%)\n", renamecopy, names, printf(" %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
(int)(0.5 + p->score * 100.0/MAX_SCORE));
free(names); free(names);
show_mode_change(p, 0); show_mode_change(p, 0);
} }
@ -2695,7 +2695,7 @@ static void diff_summary(struct diff_filepair *p)
if (p->score) { if (p->score) {
char *name = quote_one(p->two->path); char *name = quote_one(p->two->path);
printf(" rewrite %s (%d%%)\n", name, printf(" rewrite %s (%d%%)\n", name,
(int)(0.5 + p->score * 100.0/MAX_SCORE)); similarity_index(p));
free(name); free(name);
show_mode_change(p, 0); show_mode_change(p, 0);
} else show_mode_change(p, 1); } else show_mode_change(p, 1);