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" |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 7 | #include "hashmap.h" |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 8 | #include "progress.h" |
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 | /* Table of rename/copy destinations */ |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 11 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 12 | static struct diff_rename_dst { |
| 13 | struct diff_filespec *two; |
| 14 | struct diff_filepair *pair; |
| 15 | } *rename_dst; |
| 16 | static int rename_dst_nr, rename_dst_alloc; |
| 17 | |
Jeff King | f98c2f7 | 2015-02-26 20:39:48 -0500 | [diff] [blame] | 18 | static int find_rename_dst(struct diff_filespec *two) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 19 | { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 20 | int first, last; |
| 21 | |
| 22 | first = 0; |
| 23 | last = rename_dst_nr; |
| 24 | while (last > first) { |
| 25 | int next = (last + first) >> 1; |
| 26 | struct diff_rename_dst *dst = &(rename_dst[next]); |
| 27 | int cmp = strcmp(two->path, dst->two->path); |
| 28 | if (!cmp) |
Jeff King | f98c2f7 | 2015-02-26 20:39:48 -0500 | [diff] [blame] | 29 | return next; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 30 | if (cmp < 0) { |
| 31 | last = next; |
| 32 | continue; |
| 33 | } |
| 34 | first = next+1; |
| 35 | } |
Jeff King | f98c2f7 | 2015-02-26 20:39:48 -0500 | [diff] [blame] | 36 | return -first - 1; |
| 37 | } |
| 38 | |
| 39 | static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two) |
| 40 | { |
| 41 | int ofs = find_rename_dst(two); |
| 42 | return ofs < 0 ? NULL : &rename_dst[ofs]; |
| 43 | } |
| 44 | |
| 45 | /* |
| 46 | * Returns 0 on success, -1 if we found a duplicate. |
| 47 | */ |
| 48 | static int add_rename_dst(struct diff_filespec *two) |
| 49 | { |
| 50 | int first = find_rename_dst(two); |
| 51 | |
| 52 | if (first >= 0) |
| 53 | return -1; |
| 54 | first = -first - 1; |
| 55 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 56 | /* insert to make it at "first" */ |
Dmitry S. Dolzhenko | 337ce24 | 2014-03-04 02:31:54 +0400 | [diff] [blame] | 57 | ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 58 | rename_dst_nr++; |
| 59 | if (first < rename_dst_nr) |
| 60 | memmove(rename_dst + first + 1, rename_dst + first, |
| 61 | (rename_dst_nr - first - 1) * sizeof(*rename_dst)); |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 62 | rename_dst[first].two = alloc_filespec(two->path); |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 63 | fill_filespec(rename_dst[first].two, two->oid.hash, two->oid_valid, |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 64 | two->mode); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 65 | rename_dst[first].pair = NULL; |
Jeff King | f98c2f7 | 2015-02-26 20:39:48 -0500 | [diff] [blame] | 66 | return 0; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 67 | } |
| 68 | |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 69 | /* Table of rename/copy src files */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 70 | static struct diff_rename_src { |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 71 | struct diff_filepair *p; |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 72 | unsigned short score; /* to remember the break score */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 73 | } *rename_src; |
| 74 | static int rename_src_nr, rename_src_alloc; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 75 | |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 76 | static struct diff_rename_src *register_rename_src(struct diff_filepair *p) |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 77 | { |
| 78 | int first, last; |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 79 | struct diff_filespec *one = p->one; |
| 80 | unsigned short score = p->score; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 81 | |
| 82 | first = 0; |
| 83 | last = rename_src_nr; |
| 84 | while (last > first) { |
| 85 | int next = (last + first) >> 1; |
| 86 | struct diff_rename_src *src = &(rename_src[next]); |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 87 | int cmp = strcmp(one->path, src->p->one->path); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 88 | if (!cmp) |
| 89 | return src; |
| 90 | if (cmp < 0) { |
| 91 | last = next; |
| 92 | continue; |
| 93 | } |
| 94 | first = next+1; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 95 | } |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 96 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 97 | /* insert to make it at "first" */ |
Dmitry S. Dolzhenko | 337ce24 | 2014-03-04 02:31:54 +0400 | [diff] [blame] | 98 | ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 99 | rename_src_nr++; |
| 100 | if (first < rename_src_nr) |
| 101 | memmove(rename_src + first + 1, rename_src + first, |
| 102 | (rename_src_nr - first - 1) * sizeof(*rename_src)); |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 103 | rename_src[first].p = p; |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 104 | rename_src[first].score = score; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 105 | return &(rename_src[first]); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 106 | } |
| 107 | |
Johannes Schindelin | 0ce3964 | 2007-06-21 12:52:11 +0100 | [diff] [blame] | 108 | static int basename_same(struct diff_filespec *src, struct diff_filespec *dst) |
| 109 | { |
| 110 | int src_len = strlen(src->path), dst_len = strlen(dst->path); |
| 111 | while (src_len && dst_len) { |
| 112 | char c1 = src->path[--src_len]; |
| 113 | char c2 = dst->path[--dst_len]; |
| 114 | if (c1 != c2) |
| 115 | return 0; |
| 116 | if (c1 == '/') |
| 117 | return 1; |
| 118 | } |
| 119 | return (!src_len || src->path[src_len - 1] == '/') && |
| 120 | (!dst_len || dst->path[dst_len - 1] == '/'); |
| 121 | } |
| 122 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 123 | struct diff_score { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 124 | int src; /* index in rename_src */ |
| 125 | int dst; /* index in rename_dst */ |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 126 | unsigned short score; |
| 127 | short name_score; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 128 | }; |
| 129 | |
| 130 | static int estimate_similarity(struct diff_filespec *src, |
| 131 | struct diff_filespec *dst, |
| 132 | int minimum_score) |
| 133 | { |
| 134 | /* src points at a file that existed in the original tree (or |
| 135 | * optionally a file in the destination tree) and dst points |
| 136 | * at a newly created file. They may be quite similar, in which |
| 137 | * case we want to say src is renamed to dst or src is copied into |
| 138 | * dst, and then some edit has been applied to dst. |
| 139 | * |
| 140 | * Compare them and return how similar they are, representing |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 141 | * the score as an integer between 0 and MAX_SCORE. |
| 142 | * |
| 143 | * When there is an exact match, it is considered a better |
| 144 | * match than anything else; the destination does not even |
| 145 | * call into this function in that case. |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 146 | */ |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 147 | 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] | 148 | unsigned long delta_limit; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 149 | int score; |
| 150 | |
Junio C Hamano | 60896c7 | 2005-05-22 21:24:49 -0700 | [diff] [blame] | 151 | /* We deal only with regular files. Symlink renames are handled |
| 152 | * only when they are exact matches --- in other words, no edits |
| 153 | * after renaming. |
| 154 | */ |
| 155 | if (!S_ISREG(src->mode) || !S_ISREG(dst->mode)) |
| 156 | return 0; |
| 157 | |
Linus Torvalds | 81ac051 | 2007-10-26 16:51:28 -0700 | [diff] [blame] | 158 | /* |
| 159 | * Need to check that source and destination sizes are |
| 160 | * filled in before comparing them. |
| 161 | * |
| 162 | * If we already have "cnt_data" filled in, we know it's |
| 163 | * all good (avoid checking the size for zero, as that |
| 164 | * is a possible size - we really should have a flag to |
| 165 | * say whether the size is valid or not!) |
| 166 | */ |
Nguyễn Thái Ngọc Duy | 8e5dd3d | 2014-08-16 10:08:04 +0700 | [diff] [blame] | 167 | if (!src->cnt_data && |
| 168 | diff_populate_filespec(src, CHECK_SIZE_ONLY)) |
Linus Torvalds | 81ac051 | 2007-10-26 16:51:28 -0700 | [diff] [blame] | 169 | return 0; |
Nguyễn Thái Ngọc Duy | 8e5dd3d | 2014-08-16 10:08:04 +0700 | [diff] [blame] | 170 | if (!dst->cnt_data && |
| 171 | diff_populate_filespec(dst, CHECK_SIZE_ONLY)) |
Linus Torvalds | 81ac051 | 2007-10-26 16:51:28 -0700 | [diff] [blame] | 172 | return 0; |
| 173 | |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 174 | max_size = ((src->size > dst->size) ? src->size : dst->size); |
Junio C Hamano | 58b103f | 2005-05-21 15:55:18 -0700 | [diff] [blame] | 175 | base_size = ((src->size < dst->size) ? src->size : dst->size); |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 176 | delta_size = max_size - base_size; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 177 | |
Junio C Hamano | 58b103f | 2005-05-21 15:55:18 -0700 | [diff] [blame] | 178 | /* We would not consider edits that change the file size so |
| 179 | * drastically. delta_size must be smaller than |
Junio C Hamano | cd1870e | 2005-05-22 01:31:28 -0700 | [diff] [blame] | 180 | * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size). |
Junio C Hamano | f0c6b2a | 2005-05-27 15:56:38 -0700 | [diff] [blame] | 181 | * |
Junio C Hamano | 58b103f | 2005-05-21 15:55:18 -0700 | [diff] [blame] | 182 | * Note that base_size == 0 case is handled here already |
| 183 | * and the final score computation below would not have a |
| 184 | * divide-by-zero issue. |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 185 | */ |
Linus Torvalds | 3a4d676 | 2011-02-18 20:12:06 -0800 | [diff] [blame] | 186 | if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 187 | return 0; |
| 188 | |
Björn Steinbrink | 885c716 | 2009-01-20 16:59:57 +0100 | [diff] [blame] | 189 | if (!src->cnt_data && diff_populate_filespec(src, 0)) |
| 190 | return 0; |
| 191 | if (!dst->cnt_data && diff_populate_filespec(dst, 0)) |
| 192 | return 0; |
| 193 | |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 194 | delta_limit = (unsigned long) |
| 195 | (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); |
Junio C Hamano | d8c3d03 | 2007-06-28 22:54:37 -0700 | [diff] [blame] | 196 | if (diffcore_count_changes(src, dst, |
Junio C Hamano | c06c796 | 2006-03-12 03:22:10 -0800 | [diff] [blame] | 197 | &src->cnt_data, &dst->cnt_data, |
Junio C Hamano | 6541675 | 2006-02-28 16:01:36 -0800 | [diff] [blame] | 198 | delta_limit, |
| 199 | &src_copied, &literal_added)) |
Junio C Hamano | 75c660a | 2005-06-28 16:58:27 -0700 | [diff] [blame] | 200 | return 0; |
Junio C Hamano | 8597697 | 2005-05-24 12:09:32 -0700 | [diff] [blame] | 201 | |
Junio C Hamano | 1706306 | 2006-03-02 22:11:25 -0800 | [diff] [blame] | 202 | /* How similar are they? |
| 203 | * what percentage of material in dst are from source? |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 204 | */ |
Linus Torvalds | 90bd932 | 2006-03-12 22:26:34 -0800 | [diff] [blame] | 205 | if (!dst->size) |
Junio C Hamano | 1706306 | 2006-03-02 22:11:25 -0800 | [diff] [blame] | 206 | score = 0; /* should not happen */ |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 207 | else |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 208 | score = (int)(src_copied * MAX_SCORE / max_size); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 209 | return score; |
| 210 | } |
| 211 | |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 212 | 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] | 213 | { |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 214 | struct diff_filespec *src, *dst; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 215 | struct diff_filepair *dp; |
Junio C Hamano | f7c1512 | 2005-05-22 21:26:09 -0700 | [diff] [blame] | 216 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 217 | if (rename_dst[dst_index].pair) |
| 218 | die("internal error: dst already matched."); |
| 219 | |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 220 | src = rename_src[src_index].p->one; |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 221 | src->rename_used++; |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 222 | src->count++; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 223 | |
| 224 | dst = rename_dst[dst_index].two; |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 225 | dst->count++; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 226 | |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 227 | dp = diff_queue(NULL, src, dst); |
Junio C Hamano | ef67768 | 2006-08-03 12:01:01 -0700 | [diff] [blame] | 228 | dp->renamed_pair = 1; |
Junio C Hamano | fc58071 | 2006-04-08 20:17:46 -0700 | [diff] [blame] | 229 | if (!strcmp(src->path, dst->path)) |
| 230 | dp->score = rename_src[src_index].score; |
| 231 | else |
| 232 | dp->score = score; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 233 | rename_dst[dst_index].pair = dp; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 234 | } |
| 235 | |
| 236 | /* |
| 237 | * We sort the rename similarity matrix with the score, in descending |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 238 | * order (the most similar first). |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 239 | */ |
| 240 | static int score_compare(const void *a_, const void *b_) |
| 241 | { |
| 242 | const struct diff_score *a = a_, *b = b_; |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 243 | |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 244 | /* sink the unused ones to the bottom */ |
| 245 | if (a->dst < 0) |
| 246 | return (0 <= b->dst); |
| 247 | else if (b->dst < 0) |
| 248 | return -1; |
| 249 | |
René Scharfe | cfc0aef | 2007-06-25 00:23:28 +0200 | [diff] [blame] | 250 | if (a->score == b->score) |
| 251 | return b->name_score - a->name_score; |
| 252 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 253 | return b->score - a->score; |
| 254 | } |
| 255 | |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 256 | struct file_similarity { |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 257 | struct hashmap_entry entry; |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 258 | int index; |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 259 | struct diff_filespec *filespec; |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 260 | }; |
| 261 | |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 262 | static unsigned int hash_filespec(struct diff_filespec *filespec) |
| 263 | { |
brian m. carlson | 41c9560 | 2016-06-24 23:09:24 +0000 | [diff] [blame] | 264 | if (!filespec->oid_valid) { |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 265 | if (diff_populate_filespec(filespec, 0)) |
| 266 | return 0; |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 267 | hash_sha1_file(filespec->data, filespec->size, "blob", |
| 268 | filespec->oid.hash); |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 269 | } |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 270 | return sha1hash(filespec->oid.hash); |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 271 | } |
| 272 | |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 273 | static int find_identical_files(struct hashmap *srcs, |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 274 | int dst_index, |
Linus Torvalds | 11f944d | 2011-02-18 19:55:19 -0800 | [diff] [blame] | 275 | struct diff_options *options) |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 276 | { |
| 277 | int renames = 0; |
| 278 | |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 279 | struct diff_filespec *target = rename_dst[dst_index].two; |
Karsten Blees | ab73a9d | 2014-07-03 00:22:11 +0200 | [diff] [blame] | 280 | struct file_similarity *p, *best = NULL; |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 281 | int i = 100, best_score = -1; |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 282 | |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 283 | /* |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 284 | * Find the best source match for specified destination. |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 285 | */ |
Karsten Blees | ab73a9d | 2014-07-03 00:22:11 +0200 | [diff] [blame] | 286 | p = hashmap_get_from_hash(srcs, hash_filespec(target), NULL); |
| 287 | for (; p; p = hashmap_get_next(srcs, p)) { |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 288 | int score; |
| 289 | struct diff_filespec *source = p->filespec; |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 290 | |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 291 | /* False hash collision? */ |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 292 | if (oidcmp(&source->oid, &target->oid)) |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 293 | continue; |
| 294 | /* Non-regular files? If so, the modes must match! */ |
| 295 | if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) { |
| 296 | if (source->mode != target->mode) |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 297 | continue; |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 298 | } |
| 299 | /* Give higher scores to sources that haven't been used already */ |
| 300 | score = !source->rename_used; |
| 301 | if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY) |
| 302 | continue; |
| 303 | score += basename_same(source, target); |
| 304 | if (score > best_score) { |
| 305 | best = p; |
| 306 | best_score = score; |
| 307 | if (score == 2) |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 308 | break; |
| 309 | } |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 310 | |
| 311 | /* Too many identical alternatives? Pick one */ |
| 312 | if (!--i) |
| 313 | break; |
| 314 | } |
| 315 | if (best) { |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 316 | record_rename_pair(dst_index, best->index, MAX_SCORE); |
Karsten Blees | 48f6407 | 2013-11-14 20:19:04 +0100 | [diff] [blame] | 317 | renames++; |
| 318 | } |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 319 | return renames; |
| 320 | } |
| 321 | |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 322 | static void insert_file_table(struct hashmap *table, int index, struct diff_filespec *filespec) |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 323 | { |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 324 | struct file_similarity *entry = xmalloc(sizeof(*entry)); |
| 325 | |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 326 | entry->index = index; |
| 327 | entry->filespec = filespec; |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 328 | |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 329 | hashmap_entry_init(entry, hash_filespec(filespec)); |
| 330 | hashmap_add(table, entry); |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 331 | } |
| 332 | |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 333 | /* |
| 334 | * Find exact renames first. |
| 335 | * |
| 336 | * The first round matches up the up-to-date entries, |
| 337 | * and then during the second round we try to match |
| 338 | * cache-dirty entries as well. |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 339 | */ |
Linus Torvalds | 11f944d | 2011-02-18 19:55:19 -0800 | [diff] [blame] | 340 | static int find_exact_renames(struct diff_options *options) |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 341 | { |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 342 | int i, renames = 0; |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 343 | struct hashmap file_table; |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 344 | |
SZEDER Gábor | ca4e3ca | 2016-03-30 10:35:07 +0200 | [diff] [blame] | 345 | /* Add all sources to the hash table in reverse order, because |
| 346 | * later on they will be retrieved in LIFO order. |
| 347 | */ |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 348 | hashmap_init(&file_table, NULL, rename_src_nr); |
SZEDER Gábor | ca4e3ca | 2016-03-30 10:35:07 +0200 | [diff] [blame] | 349 | for (i = rename_src_nr-1; i >= 0; i--) |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 350 | insert_file_table(&file_table, i, rename_src[i].p->one); |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 351 | |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 352 | /* Walk the destinations and find best source match */ |
Linus Torvalds | 9027f53 | 2007-10-25 11:23:26 -0700 | [diff] [blame] | 353 | for (i = 0; i < rename_dst_nr; i++) |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 354 | renames += find_identical_files(&file_table, i, options); |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 355 | |
Karsten Blees | f79d9c5 | 2013-11-14 20:20:26 +0100 | [diff] [blame] | 356 | /* Free the hash data structure and entries */ |
| 357 | hashmap_free(&file_table, 1); |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 358 | |
Karsten Blees | 7c85f8a | 2013-11-14 20:19:34 +0100 | [diff] [blame] | 359 | return renames; |
Linus Torvalds | cb1491b | 2007-10-25 11:17:55 -0700 | [diff] [blame] | 360 | } |
| 361 | |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 362 | #define NUM_CANDIDATE_PER_DST 4 |
| 363 | static void record_if_better(struct diff_score m[], struct diff_score *o) |
| 364 | { |
| 365 | int i, worst; |
| 366 | |
| 367 | /* find the worst one */ |
| 368 | worst = 0; |
| 369 | for (i = 1; i < NUM_CANDIDATE_PER_DST; i++) |
| 370 | if (score_compare(&m[i], &m[worst]) > 0) |
| 371 | worst = i; |
| 372 | |
| 373 | /* is it better than the worst one? */ |
| 374 | if (score_compare(&m[worst], o) > 0) |
| 375 | m[worst] = *o; |
| 376 | } |
| 377 | |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 378 | /* |
| 379 | * Returns: |
| 380 | * 0 if we are under the limit; |
| 381 | * 1 if we need to disable inexact rename detection; |
| 382 | * 2 if we would be under the limit if we were given -C instead of -C -C. |
| 383 | */ |
Junio C Hamano | 9d8a5a5 | 2011-01-06 13:50:04 -0800 | [diff] [blame] | 384 | static int too_many_rename_candidates(int num_create, |
| 385 | struct diff_options *options) |
| 386 | { |
| 387 | int rename_limit = options->rename_limit; |
| 388 | int num_src = rename_src_nr; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 389 | int i; |
Junio C Hamano | 9d8a5a5 | 2011-01-06 13:50:04 -0800 | [diff] [blame] | 390 | |
| 391 | options->needed_rename_limit = 0; |
| 392 | |
| 393 | /* |
| 394 | * This basically does a test for the rename matrix not |
| 395 | * growing larger than a "rename_limit" square matrix, ie: |
| 396 | * |
| 397 | * num_create * num_src > rename_limit * rename_limit |
| 398 | * |
| 399 | * but handles the potential overflow case specially (and we |
| 400 | * assume at least 32-bit integers) |
| 401 | */ |
| 402 | if (rename_limit <= 0 || rename_limit > 32767) |
| 403 | rename_limit = 32767; |
| 404 | if ((num_create <= rename_limit || num_src <= rename_limit) && |
| 405 | (num_create * num_src <= rename_limit * rename_limit)) |
| 406 | return 0; |
| 407 | |
| 408 | options->needed_rename_limit = |
| 409 | num_src > num_create ? num_src : num_create; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 410 | |
| 411 | /* Are we running under -C -C? */ |
| 412 | if (!DIFF_OPT_TST(options, FIND_COPIES_HARDER)) |
| 413 | return 1; |
| 414 | |
| 415 | /* Would we bust the limit if we were running under -C? */ |
| 416 | for (num_src = i = 0; i < rename_src_nr; i++) { |
| 417 | if (diff_unmodified_pair(rename_src[i].p)) |
| 418 | continue; |
| 419 | num_src++; |
| 420 | } |
| 421 | if ((num_create <= rename_limit || num_src <= rename_limit) && |
| 422 | (num_create * num_src <= rename_limit * rename_limit)) |
| 423 | return 2; |
Junio C Hamano | 9d8a5a5 | 2011-01-06 13:50:04 -0800 | [diff] [blame] | 424 | return 1; |
| 425 | } |
| 426 | |
Linus Torvalds | 0940e5f | 2011-02-18 20:10:32 -0800 | [diff] [blame] | 427 | static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies) |
| 428 | { |
| 429 | int count = 0, i; |
| 430 | |
| 431 | for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) { |
| 432 | struct diff_rename_dst *dst; |
| 433 | |
| 434 | if ((mx[i].dst < 0) || |
| 435 | (mx[i].score < minimum_score)) |
| 436 | break; /* there is no more usable pair. */ |
| 437 | dst = &rename_dst[mx[i].dst]; |
| 438 | if (dst->pair) |
| 439 | continue; /* already done, either exact or fuzzy. */ |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 440 | if (!copies && rename_src[mx[i].src].p->one->rename_used) |
Linus Torvalds | 0940e5f | 2011-02-18 20:10:32 -0800 | [diff] [blame] | 441 | continue; |
| 442 | record_rename_pair(mx[i].dst, mx[i].src, mx[i].score); |
| 443 | count++; |
| 444 | } |
| 445 | return count; |
| 446 | } |
| 447 | |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 448 | void diffcore_rename(struct diff_options *options) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 449 | { |
Junio C Hamano | 8082d8d | 2005-09-21 00:18:27 -0700 | [diff] [blame] | 450 | int detect_rename = options->detect_rename; |
| 451 | int minimum_score = options->rename_score; |
Junio C Hamano | 38c6f78 | 2005-05-21 19:40:36 -0700 | [diff] [blame] | 452 | struct diff_queue_struct *q = &diff_queued_diff; |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 453 | struct diff_queue_struct outq; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 454 | struct diff_score *mx; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 455 | int i, j, rename_count, skip_unmodified = 0; |
Jim Meyering | dabdbee | 2011-04-29 11:42:41 +0200 | [diff] [blame] | 456 | int num_create, dst_cnt; |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 457 | struct progress *progress = NULL; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 458 | |
Junio C Hamano | 26dee0a | 2005-05-21 23:33:32 -0700 | [diff] [blame] | 459 | if (!minimum_score) |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 460 | minimum_score = DEFAULT_RENAME_SCORE; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 461 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 462 | for (i = 0; i < q->nr; i++) { |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 463 | struct diff_filepair *p = q->queue[i]; |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 464 | if (!DIFF_FILE_VALID(p->one)) { |
Junio C Hamano | 81e50ea | 2005-05-21 19:42:18 -0700 | [diff] [blame] | 465 | if (!DIFF_FILE_VALID(p->two)) |
Junio C Hamano | 60896c7 | 2005-05-22 21:24:49 -0700 | [diff] [blame] | 466 | continue; /* unmerged */ |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 467 | else if (options->single_follow && |
| 468 | strcmp(options->single_follow, p->two->path)) |
| 469 | continue; /* not interested */ |
Jeff King | 90d43b0 | 2012-03-22 18:52:13 -0400 | [diff] [blame] | 470 | else if (!DIFF_OPT_TST(options, RENAME_EMPTY) && |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 471 | is_empty_blob_sha1(p->two->oid.hash)) |
Jeff King | 90d43b0 | 2012-03-22 18:52:13 -0400 | [diff] [blame] | 472 | continue; |
Jeff King | 4d6be03 | 2015-02-26 20:42:27 -0500 | [diff] [blame] | 473 | else if (add_rename_dst(p->two) < 0) { |
| 474 | warning("skipping rename detection, detected" |
| 475 | " duplicate destination '%s'", |
| 476 | p->two->path); |
| 477 | goto cleanup; |
| 478 | } |
Junio C Hamano | 2f3f8b2 | 2006-11-02 00:02:11 -0800 | [diff] [blame] | 479 | } |
Jeff King | 90d43b0 | 2012-03-22 18:52:13 -0400 | [diff] [blame] | 480 | else if (!DIFF_OPT_TST(options, RENAME_EMPTY) && |
brian m. carlson | a0d12c4 | 2016-06-24 23:09:23 +0000 | [diff] [blame] | 481 | is_empty_blob_sha1(p->one->oid.hash)) |
Jeff King | 90d43b0 | 2012-03-22 18:52:13 -0400 | [diff] [blame] | 482 | continue; |
Martin von Zweigbergk | d7c9bf2 | 2011-03-23 22:41:01 -0400 | [diff] [blame] | 483 | else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) { |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 484 | /* |
| 485 | * If the source is a broken "delete", and |
Junio C Hamano | 2210100 | 2005-06-11 20:55:20 -0700 | [diff] [blame] | 486 | * they did not really want to get broken, |
| 487 | * that means the source actually stays. |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 488 | * So we increment the "rename_used" score |
| 489 | * by one, to indicate ourselves as a user |
Junio C Hamano | 2210100 | 2005-06-11 20:55:20 -0700 | [diff] [blame] | 490 | */ |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 491 | if (p->broken_pair && !p->score) |
| 492 | p->one->rename_used++; |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 493 | register_rename_src(p); |
Junio C Hamano | 2210100 | 2005-06-11 20:55:20 -0700 | [diff] [blame] | 494 | } |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 495 | else if (detect_rename == DIFF_DETECT_COPY) { |
| 496 | /* |
| 497 | * Increment the "rename_used" score by |
| 498 | * one, to indicate ourselves as a user. |
| 499 | */ |
| 500 | p->one->rename_used++; |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 501 | register_rename_src(p); |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 502 | } |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 503 | } |
Linus Torvalds | 0024a54 | 2007-09-14 10:39:48 -0700 | [diff] [blame] | 504 | if (rename_dst_nr == 0 || rename_src_nr == 0) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 505 | goto cleanup; /* nothing to do */ |
| 506 | |
Linus Torvalds | 0024a54 | 2007-09-14 10:39:48 -0700 | [diff] [blame] | 507 | /* |
Linus Torvalds | 17559a6 | 2007-10-25 11:24:47 -0700 | [diff] [blame] | 508 | * We really want to cull the candidates list early |
| 509 | * with cheap tests in order to avoid doing deltas. |
| 510 | */ |
Linus Torvalds | 11f944d | 2011-02-18 19:55:19 -0800 | [diff] [blame] | 511 | rename_count = find_exact_renames(options); |
Linus Torvalds | 17559a6 | 2007-10-25 11:24:47 -0700 | [diff] [blame] | 512 | |
Linus Torvalds | 42899ac | 2007-10-26 16:56:34 -0700 | [diff] [blame] | 513 | /* Did we only want exact renames? */ |
| 514 | if (minimum_score == MAX_SCORE) |
| 515 | goto cleanup; |
| 516 | |
| 517 | /* |
| 518 | * Calculate how many renames are left (but all the source |
| 519 | * files still remain as options for rename/copies!) |
| 520 | */ |
| 521 | num_create = (rename_dst_nr - rename_count); |
Linus Torvalds | 42899ac | 2007-10-26 16:56:34 -0700 | [diff] [blame] | 522 | |
| 523 | /* All done? */ |
| 524 | if (!num_create) |
| 525 | goto cleanup; |
| 526 | |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 527 | switch (too_many_rename_candidates(num_create, options)) { |
| 528 | case 1: |
Linus Torvalds | 0024a54 | 2007-09-14 10:39:48 -0700 | [diff] [blame] | 529 | goto cleanup; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 530 | case 2: |
| 531 | options->degraded_cc_to_c = 1; |
| 532 | skip_unmodified = 1; |
| 533 | break; |
| 534 | default: |
| 535 | break; |
| 536 | } |
Linus Torvalds | 0024a54 | 2007-09-14 10:39:48 -0700 | [diff] [blame] | 537 | |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 538 | if (options->show_rename_progress) { |
| 539 | progress = start_progress_delay( |
Nguyễn Thái Ngọc Duy | 754dbc4 | 2014-02-21 19:50:18 +0700 | [diff] [blame] | 540 | _("Performing inexact rename detection"), |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 541 | rename_dst_nr * rename_src_nr, 50, 1); |
| 542 | } |
| 543 | |
René Scharfe | 50492f7 | 2016-07-30 20:18:31 +0200 | [diff] [blame] | 544 | mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx)); |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 545 | for (dst_cnt = i = 0; i < rename_dst_nr; i++) { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 546 | struct diff_filespec *two = rename_dst[i].two; |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 547 | struct diff_score *m; |
| 548 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 549 | if (rename_dst[i].pair) |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 550 | continue; /* dealt with exact match already. */ |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 551 | |
| 552 | m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST]; |
| 553 | for (j = 0; j < NUM_CANDIDATE_PER_DST; j++) |
| 554 | m[j].dst = -1; |
| 555 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 556 | for (j = 0; j < rename_src_nr; j++) { |
Junio C Hamano | e88d6bc | 2011-01-06 13:50:05 -0800 | [diff] [blame] | 557 | struct diff_filespec *one = rename_src[j].p->one; |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 558 | struct diff_score this_src; |
Junio C Hamano | f31027c | 2011-01-06 13:50:06 -0800 | [diff] [blame] | 559 | |
| 560 | if (skip_unmodified && |
| 561 | diff_unmodified_pair(rename_src[j].p)) |
| 562 | continue; |
| 563 | |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 564 | this_src.score = estimate_similarity(one, two, |
| 565 | minimum_score); |
| 566 | this_src.name_score = basename_same(one, two); |
| 567 | this_src.dst = i; |
| 568 | this_src.src = j; |
| 569 | record_if_better(m, &this_src); |
Junio C Hamano | 809809b | 2009-11-20 22:13:47 -0800 | [diff] [blame] | 570 | /* |
| 571 | * Once we run estimate_similarity, |
| 572 | * We do not need the text anymore. |
| 573 | */ |
Junio C Hamano | 8ae92e6 | 2007-10-02 21:01:03 -0700 | [diff] [blame] | 574 | diff_free_filespec_blob(one); |
Junio C Hamano | 809809b | 2009-11-20 22:13:47 -0800 | [diff] [blame] | 575 | diff_free_filespec_blob(two); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 576 | } |
| 577 | dst_cnt++; |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 578 | display_progress(progress, (i+1)*rename_src_nr); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 579 | } |
Jeff King | 3ac942d | 2011-02-20 04:51:16 -0500 | [diff] [blame] | 580 | stop_progress(&progress); |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 581 | |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 582 | /* cost matrix sorted by most to least similar pair */ |
Junio C Hamano | 6d24ad9 | 2008-01-29 20:54:56 -0800 | [diff] [blame] | 583 | qsort(mx, dst_cnt * NUM_CANDIDATE_PER_DST, sizeof(*mx), score_compare); |
| 584 | |
Linus Torvalds | 0940e5f | 2011-02-18 20:10:32 -0800 | [diff] [blame] | 585 | rename_count += find_renames(mx, dst_cnt, minimum_score, 0); |
| 586 | if (detect_rename == DIFF_DETECT_COPY) |
| 587 | rename_count += find_renames(mx, dst_cnt, minimum_score, 1); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 588 | free(mx); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 589 | |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 590 | cleanup: |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 591 | /* 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] | 592 | * 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] | 593 | */ |
Bo Yang | 9ca5df9 | 2010-05-06 21:52:27 -0700 | [diff] [blame] | 594 | DIFF_QUEUE_CLEAR(&outq); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 595 | for (i = 0; i < q->nr; i++) { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 596 | struct diff_filepair *p = q->queue[i]; |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 597 | struct diff_filepair *pair_to_free = NULL; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 598 | |
Martin von Zweigbergk | d7c9bf2 | 2011-03-23 22:41:01 -0400 | [diff] [blame] | 599 | if (DIFF_PAIR_UNMERGED(p)) { |
| 600 | diff_q(&outq, p); |
| 601 | } |
| 602 | else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 603 | /* |
| 604 | * Creation |
| 605 | * |
| 606 | * We would output this create record if it has |
| 607 | * not been turned into a rename/copy already. |
| 608 | */ |
Jeff King | f98c2f7 | 2015-02-26 20:39:48 -0500 | [diff] [blame] | 609 | struct diff_rename_dst *dst = locate_rename_dst(p->two); |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 610 | if (dst && dst->pair) { |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 611 | diff_q(&outq, dst->pair); |
| 612 | pair_to_free = p; |
| 613 | } |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 614 | else |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 615 | /* no matching rename/copy source, so |
| 616 | * record this as a creation. |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 617 | */ |
| 618 | diff_q(&outq, p); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 619 | } |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 620 | else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) { |
| 621 | /* |
| 622 | * Deletion |
| 623 | * |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 624 | * We would output this delete record if: |
| 625 | * |
| 626 | * (1) this is a broken delete and the counterpart |
| 627 | * broken create remains in the output; or |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 628 | * (2) this is not a broken delete, and rename_dst |
| 629 | * does not have a rename/copy to move p->one->path |
| 630 | * out of existence. |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 631 | * |
| 632 | * Otherwise, the counterpart broken create |
| 633 | * has been turned into a rename-edit; or |
| 634 | * delete did not have a matching create to |
| 635 | * begin with. |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 636 | */ |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 637 | if (DIFF_PAIR_BROKEN(p)) { |
| 638 | /* broken delete */ |
Jeff King | f98c2f7 | 2015-02-26 20:39:48 -0500 | [diff] [blame] | 639 | struct diff_rename_dst *dst = locate_rename_dst(p->one); |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 640 | if (dst && dst->pair) |
| 641 | /* counterpart is now rename/copy */ |
| 642 | pair_to_free = p; |
| 643 | } |
| 644 | else { |
Linus Torvalds | 6447971 | 2007-10-25 11:20:56 -0700 | [diff] [blame] | 645 | if (p->one->rename_used) |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 646 | /* this path remains */ |
| 647 | pair_to_free = p; |
| 648 | } |
Junio C Hamano | 2cd6888 | 2005-05-30 00:08:07 -0700 | [diff] [blame] | 649 | |
| 650 | if (pair_to_free) |
| 651 | ; |
| 652 | else |
| 653 | diff_q(&outq, p); |
| 654 | } |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 655 | else if (!diff_unmodified_pair(p)) |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 656 | /* all the usual ones need to be kept */ |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 657 | diff_q(&outq, p); |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 658 | else |
| 659 | /* no need to keep unmodified pairs */ |
| 660 | pair_to_free = p; |
| 661 | |
Junio C Hamano | 226406f | 2005-05-27 15:50:30 -0700 | [diff] [blame] | 662 | if (pair_to_free) |
| 663 | diff_free_filepair(pair_to_free); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 664 | } |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 665 | diff_debug_queue("done copying original", &outq); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 666 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 667 | free(q->queue); |
| 668 | *q = outq; |
| 669 | diff_debug_queue("done collapsing", q); |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 670 | |
Linus Torvalds | 9fb8841 | 2007-10-25 11:19:10 -0700 | [diff] [blame] | 671 | for (i = 0; i < rename_dst_nr; i++) |
| 672 | free_filespec(rename_dst[i].two); |
Junio C Hamano | 5098baf | 2005-09-15 16:13:43 -0700 | [diff] [blame] | 673 | |
Junio C Hamano | 25d5ea4 | 2005-05-24 01:10:48 -0700 | [diff] [blame] | 674 | free(rename_dst); |
| 675 | rename_dst = NULL; |
| 676 | rename_dst_nr = rename_dst_alloc = 0; |
| 677 | free(rename_src); |
| 678 | rename_src = NULL; |
| 679 | rename_src_nr = rename_src_alloc = 0; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 680 | return; |
| 681 | } |