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