Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2005 Junio C Hamano |
| 3 | */ |
| 4 | #include "cache.h" |
| 5 | #include "diff.h" |
| 6 | #include "diffcore.h" |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 7 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 8 | /* Table of rename/copy destinations */ |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 9 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 10 | static struct diff_rename_dst { |
| 11 | struct diff_filespec *two; |
| 12 | struct diff_filepair *pair; |
| 13 | } *rename_dst; |
| 14 | static int rename_dst_nr, rename_dst_alloc; |
| 15 | |
| 16 | static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two, |
| 17 | int insert_ok) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 18 | { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 19 | int first, last; |
| 20 | |
| 21 | first = 0; |
| 22 | last = rename_dst_nr; |
| 23 | while (last > first) { |
| 24 | int next = (last + first) >> 1; |
| 25 | struct diff_rename_dst *dst = &(rename_dst[next]); |
| 26 | int cmp = strcmp(two->path, dst->two->path); |
| 27 | if (!cmp) |
| 28 | return dst; |
| 29 | if (cmp < 0) { |
| 30 | last = next; |
| 31 | continue; |
| 32 | } |
| 33 | first = next+1; |
| 34 | } |
| 35 | /* not found */ |
| 36 | if (!insert_ok) |
| 37 | return NULL; |
| 38 | /* insert to make it at "first" */ |
| 39 | if (rename_dst_alloc <= rename_dst_nr) { |
| 40 | rename_dst_alloc = alloc_nr(rename_dst_alloc); |
| 41 | rename_dst = xrealloc(rename_dst, |
| 42 | rename_dst_alloc * sizeof(*rename_dst)); |
| 43 | } |
| 44 | rename_dst_nr++; |
| 45 | if (first < rename_dst_nr) |
| 46 | memmove(rename_dst + first + 1, rename_dst + first, |
| 47 | (rename_dst_nr - first - 1) * sizeof(*rename_dst)); |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 48 | rename_dst[first].two = alloc_filespec(two->path); |
| 49 | fill_filespec(rename_dst[first].two, two->sha1, two->mode); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 50 | rename_dst[first].pair = NULL; |
| 51 | return &(rename_dst[first]); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 52 | } |
| 53 | |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 54 | /* Table of rename/copy src files */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 55 | static struct diff_rename_src { |
| 56 | struct diff_filespec *one; |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 57 | unsigned short score; /* to remember the break score */ |
Junio C Hamano | 6bac10d | 2005-09-10 12:42:32 -0700 | [diff] [blame] | 58 | unsigned src_path_left : 1; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 59 | } *rename_src; |
| 60 | static int rename_src_nr, rename_src_alloc; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 61 | |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 62 | static struct diff_rename_src *register_rename_src(struct diff_filespec *one, |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 63 | int src_path_left, |
| 64 | unsigned short score) |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 65 | { |
| 66 | int first, last; |
| 67 | |
| 68 | first = 0; |
| 69 | last = rename_src_nr; |
| 70 | while (last > first) { |
| 71 | int next = (last + first) >> 1; |
| 72 | struct diff_rename_src *src = &(rename_src[next]); |
| 73 | int cmp = strcmp(one->path, src->one->path); |
| 74 | if (!cmp) |
| 75 | return src; |
| 76 | if (cmp < 0) { |
| 77 | last = next; |
| 78 | continue; |
| 79 | } |
| 80 | first = next+1; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 81 | } |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 82 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 83 | /* insert to make it at "first" */ |
| 84 | if (rename_src_alloc <= rename_src_nr) { |
| 85 | rename_src_alloc = alloc_nr(rename_src_alloc); |
| 86 | rename_src = xrealloc(rename_src, |
| 87 | rename_src_alloc * sizeof(*rename_src)); |
| 88 | } |
| 89 | rename_src_nr++; |
| 90 | if (first < rename_src_nr) |
| 91 | memmove(rename_src + first + 1, rename_src + first, |
| 92 | (rename_src_nr - first - 1) * sizeof(*rename_src)); |
| 93 | rename_src[first].one = one; |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 94 | rename_src[first].score = score; |
Junio C Hamano | 6bac10d | 2005-09-10 12:42:32 -0700 | [diff] [blame] | 95 | rename_src[first].src_path_left = src_path_left; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 96 | return &(rename_src[first]); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 97 | } |
| 98 | |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 99 | static int is_exact_match(struct diff_filespec *src, |
| 100 | struct diff_filespec *dst, |
| 101 | int contents_too) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 102 | { |
| 103 | if (src->sha1_valid && dst->sha1_valid && |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 104 | !hashcmp(src->sha1, dst->sha1)) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 105 | return 1; |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 106 | if (!contents_too) |
| 107 | return 0; |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 108 | if (diff_populate_filespec(src, 1) || diff_populate_filespec(dst, 1)) |
| 109 | return 0; |
| 110 | if (src->size != dst->size) |
| 111 | return 0; |
Shawn O. Pearce | 7da41f4 | 2006-12-14 05:07:46 -0500 | [diff] [blame] | 112 | if (src->sha1_valid && dst->sha1_valid) |
| 113 | return !hashcmp(src->sha1, dst->sha1); |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 114 | if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0)) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 115 | return 0; |
| 116 | if (src->size == dst->size && |
| 117 | !memcmp(src->data, dst->data, src->size)) |
| 118 | return 1; |
| 119 | return 0; |
| 120 | } |
| 121 | |
Johannes Schindelin | 0ce3964 | 2007-06-21 12:52:11 +0100 | [diff] [blame] | 122 | static int basename_same(struct diff_filespec *src, struct diff_filespec *dst) |
| 123 | { |
| 124 | int src_len = strlen(src->path), dst_len = strlen(dst->path); |
| 125 | while (src_len && dst_len) { |
| 126 | char c1 = src->path[--src_len]; |
| 127 | char c2 = dst->path[--dst_len]; |
| 128 | if (c1 != c2) |
| 129 | return 0; |
| 130 | if (c1 == '/') |
| 131 | return 1; |
| 132 | } |
| 133 | return (!src_len || src->path[src_len - 1] == '/') && |
| 134 | (!dst_len || dst->path[dst_len - 1] == '/'); |
| 135 | } |
| 136 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 137 | struct diff_score { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 138 | int src; /* index in rename_src */ |
| 139 | int dst; /* index in rename_dst */ |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 140 | int score; |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 141 | int name_score; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 142 | }; |
| 143 | |
| 144 | static int estimate_similarity(struct diff_filespec *src, |
| 145 | struct diff_filespec *dst, |
| 146 | int minimum_score) |
| 147 | { |
| 148 | /* src points at a file that existed in the original tree (or |
| 149 | * optionally a file in the destination tree) and dst points |
| 150 | * at a newly created file. They may be quite similar, in which |
| 151 | * case we want to say src is renamed to dst or src is copied into |
| 152 | * dst, and then some edit has been applied to dst. |
| 153 | * |
| 154 | * Compare them and return how similar they are, representing |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 155 | * the score as an integer between 0 and MAX_SCORE. |
| 156 | * |
| 157 | * When there is an exact match, it is considered a better |
| 158 | * match than anything else; the destination does not even |
| 159 | * call into this function in that case. |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 160 | */ |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 161 | unsigned long max_size, delta_size, base_size, src_copied, literal_added; |
Junio C Hamano | 75c660a | 2005-06-28 16:58:27 -0700 | [diff] [blame] | 162 | unsigned long delta_limit; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 163 | int score; |
| 164 | |
Junio C Hamano | 60896c7 | 2005-05-22 21:24:49 -0700 | [diff] [blame] | 165 | /* We deal only with regular files. Symlink renames are handled |
| 166 | * only when they are exact matches --- in other words, no edits |
| 167 | * after renaming. |
| 168 | */ |
| 169 | if (!S_ISREG(src->mode) || !S_ISREG(dst->mode)) |
| 170 | return 0; |
| 171 | |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 172 | max_size = ((src->size > dst->size) ? src->size : dst->size); |
Junio C Hamano | 58b103f | 2005-05-21 15:55:18 -0700 | [diff] [blame] | 173 | base_size = ((src->size < dst->size) ? src->size : dst->size); |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 174 | delta_size = max_size - base_size; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 175 | |
Junio C Hamano | 58b103f | 2005-05-21 15:55:18 -0700 | [diff] [blame] | 176 | /* We would not consider edits that change the file size so |
| 177 | * drastically. delta_size must be smaller than |
Junio C Hamano | cd1870e | 2005-05-22 01:31:28 -0700 | [diff] [blame] | 178 | * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size). |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 179 | * |
Junio C Hamano | 58b103f | 2005-05-21 15:55:18 -0700 | [diff] [blame] | 180 | * Note that base_size == 0 case is handled here already |
| 181 | * and the final score computation below would not have a |
| 182 | * divide-by-zero issue. |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 183 | */ |
Junio C Hamano | cd1870e | 2005-05-22 01:31:28 -0700 | [diff] [blame] | 184 | if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 185 | return 0; |
| 186 | |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 187 | if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0)) |
| 188 | return 0; /* error but caught downstream */ |
| 189 | |
Junio C Hamano | 6541675 | 2006-02-28 16:01:36 -0800 | [diff] [blame] | 190 | |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 191 | delta_limit = (unsigned long) |
| 192 | (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); |
Junio C Hamano | d8c3d03 | 2007-06-28 22:54:37 -0700 | [diff] [blame] | 193 | if (diffcore_count_changes(src, dst, |
Junio C Hamano | c06c796 | 2006-03-12 03:22:10 -0800 | [diff] [blame] | 194 | &src->cnt_data, &dst->cnt_data, |
Junio C Hamano | 6541675 | 2006-02-28 16:01:36 -0800 | [diff] [blame] | 195 | delta_limit, |
| 196 | &src_copied, &literal_added)) |
Junio C Hamano | 75c660a | 2005-06-28 16:58:27 -0700 | [diff] [blame] | 197 | return 0; |
Junio C Hamano | 8597697 | 2005-05-24 12:09:32 -0700 | [diff] [blame] | 198 | |
Junio C Hamano | 1706306 | 2006-03-02 22:11:25 -0800 | [diff] [blame] | 199 | /* How similar are they? |
| 200 | * what percentage of material in dst are from source? |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 201 | */ |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 202 | if (!dst->size) |
Junio C Hamano | 1706306 | 2006-03-02 22:11:25 -0800 | [diff] [blame] | 203 | score = 0; /* should not happen */ |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 204 | else |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 205 | score = (int)(src_copied * MAX_SCORE / max_size); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 206 | return score; |
| 207 | } |
| 208 | |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 209 | static void record_rename_pair(int dst_index, int src_index, int score) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 210 | { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 211 | struct diff_filespec *one, *two, *src, *dst; |
| 212 | struct diff_filepair *dp; |
Junio C Hamano | f7c1512 | 2005-05-22 21:26:09 -0700 | [diff] [blame] | 213 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 214 | if (rename_dst[dst_index].pair) |
| 215 | die("internal error: dst already matched."); |
| 216 | |
| 217 | src = rename_src[src_index].one; |
| 218 | one = alloc_filespec(src->path); |
| 219 | fill_filespec(one, src->sha1, src->mode); |
| 220 | |
| 221 | dst = rename_dst[dst_index].two; |
| 222 | two = alloc_filespec(dst->path); |
| 223 | fill_filespec(two, dst->sha1, dst->mode); |
| 224 | |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 225 | dp = diff_queue(NULL, one, two); |
Junio C Hamano | ef67768 | 2006-08-03 12:01:01 -0700 | [diff] [blame] | 226 | dp->renamed_pair = 1; |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 227 | if (!strcmp(src->path, dst->path)) |
| 228 | dp->score = rename_src[src_index].score; |
| 229 | else |
| 230 | dp->score = score; |
Junio C Hamano | 6bac10d | 2005-09-10 12:42:32 -0700 | [diff] [blame] | 231 | dp->source_stays = rename_src[src_index].src_path_left; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 232 | rename_dst[dst_index].pair = dp; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 233 | } |
| 234 | |
| 235 | /* |
| 236 | * We sort the rename similarity matrix with the score, in descending |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 237 | * order (the most similar first). |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 238 | */ |
| 239 | static int score_compare(const void *a_, const void *b_) |
| 240 | { |
| 241 | const struct diff_score *a = a_, *b = b_; |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 242 | |
| 243 | if (a->score == b->score) |
| 244 | return b->name_score - a->name_score; |
| 245 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 246 | return b->score - a->score; |
| 247 | } |
| 248 | |
Junio C Hamano | 6bac10d | 2005-09-10 12:42:32 -0700 | [diff] [blame] | 249 | static int compute_stays(struct diff_queue_struct *q, |
| 250 | struct diff_filespec *one) |
| 251 | { |
| 252 | int i; |
| 253 | for (i = 0; i < q->nr; i++) { |
| 254 | struct diff_filepair *p = q->queue[i]; |
| 255 | if (strcmp(one->path, p->two->path)) |
| 256 | continue; |
| 257 | if (DIFF_PAIR_RENAME(p)) { |
| 258 | return 0; /* something else is renamed into this */ |
| 259 | } |
| 260 | } |
| 261 | return 1; |
| 262 | } |
| 263 | |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 264 | void diffcore_rename(struct diff_options *options) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 265 | { |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 266 | int detect_rename = options->detect_rename; |
| 267 | int minimum_score = options->rename_score; |
| 268 | int rename_limit = options->rename_limit; |
Junio C Hamano | 38c6f78 | 2005-05-21 19:40:36 -0700 | [diff] [blame] | 269 | struct diff_queue_struct *q = &diff_queued_diff; |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 270 | struct diff_queue_struct outq; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 271 | struct diff_score *mx; |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 272 | int i, j, rename_count, contents_too; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 273 | int num_create, num_src, dst_cnt; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 274 | |
Junio C Hamano | 26dee0a | 2005-05-21 23:33:32 -0700 | [diff] [blame] | 275 | if (!minimum_score) |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 276 | minimum_score = DEFAULT_RENAME_SCORE; |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 277 | rename_count = 0; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 278 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 279 | for (i = 0; i < q->nr; i++) { |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 280 | struct diff_filepair *p = q->queue[i]; |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 281 | if (!DIFF_FILE_VALID(p->one)) { |
Junio C Hamano | 81e50ea | 2005-05-21 19:42:18 -0700 | [diff] [blame] | 282 | if (!DIFF_FILE_VALID(p->two)) |
Junio C Hamano | 60896c7 | 2005-05-22 21:24:49 -0700 | [diff] [blame] | 283 | continue; /* unmerged */ |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 284 | else if (options->single_follow && |
| 285 | strcmp(options->single_follow, p->two->path)) |
| 286 | continue; /* not interested */ |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 287 | else |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 288 | locate_rename_dst(p->two, 1); |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 289 | } |
Junio C Hamano | 2210100 | 2005-06-11 20:55:20 -0700 | [diff] [blame] | 290 | else if (!DIFF_FILE_VALID(p->two)) { |
| 291 | /* If the source is a broken "delete", and |
| 292 | * they did not really want to get broken, |
| 293 | * that means the source actually stays. |
| 294 | */ |
| 295 | int stays = (p->broken_pair && !p->score); |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 296 | register_rename_src(p->one, stays, p->score); |
Junio C Hamano | 2210100 | 2005-06-11 20:55:20 -0700 | [diff] [blame] | 297 | } |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 298 | else if (detect_rename == DIFF_DETECT_COPY) |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 299 | register_rename_src(p->one, 1, p->score); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 300 | } |
Eric Wong | 7d6fb37 | 2005-12-24 04:12:43 -0800 | [diff] [blame] | 301 | if (rename_dst_nr == 0 || rename_src_nr == 0 || |
Junio C Hamano | 3299c6f | 2005-11-15 12:48:08 -0800 | [diff] [blame] | 302 | (0 < rename_limit && rename_limit < rename_dst_nr)) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 303 | goto cleanup; /* nothing to do */ |
| 304 | |
| 305 | /* We really want to cull the candidates list early |
| 306 | * with cheap tests in order to avoid doing deltas. |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 307 | * The first round matches up the up-to-date entries, |
| 308 | * and then during the second round we try to match |
| 309 | * cache-dirty entries as well. |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 310 | */ |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 311 | for (contents_too = 0; contents_too < 2; contents_too++) { |
| 312 | for (i = 0; i < rename_dst_nr; i++) { |
| 313 | struct diff_filespec *two = rename_dst[i].two; |
| 314 | if (rename_dst[i].pair) |
| 315 | continue; /* dealt with an earlier round */ |
| 316 | for (j = 0; j < rename_src_nr; j++) { |
Johannes Schindelin | 0ce3964 | 2007-06-21 12:52:11 +0100 | [diff] [blame] | 317 | int k; |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 318 | struct diff_filespec *one = rename_src[j].one; |
| 319 | if (!is_exact_match(one, two, contents_too)) |
| 320 | continue; |
Johannes Schindelin | 0ce3964 | 2007-06-21 12:52:11 +0100 | [diff] [blame] | 321 | |
| 322 | /* see if there is a basename match, too */ |
| 323 | for (k = j; k < rename_src_nr; k++) { |
| 324 | one = rename_src[k].one; |
| 325 | if (basename_same(one, two) && |
| 326 | is_exact_match(one, two, |
| 327 | contents_too)) { |
| 328 | j = k; |
| 329 | break; |
| 330 | } |
| 331 | } |
| 332 | |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 333 | record_rename_pair(i, j, (int)MAX_SCORE); |
Junio C Hamano | 17e6019 | 2006-07-06 00:35:47 -0700 | [diff] [blame] | 334 | rename_count++; |
| 335 | break; /* we are done with this entry */ |
| 336 | } |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 337 | } |
| 338 | } |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 339 | |
| 340 | /* Have we run out the created file pool? If so we can avoid |
| 341 | * doing the delta matrix altogether. |
| 342 | */ |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 343 | if (rename_count == rename_dst_nr) |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 344 | goto cleanup; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 345 | |
Junio C Hamano | 9f70b80 | 2005-11-21 12:18:23 -0800 | [diff] [blame] | 346 | if (minimum_score == MAX_SCORE) |
| 347 | goto cleanup; |
| 348 | |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 349 | num_create = (rename_dst_nr - rename_count); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 350 | num_src = rename_src_nr; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 351 | mx = xmalloc(sizeof(*mx) * num_create * num_src); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 352 | for (dst_cnt = i = 0; i < rename_dst_nr; i++) { |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 353 | int base = dst_cnt * num_src; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 354 | struct diff_filespec *two = rename_dst[i].two; |
| 355 | if (rename_dst[i].pair) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 356 | continue; /* dealt with exact match already. */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 357 | for (j = 0; j < rename_src_nr; j++) { |
| 358 | struct diff_filespec *one = rename_src[j].one; |
| 359 | struct diff_score *m = &mx[base+j]; |
| 360 | m->src = j; |
| 361 | m->dst = i; |
| 362 | m->score = estimate_similarity(one, two, |
| 363 | minimum_score); |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 364 | m->name_score = basename_same(one, two); |
Junio C Hamano | 50b2b53 | 2007-05-03 13:04:53 -0700 | [diff] [blame] | 365 | diff_free_filespec_data(one); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 366 | } |
Junio C Hamano | 2821104 | 2006-03-12 16:39:51 -0800 | [diff] [blame] | 367 | /* We do not need the text anymore */ |
| 368 | diff_free_filespec_data(two); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 369 | dst_cnt++; |
| 370 | } |
| 371 | /* cost matrix sorted by most to least similar pair */ |
| 372 | qsort(mx, num_create * num_src, sizeof(*mx), score_compare); |
| 373 | for (i = 0; i < num_create * num_src; i++) { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 374 | struct diff_rename_dst *dst = &rename_dst[mx[i].dst]; |
| 375 | if (dst->pair) |
| 376 | continue; /* already done, either exact or fuzzy. */ |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 377 | if (mx[i].score < minimum_score) |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 378 | break; /* there is no more usable pair. */ |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 379 | record_rename_pair(mx[i].dst, mx[i].src, mx[i].score); |
| 380 | rename_count++; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 381 | } |
| 382 | free(mx); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 383 | |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 384 | cleanup: |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 385 | /* At this point, we have found some renames and copies and they |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 386 | * are recorded in rename_dst. The original list is still in *q. |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 387 | */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 388 | outq.queue = NULL; |
| 389 | outq.nr = outq.alloc = 0; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 390 | for (i = 0; i < q->nr; i++) { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 391 | struct diff_filepair *p = q->queue[i]; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 392 | struct diff_filepair *pair_to_free = NULL; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 393 | |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 394 | if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { |
| 395 | /* |
| 396 | * Creation |
| 397 | * |
| 398 | * We would output this create record if it has |
| 399 | * not been turned into a rename/copy already. |
| 400 | */ |
| 401 | struct diff_rename_dst *dst = |
| 402 | locate_rename_dst(p->two, 0); |
| 403 | if (dst && dst->pair) { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 404 | diff_q(&outq, dst->pair); |
| 405 | pair_to_free = p; |
| 406 | } |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 407 | else |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 408 | /* no matching rename/copy source, so |
| 409 | * record this as a creation. |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 410 | */ |
| 411 | diff_q(&outq, p); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 412 | } |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 413 | else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) { |
| 414 | /* |
| 415 | * Deletion |
| 416 | * |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 417 | * We would output this delete record if: |
| 418 | * |
| 419 | * (1) this is a broken delete and the counterpart |
| 420 | * broken create remains in the output; or |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 421 | * (2) this is not a broken delete, and rename_dst |
| 422 | * does not have a rename/copy to move p->one->path |
| 423 | * out of existence. |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 424 | * |
| 425 | * Otherwise, the counterpart broken create |
| 426 | * has been turned into a rename-edit; or |
| 427 | * delete did not have a matching create to |
| 428 | * begin with. |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 429 | */ |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 430 | if (DIFF_PAIR_BROKEN(p)) { |
| 431 | /* broken delete */ |
| 432 | struct diff_rename_dst *dst = |
| 433 | locate_rename_dst(p->one, 0); |
| 434 | if (dst && dst->pair) |
| 435 | /* counterpart is now rename/copy */ |
| 436 | pair_to_free = p; |
| 437 | } |
| 438 | else { |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 439 | for (j = 0; j < rename_dst_nr; j++) { |
| 440 | if (!rename_dst[j].pair) |
| 441 | continue; |
| 442 | if (strcmp(rename_dst[j].pair-> |
| 443 | one->path, |
| 444 | p->one->path)) |
| 445 | continue; |
| 446 | break; |
| 447 | } |
| 448 | if (j < rename_dst_nr) |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 449 | /* this path remains */ |
| 450 | pair_to_free = p; |
| 451 | } |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 452 | |
| 453 | if (pair_to_free) |
| 454 | ; |
| 455 | else |
| 456 | diff_q(&outq, p); |
| 457 | } |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 458 | else if (!diff_unmodified_pair(p)) |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 459 | /* all the usual ones need to be kept */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 460 | diff_q(&outq, p); |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 461 | else |
| 462 | /* no need to keep unmodified pairs */ |
| 463 | pair_to_free = p; |
| 464 | |
Junio C Hamano | 226406f | 2005-05-27 15:50:30 -0700 | [diff] [blame] | 465 | if (pair_to_free) |
| 466 | diff_free_filepair(pair_to_free); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 467 | } |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 468 | diff_debug_queue("done copying original", &outq); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 469 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 470 | free(q->queue); |
| 471 | *q = outq; |
| 472 | diff_debug_queue("done collapsing", q); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 473 | |
Junio C Hamano | 6bac10d | 2005-09-10 12:42:32 -0700 | [diff] [blame] | 474 | /* We need to see which rename source really stays here; |
| 475 | * earlier we only checked if the path is left in the result, |
| 476 | * but even if a path remains in the result, if that is coming |
| 477 | * from copying something else on top of it, then the original |
| 478 | * source is lost and does not stay. |
| 479 | */ |
| 480 | for (i = 0; i < q->nr; i++) { |
| 481 | struct diff_filepair *p = q->queue[i]; |
| 482 | if (DIFF_PAIR_RENAME(p) && p->source_stays) { |
| 483 | /* If one appears as the target of a rename-copy, |
| 484 | * then mark p->source_stays = 0; otherwise |
| 485 | * leave it as is. |
| 486 | */ |
| 487 | p->source_stays = compute_stays(q, p->one); |
| 488 | } |
| 489 | } |
| 490 | |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 491 | for (i = 0; i < rename_dst_nr; i++) { |
| 492 | diff_free_filespec_data(rename_dst[i].two); |
| 493 | free(rename_dst[i].two); |
| 494 | } |
| 495 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 496 | free(rename_dst); |
| 497 | rename_dst = NULL; |
| 498 | rename_dst_nr = rename_dst_alloc = 0; |
| 499 | free(rename_src); |
| 500 | rename_src = NULL; |
| 501 | rename_src_nr = rename_src_alloc = 0; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 502 | return; |
| 503 | } |