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

[PATCH] Fix the way diffcore-rename records unremoved source.

Browse Source 
Earier version of diffcore-rename used to keep unmodified
filepair in its output so that the last stage of the processing
that tells renames from copies can make all of rename/copy to
copies.  However this had a bad interaction with other diffcore
filters that wanted to run after diffcore-rename, in that such
unmodified filepair must be retained for proper distinction
between renames and copies to happen.

This patch fixes the problem by changing the way diffcore-rename
records the information needed to distinguish "all are copies"
case and "the last one is a rename" case.

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-05-27 15:55:55 -07:00 committed by Linus Torvalds
parent 367cec1c02
commit 15d061b435
4 changed files with 169 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
diff.c
View File

@ -518,6 +518,7 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
dp->one = one; dp->one = one;
dp->two = two; dp->two = two;
dp->score = 0; dp->score = 0;
dp->source_stays = 0;
diff_q(queue, dp); diff_q(queue, dp);
return dp; return dp;
} }
@ -675,8 +676,8 @@ void diff_debug_filepair(const struct diff_filepair *p, int i)
{ {
diff_debug_filespec(p->one, i, "one"); diff_debug_filespec(p->one, i, "one");
diff_debug_filespec(p->two, i, "two"); diff_debug_filespec(p->two, i, "two");
fprintf(stderr, "score %d, status %c\n", fprintf(stderr, "score %d, status %c source_stays %d\n",
p->score, p->status ? : '?'); p->score, p->status ? : '?', p->source_stays);
} }
void diff_debug_queue(const char *msg, struct diff_queue_struct *q) void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
@ -698,8 +699,6 @@ static void diff_resolve_rename_copy(void)
struct diff_filepair *p, *pp; struct diff_filepair *p, *pp;
struct diff_queue_struct *q = &diff_queued_diff; struct diff_queue_struct *q = &diff_queued_diff;
/* This should not depend on the ordering of things. */
diff_debug_queue("resolve-rename-copy", q); diff_debug_queue("resolve-rename-copy", q);
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
@ -707,23 +706,28 @@ static void diff_resolve_rename_copy(void)
p->status = 0; /* undecided */ p->status = 0; /* undecided */
if (DIFF_PAIR_UNMERGED(p)) if (DIFF_PAIR_UNMERGED(p))
p->status = 'U'; p->status = 'U';
else if (!DIFF_FILE_VALID((p)->one)) else if (!DIFF_FILE_VALID(p->one))
p->status = 'N'; p->status = 'N';
else if (!DIFF_FILE_VALID((p)->two)) { else if (!DIFF_FILE_VALID(p->two)) {
/* Deletion record should be omitted if there /* Deleted entry may have been picked up by
* are rename/copy entries using this one as * another rename-copy entry. So we scan the
* the source. Then we can say one of them * queue and if we find one that uses us as the
* is a rename and the rest are copies. * source we do not say delete for this entry.
*/ */
p->status = 'D';
for (j = 0; j < q->nr; j++) { for (j = 0; j < q->nr; j++) {
pp = q->queue[j]; pp = q->queue[j];
if (!strcmp(pp->one->path, p->one->path) && if (!strcmp(p->one->path, pp->one->path) &&
strcmp(pp->one->path, pp->two->path)) { pp->score) {
/* rename/copy are always valid
* so we do not say DIFF_FILE_VALID()
* on pp->one and pp->two.
*/
p->status = 'X'; p->status = 'X';
break; break;
} }
} }
if (!p->status)
p->status = 'D';
} }
else if (DIFF_PAIR_TYPE_CHANGED(p)) else if (DIFF_PAIR_TYPE_CHANGED(p))
p->status = 'T'; p->status = 'T';
@ -732,33 +736,24 @@ static void diff_resolve_rename_copy(void)
* whose both sides are valid and of the same type, i.e. * whose both sides are valid and of the same type, i.e.
* either in-place edit or rename/copy edit. * either in-place edit or rename/copy edit.
*/ */
else if (strcmp(p->one->path, p->two->path)) { else if (p->score) {
/* See if there is somebody else anywhere that if (p->source_stays) {
* will keep the path (either modified or p->status = 'C';
* unmodified). If so, we have to be a copy, continue;
* not a rename. In addition, if there is }
* some other rename or copy that comes later /* See if there is some other filepair that
* than us that uses the same source, we * copies from the same source as us. If so
* have to be a copy, not a rename. * we are a copy. Otherwise we are a rename.
*/ */
for (j = 0; j < q->nr; j++) { for (j = i + 1; j < q->nr; j++) {
pp = q->queue[j]; pp = q->queue[j];
if (strcmp(pp->one->path, p->one->path)) if (strcmp(pp->one->path, p->one->path))
continue; continue; /* not us */
if (!strcmp(pp->one->path, pp->two->path)) { if (!pp->score)
if (DIFF_FILE_VALID(pp->two)) { continue; /* not a rename/copy */
/* non-delete */ /* pp is a rename/copy from the same source */
p->status = 'C'; p->status = 'C';
break; break;
}
continue;
}
/* pp is a rename/copy ... */
if (i < j) {
/* ... and comes later than us */
p->status = 'C';
break;
}
} }
if (!p->status) if (!p->status)
p->status = 'R'; p->status = 'R';
@ -767,8 +762,11 @@ static void diff_resolve_rename_copy(void)
p->one->mode != p->two->mode) p->one->mode != p->two->mode)
p->status = 'M'; p->status = 'M';
else else
/* this is a "no-change" entry */ /* this is a "no-change" entry.
p->status = 'X'; * should not happen anymore.
* p->status = 'X';
*/
die("internal error in diffcore: unmodified entry remains");
} }
diff_debug_queue("resolve-rename-copy done", q); diff_debug_queue("resolve-rename-copy done", q);
} }

63
diffcore-rename.c
View File

@ -52,14 +52,15 @@ static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two,
return &(rename_dst[first]); return &(rename_dst[first]);
} }
/* Table of rename/copy src files */
static struct diff_rename_src { static struct diff_rename_src {
struct diff_filespec *one; struct diff_filespec *one;
unsigned src_used : 1; unsigned src_stays : 1;
} *rename_src; } *rename_src;
static int rename_src_nr, rename_src_alloc; static int rename_src_nr, rename_src_alloc;
static struct diff_rename_src *locate_rename_src(struct diff_filespec *one, static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
int insert_ok) int src_stays)
{ {
int first, last; int first, last;
@ -77,9 +78,7 @@ static struct diff_rename_src *locate_rename_src(struct diff_filespec *one,
} }
first = next+1; first = next+1;
} }
/* not found */
if (!insert_ok)
return NULL;
/* insert to make it at "first" */ /* insert to make it at "first" */
if (rename_src_alloc <= rename_src_nr) { if (rename_src_alloc <= rename_src_nr) {
rename_src_alloc = alloc_nr(rename_src_alloc); rename_src_alloc = alloc_nr(rename_src_alloc);
@ -91,7 +90,7 @@ static struct diff_rename_src *locate_rename_src(struct diff_filespec *one,
memmove(rename_src + first + 1, rename_src + first, memmove(rename_src + first + 1, rename_src + first,
(rename_src_nr - first - 1) * sizeof(*rename_src)); (rename_src_nr - first - 1) * sizeof(*rename_src));
rename_src[first].one = one; rename_src[first].one = one;
rename_src[first].src_used = 0; rename_src[first].src_stays = src_stays;
return &(rename_src[first]); return &(rename_src[first]);
} }
@ -199,15 +198,14 @@ static void record_rename_pair(struct diff_queue_struct *renq,
fill_filespec(two, dst->sha1, dst->mode); fill_filespec(two, dst->sha1, dst->mode);
dp = diff_queue(renq, one, two); dp = diff_queue(renq, one, two);
dp->score = score; dp->score = score ? : 1; /* make sure it is at least 1 */
dp->source_stays = rename_src[src_index].src_stays;
rename_src[src_index].src_used = 1;
rename_dst[dst_index].pair = dp; rename_dst[dst_index].pair = dp;
} }
/* /*
* We sort the rename similarity matrix with the score, in descending * We sort the rename similarity matrix with the score, in descending
* order (more similar first). * order (the most similar first).
*/ */
static int score_compare(const void *a_, const void *b_) static int score_compare(const void *a_, const void *b_)
{ {
@ -254,9 +252,9 @@ void diffcore_rename(int detect_rename, int minimum_score)
else else
locate_rename_dst(p->two, 1); locate_rename_dst(p->two, 1);
else if (!DIFF_FILE_VALID(p->two)) else if (!DIFF_FILE_VALID(p->two))
locate_rename_src(p->one, 1); register_rename_src(p->one, 0);
else if (1 < detect_rename) /* find copy, too */ else if (detect_rename == DIFF_DETECT_COPY)
locate_rename_src(p->one, 1); register_rename_src(p->one, 1);
} }
if (rename_dst_nr == 0) if (rename_dst_nr == 0)
goto cleanup; /* nothing to do */ goto cleanup; /* nothing to do */
@ -280,7 +278,7 @@ void diffcore_rename(int detect_rename, int minimum_score)
* doing the delta matrix altogether. * doing the delta matrix altogether.
*/ */
if (renq.nr == rename_dst_nr) if (renq.nr == rename_dst_nr)
goto flush_rest; goto cleanup;
num_create = (rename_dst_nr - renq.nr); num_create = (rename_dst_nr - renq.nr);
num_src = rename_src_nr; num_src = rename_src_nr;
@ -307,37 +305,30 @@ void diffcore_rename(int detect_rename, int minimum_score)
if (dst->pair) if (dst->pair)
continue; /* already done, either exact or fuzzy. */ continue; /* already done, either exact or fuzzy. */
if (mx[i].score < minimum_score) if (mx[i].score < minimum_score)
break; /* there is not any more diffs applicable. */ break; /* there is no more usable pair. */
record_rename_pair(&renq, mx[i].dst, mx[i].src, mx[i].score); record_rename_pair(&renq, mx[i].dst, mx[i].src, mx[i].score);
} }
free(mx); free(mx);
diff_debug_queue("done detecting fuzzy", &renq); diff_debug_queue("done detecting fuzzy", &renq);
flush_rest: cleanup:
/* At this point, we have found some renames and copies and they /* At this point, we have found some renames and copies and they
* are kept in renq. The original list is still in *q. * are kept in renq. The original list is still in *q.
*
* Scan the original list and move them into the outq; we will sort
* outq and swap it into the queue supplied to pass that to
* downstream, so we assign the sort keys in this loop.
*
* See comments at the top of record_rename_pair for numbers used
* to assign rename_rank.
*/ */
outq.queue = NULL; outq.queue = NULL;
outq.nr = outq.alloc = 0; outq.nr = outq.alloc = 0;
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];
struct diff_rename_src *src = locate_rename_src(p->one, 0);
struct diff_rename_dst *dst = locate_rename_dst(p->two, 0); struct diff_rename_dst *dst = locate_rename_dst(p->two, 0);
struct diff_filepair *pair_to_free = NULL; struct diff_filepair *pair_to_free = NULL;
if (dst) { if (dst) {
/* creation */ /* creation */
if (dst->pair) { if (dst->pair) {
/* renq has rename/copy already to produce /* renq has rename/copy to produce
* this file, so we do not emit the creation * this file already, so we do not
* record in the output. * emit the creation record in the
* output.
*/ */
diff_q(&outq, dst->pair); diff_q(&outq, dst->pair);
pair_to_free = p; pair_to_free = p;
@ -349,17 +340,12 @@ void diffcore_rename(int detect_rename, int minimum_score)
diff_q(&outq, p); diff_q(&outq, p);
} }
else if (!diff_unmodified_pair(p)) else if (!diff_unmodified_pair(p))
/* all the other cases need to be recorded as is */ /* all the usual ones need to be kept */
diff_q(&outq, p); diff_q(&outq, p);
else { else
/* unmodified pair needs to be recorded only if /* no need to keep unmodified pairs */
* it is used as the source of rename/copy pair_to_free = p;
*/
if (src && src->src_used)
diff_q(&outq, p);
else
pair_to_free = p;
}
if (pair_to_free) if (pair_to_free)
diff_free_filepair(pair_to_free); diff_free_filepair(pair_to_free);
} }
@ -370,7 +356,6 @@ void diffcore_rename(int detect_rename, int minimum_score)
*q = outq; *q = outq;
diff_debug_queue("done collapsing", q); diff_debug_queue("done collapsing", q);
cleanup:
free(rename_dst); free(rename_dst);
rename_dst = NULL; rename_dst = NULL;
rename_dst_nr = rename_dst_alloc = 0; rename_dst_nr = rename_dst_alloc = 0;

7
diffcore.h
View File

@ -39,8 +39,11 @@ extern void diff_free_filespec_data(struct diff_filespec *);
struct diff_filepair { struct diff_filepair {
struct diff_filespec *one; struct diff_filespec *one;
struct diff_filespec *two; struct diff_filespec *two;
int score; /* only valid when one and two are different paths */ unsigned short int score; /* only valid when one and two are
int status; /* M C R N D U (see Documentation/diff-format.txt) */ * different paths
*/
char source_stays; /* all of R/C are copies */
char status; /* M C R N D U (see Documentation/diff-format.txt) */
}; };
#define DIFF_PAIR_UNMERGED(p) \ #define DIFF_PAIR_UNMERGED(p) \
(!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two)) (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))

103
t/t4007-rename-3.sh Normal file
View File

@ -0,0 +1,103 @@
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
test_description='Rename interaction with pathspec.
'
. ./test-lib.sh
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
sanitize_diff_raw='s/ \('"$_x40"'\) \1 \([CR]\)[0-9]* / \1 \1 \2# /'
compare_diff_raw () {
# When heuristics are improved, the score numbers would change.
# Ignore them while comparing.
# Also we do not check SHA1 hash generation in this test, which
# is a job for t0000-basic.sh
sed -e "$sanitize_diff_raw" <"$1" >.tmp-1
sed -e "$sanitize_diff_raw" <"$2" >.tmp-2
diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}
test_expect_success \
'prepare reference tree' \
'mkdir path0 path1 &&
cp ../../COPYING path0/COPYING &&
git-update-cache --add path0/COPYING &&
tree=$(git-write-tree) &&
echo $tree'
test_expect_success \
'prepare work tree' \
'cp path0/COPYING path1/COPYING &&
git-update-cache --add --remove path0/COPYING path1/COPYING'
# In the tree, there is only path0/COPYING. In the cache, path0 and
# path1 both have COPYING and the latter is a copy of path0/COPYING.
# Comparing the full tree with cache should tell us so.
git-diff-cache -C $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING
EOF
test_expect_success \
'validate the result' \
'compare_diff_raw current expected'
# In the tree, there is only path0/COPYING. In the cache, path0 and
# path1 both have COPYING and the latter is a copy of path0/COPYING.
# When we omit output from path0 it should still be able to tell us
# that path1/COPYING is result from a copy from path0/COPYING, not
# rename, which would imply path0/COPYING is now gone.
git-diff-cache -C $tree path1 >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING
EOF
test_expect_success \
'validate the result' \
'compare_diff_raw current expected'
test_expect_success \
'tweak work tree' \
'rm -f path0/COPYING &&
git-update-cache --remove path0/COPYING'
# In the tree, there is only path0/COPYING. In the cache, path0 does
# not have COPYING anymore and path1 has COPYING which is a copy of
# path0/COPYING. Showing the full tree with cache should tell us about
# the rename.
git-diff-cache -C $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING
EOF
test_expect_success \
'validate the result' \
'compare_diff_raw current expected'
# In the tree, there is only path0/COPYING. In the cache, path0 does
# not have COPYING anymore and path1 has COPYING which is a copy of
# path0/COPYING. Even if we restrict the output to path1, it still
# should show us the rename.
git-diff-cache -C $tree path1 >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING
EOF
test_expect_success \
'validate the result' \
'compare_diff_raw current expected'
test_done