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