]>
Commit | Line | Data |
---|---|---|
5b2fd956 | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
697cc8ef | 3 | #include "lockfile.h" |
c455c87c | 4 | #include "string-list.h" |
5b2fd956 | 5 | #include "rerere.h" |
5b2fd956 | 6 | #include "xdiff-interface.h" |
dea4562b JH |
7 | #include "dir.h" |
8 | #include "resolve-undo.h" | |
9 | #include "ll-merge.h" | |
8588567c | 10 | #include "attr.h" |
01a10b0a | 11 | #include "pathspec.h" |
cbd53a21 | 12 | #include "object-store.h" |
bc626927 | 13 | #include "hash-lookup.h" |
680ff910 | 14 | #include "strmap.h" |
5b2fd956 | 15 | |
ac49f5ca MZ |
16 | #define RESOLVED 0 |
17 | #define PUNTED 1 | |
18 | #define THREE_STAGED 2 | |
19 | void *RERERE_RESOLVED = &RERERE_RESOLVED; | |
20 | ||
5b2fd956 SB |
21 | /* if rerere_enabled == -1, fall back to detection of .git/rr-cache */ |
22 | static int rerere_enabled = -1; | |
23 | ||
24 | /* automatically update cleanly resolved paths to the index */ | |
25 | static int rerere_autoupdate; | |
26 | ||
2c7929b1 JH |
27 | #define RR_HAS_POSTIMAGE 1 |
28 | #define RR_HAS_PREIMAGE 2 | |
680ff910 | 29 | struct rerere_dir { |
a13d1370 JH |
30 | int status_alloc, status_nr; |
31 | unsigned char *status; | |
680ff910 JK |
32 | char name[FLEX_ARRAY]; |
33 | }; | |
34 | ||
35 | static struct strmap rerere_dirs = STRMAP_INIT; | |
1869bbe1 JH |
36 | |
37 | static void free_rerere_dirs(void) | |
38 | { | |
680ff910 JK |
39 | struct hashmap_iter iter; |
40 | struct strmap_entry *ent; | |
41 | ||
42 | strmap_for_each_entry(&rerere_dirs, &iter, ent) { | |
43 | struct rerere_dir *rr_dir = ent->value; | |
44 | free(rr_dir->status); | |
45 | free(rr_dir); | |
a13d1370 | 46 | } |
680ff910 | 47 | strmap_clear(&rerere_dirs, 0); |
1869bbe1 JH |
48 | } |
49 | ||
1d51eced | 50 | static void free_rerere_id(struct string_list_item *item) |
5b2fd956 | 51 | { |
1d51eced | 52 | free(item->util); |
5b2fd956 SB |
53 | } |
54 | ||
1d51eced JH |
55 | static const char *rerere_id_hex(const struct rerere_id *id) |
56 | { | |
680ff910 | 57 | return id->collection->name; |
1d51eced JH |
58 | } |
59 | ||
a13d1370 JH |
60 | static void fit_variant(struct rerere_dir *rr_dir, int variant) |
61 | { | |
62 | variant++; | |
63 | ALLOC_GROW(rr_dir->status, variant, rr_dir->status_alloc); | |
64 | if (rr_dir->status_nr < variant) { | |
65 | memset(rr_dir->status + rr_dir->status_nr, | |
66 | '\0', variant - rr_dir->status_nr); | |
67 | rr_dir->status_nr = variant; | |
68 | } | |
69 | } | |
70 | ||
71 | static void assign_variant(struct rerere_id *id) | |
72 | { | |
73 | int variant; | |
74 | struct rerere_dir *rr_dir = id->collection; | |
75 | ||
76 | variant = id->variant; | |
77 | if (variant < 0) { | |
629716d2 JH |
78 | for (variant = 0; variant < rr_dir->status_nr; variant++) |
79 | if (!rr_dir->status[variant]) | |
80 | break; | |
a13d1370 JH |
81 | } |
82 | fit_variant(rr_dir, variant); | |
83 | id->variant = variant; | |
1d51eced JH |
84 | } |
85 | ||
86 | const char *rerere_path(const struct rerere_id *id, const char *file) | |
87 | { | |
88 | if (!file) | |
89 | return git_path("rr-cache/%s", rerere_id_hex(id)); | |
90 | ||
a13d1370 JH |
91 | if (id->variant <= 0) |
92 | return git_path("rr-cache/%s/%s", rerere_id_hex(id), file); | |
93 | ||
94 | return git_path("rr-cache/%s/%s.%d", | |
95 | rerere_id_hex(id), file, id->variant); | |
5b2fd956 SB |
96 | } |
97 | ||
a13d1370 | 98 | static int is_rr_file(const char *name, const char *filename, int *variant) |
2c7929b1 | 99 | { |
a13d1370 JH |
100 | const char *suffix; |
101 | char *ep; | |
102 | ||
103 | if (!strcmp(name, filename)) { | |
104 | *variant = 0; | |
105 | return 1; | |
106 | } | |
107 | if (!skip_prefix(name, filename, &suffix) || *suffix != '.') | |
108 | return 0; | |
109 | ||
110 | errno = 0; | |
111 | *variant = strtol(suffix + 1, &ep, 10); | |
112 | if (errno || *ep) | |
113 | return 0; | |
114 | return 1; | |
2c7929b1 JH |
115 | } |
116 | ||
117 | static void scan_rerere_dir(struct rerere_dir *rr_dir) | |
118 | { | |
119 | struct dirent *de; | |
680ff910 | 120 | DIR *dir = opendir(git_path("rr-cache/%s", rr_dir->name)); |
2c7929b1 JH |
121 | |
122 | if (!dir) | |
123 | return; | |
124 | while ((de = readdir(dir)) != NULL) { | |
a13d1370 JH |
125 | int variant; |
126 | ||
127 | if (is_rr_file(de->d_name, "postimage", &variant)) { | |
128 | fit_variant(rr_dir, variant); | |
129 | rr_dir->status[variant] |= RR_HAS_POSTIMAGE; | |
130 | } else if (is_rr_file(de->d_name, "preimage", &variant)) { | |
131 | fit_variant(rr_dir, variant); | |
132 | rr_dir->status[variant] |= RR_HAS_PREIMAGE; | |
133 | } | |
2c7929b1 JH |
134 | } |
135 | closedir(dir); | |
136 | } | |
137 | ||
1869bbe1 JH |
138 | static struct rerere_dir *find_rerere_dir(const char *hex) |
139 | { | |
1869bbe1 | 140 | struct rerere_dir *rr_dir; |
680ff910 JK |
141 | |
142 | rr_dir = strmap_get(&rerere_dirs, hex); | |
143 | if (!rr_dir) { | |
144 | FLEX_ALLOC_STR(rr_dir, name, hex); | |
a13d1370 JH |
145 | rr_dir->status = NULL; |
146 | rr_dir->status_nr = 0; | |
147 | rr_dir->status_alloc = 0; | |
680ff910 JK |
148 | strmap_put(&rerere_dirs, hex, rr_dir); |
149 | ||
2c7929b1 | 150 | scan_rerere_dir(rr_dir); |
1869bbe1 | 151 | } |
680ff910 | 152 | return rr_dir; |
5b2fd956 SB |
153 | } |
154 | ||
1d51eced | 155 | static int has_rerere_resolution(const struct rerere_id *id) |
5b2fd956 | 156 | { |
05dd9f13 | 157 | const int both = RR_HAS_POSTIMAGE|RR_HAS_PREIMAGE; |
a13d1370 | 158 | int variant = id->variant; |
1d51eced | 159 | |
a13d1370 JH |
160 | if (variant < 0) |
161 | return 0; | |
162 | return ((id->collection->status[variant] & both) == both); | |
5b2fd956 SB |
163 | } |
164 | ||
1d51eced JH |
165 | static struct rerere_id *new_rerere_id_hex(char *hex) |
166 | { | |
167 | struct rerere_id *id = xmalloc(sizeof(*id)); | |
1869bbe1 | 168 | id->collection = find_rerere_dir(hex); |
a13d1370 | 169 | id->variant = -1; /* not known yet */ |
1d51eced JH |
170 | return id; |
171 | } | |
172 | ||
3f34d70d | 173 | static struct rerere_id *new_rerere_id(unsigned char *hash) |
1d51eced | 174 | { |
3f34d70d | 175 | return new_rerere_id_hex(hash_to_hex(hash)); |
5b2fd956 SB |
176 | } |
177 | ||
4b68c2a0 JH |
178 | /* |
179 | * $GIT_DIR/MERGE_RR file is a collection of records, each of which is | |
180 | * "conflict ID", a HT and pathname, terminated with a NUL, and is | |
181 | * used to keep track of the set of paths that "rerere" may need to | |
182 | * work on (i.e. what is left by the previous invocation of "git | |
183 | * rerere" during the current conflict resolution session). | |
184 | */ | |
55e6b354 | 185 | static void read_rr(struct repository *r, struct string_list *rr) |
5b2fd956 | 186 | { |
f5800f6a | 187 | struct strbuf buf = STRBUF_INIT; |
55e6b354 | 188 | FILE *in = fopen_or_warn(git_path_merge_rr(r), "r"); |
f5800f6a | 189 | |
5b2fd956 SB |
190 | if (!in) |
191 | return; | |
f5800f6a JH |
192 | while (!strbuf_getwholeline(&buf, in, '\0')) { |
193 | char *path; | |
0d7c419a | 194 | unsigned char hash[GIT_MAX_RAWSZ]; |
1d51eced | 195 | struct rerere_id *id; |
a13d1370 | 196 | int variant; |
0d7c419a | 197 | const unsigned hexsz = the_hash_algo->hexsz; |
f5800f6a JH |
198 | |
199 | /* There has to be the hash, tab, path and then NUL */ | |
0d7c419a | 200 | if (buf.len < hexsz + 2 || get_sha1_hex(buf.buf, hash)) |
2373b650 | 201 | die(_("corrupt MERGE_RR")); |
f5800f6a | 202 | |
0d7c419a | 203 | if (buf.buf[hexsz] != '.') { |
a13d1370 | 204 | variant = 0; |
0d7c419a | 205 | path = buf.buf + hexsz; |
a13d1370 JH |
206 | } else { |
207 | errno = 0; | |
0d7c419a | 208 | variant = strtol(buf.buf + hexsz + 1, &path, 10); |
a13d1370 | 209 | if (errno) |
2373b650 | 210 | die(_("corrupt MERGE_RR")); |
a13d1370 JH |
211 | } |
212 | if (*(path++) != '\t') | |
2373b650 | 213 | die(_("corrupt MERGE_RR")); |
0d7c419a | 214 | buf.buf[hexsz] = '\0'; |
1d51eced | 215 | id = new_rerere_id_hex(buf.buf); |
a13d1370 | 216 | id->variant = variant; |
1d51eced | 217 | string_list_insert(rr, path)->util = id; |
5b2fd956 | 218 | } |
f5800f6a | 219 | strbuf_release(&buf); |
5b2fd956 SB |
220 | fclose(in); |
221 | } | |
222 | ||
223 | static struct lock_file write_lock; | |
224 | ||
c455c87c | 225 | static int write_rr(struct string_list *rr, int out_fd) |
5b2fd956 SB |
226 | { |
227 | int i; | |
228 | for (i = 0; i < rr->nr; i++) { | |
e2cb6a95 | 229 | struct strbuf buf = STRBUF_INIT; |
1d51eced | 230 | struct rerere_id *id; |
e2cb6a95 JH |
231 | |
232 | assert(rr->items[i].util != RERERE_RESOLVED); | |
1d51eced JH |
233 | |
234 | id = rr->items[i].util; | |
235 | if (!id) | |
5b2fd956 | 236 | continue; |
a13d1370 JH |
237 | assert(id->variant >= 0); |
238 | if (0 < id->variant) | |
239 | strbuf_addf(&buf, "%s.%d\t%s%c", | |
240 | rerere_id_hex(id), id->variant, | |
241 | rr->items[i].string, 0); | |
242 | else | |
243 | strbuf_addf(&buf, "%s\t%s%c", | |
244 | rerere_id_hex(id), | |
245 | rr->items[i].string, 0); | |
246 | ||
06f46f23 | 247 | if (write_in_full(out_fd, buf.buf, buf.len) < 0) |
2373b650 | 248 | die(_("unable to write rerere record")); |
e2cb6a95 JH |
249 | |
250 | strbuf_release(&buf); | |
5b2fd956 SB |
251 | } |
252 | if (commit_lock_file(&write_lock) != 0) | |
2373b650 | 253 | die(_("unable to write rerere record")); |
5b2fd956 SB |
254 | return 0; |
255 | } | |
256 | ||
a96847cc JH |
257 | /* |
258 | * "rerere" interacts with conflicted file contents using this I/O | |
259 | * abstraction. It reads a conflicted contents from one place via | |
260 | * "getline()" method, and optionally can write it out after | |
261 | * normalizing the conflicted hunks to the "output". Subclasses of | |
262 | * rerere_io embed this structure at the beginning of their own | |
263 | * rerere_io object. | |
264 | */ | |
265 | struct rerere_io { | |
266 | int (*getline)(struct strbuf *, struct rerere_io *); | |
267 | FILE *output; | |
268 | int wrerror; | |
269 | /* some more stuff */ | |
270 | }; | |
271 | ||
47d32af2 AR |
272 | static void ferr_write(const void *p, size_t count, FILE *fp, int *err) |
273 | { | |
274 | if (!count || *err) | |
275 | return; | |
276 | if (fwrite(p, count, 1, fp) != 1) | |
277 | *err = errno; | |
278 | } | |
279 | ||
280 | static inline void ferr_puts(const char *s, FILE *fp, int *err) | |
281 | { | |
282 | ferr_write(s, strlen(s), fp, err); | |
283 | } | |
284 | ||
27d6b085 JH |
285 | static void rerere_io_putstr(const char *str, struct rerere_io *io) |
286 | { | |
287 | if (io->output) | |
288 | ferr_puts(str, io->output, &io->wrerror); | |
289 | } | |
290 | ||
291 | static void rerere_io_putmem(const char *mem, size_t sz, struct rerere_io *io) | |
292 | { | |
293 | if (io->output) | |
294 | ferr_write(mem, sz, io->output, &io->wrerror); | |
295 | } | |
296 | ||
a96847cc JH |
297 | /* |
298 | * Subclass of rerere_io that reads from an on-disk file | |
299 | */ | |
27d6b085 JH |
300 | struct rerere_io_file { |
301 | struct rerere_io io; | |
302 | FILE *input; | |
303 | }; | |
304 | ||
a96847cc JH |
305 | /* |
306 | * ... and its getline() method implementation | |
307 | */ | |
27d6b085 JH |
308 | static int rerere_file_getline(struct strbuf *sb, struct rerere_io *io_) |
309 | { | |
310 | struct rerere_io_file *io = (struct rerere_io_file *)io_; | |
311 | return strbuf_getwholeline(sb, io->input, '\n'); | |
312 | } | |
313 | ||
67711cdc JH |
314 | /* |
315 | * Require the exact number of conflict marker letters, no more, no | |
316 | * less, followed by SP or any whitespace | |
317 | * (including LF). | |
318 | */ | |
319 | static int is_cmarker(char *buf, int marker_char, int marker_size) | |
191f2417 | 320 | { |
67711cdc JH |
321 | int want_sp; |
322 | ||
323 | /* | |
324 | * The beginning of our version and the end of their version | |
325 | * always are labeled like "<<<<< ours" or ">>>>> theirs", | |
326 | * hence we set want_sp for them. Note that the version from | |
327 | * the common ancestor in diff3-style output is not always | |
328 | * labelled (e.g. "||||| common" is often seen but "|||||" | |
329 | * alone is also valid), so we do not set want_sp. | |
330 | */ | |
331 | want_sp = (marker_char == '<') || (marker_char == '>'); | |
332 | ||
191f2417 JH |
333 | while (marker_size--) |
334 | if (*buf++ != marker_char) | |
335 | return 0; | |
336 | if (want_sp && *buf != ' ') | |
337 | return 0; | |
338 | return isspace(*buf); | |
339 | } | |
340 | ||
5ebbdad3 TG |
341 | static void rerere_strbuf_putconflict(struct strbuf *buf, int ch, size_t size) |
342 | { | |
343 | strbuf_addchars(buf, ch, size); | |
344 | strbuf_addch(buf, '\n'); | |
345 | } | |
346 | ||
347 | static int handle_conflict(struct strbuf *out, struct rerere_io *io, | |
0d7c419a | 348 | int marker_size, git_hash_ctx *ctx) |
5b2fd956 | 349 | { |
cc58d7df | 350 | enum { |
c0f16f8e TG |
351 | RR_SIDE_1 = 0, RR_SIDE_2, RR_ORIGINAL |
352 | } hunk = RR_SIDE_1; | |
f285a2d7 | 353 | struct strbuf one = STRBUF_INIT, two = STRBUF_INIT; |
4af32207 | 354 | struct strbuf buf = STRBUF_INIT, conflict = STRBUF_INIT; |
c0f16f8e | 355 | int has_conflicts = -1; |
5b2fd956 | 356 | |
27d6b085 | 357 | while (!io->getline(&buf, io)) { |
67711cdc | 358 | if (is_cmarker(buf.buf, '<', marker_size)) { |
4af32207 TG |
359 | if (handle_conflict(&conflict, io, marker_size, NULL) < 0) |
360 | break; | |
361 | if (hunk == RR_SIDE_1) | |
362 | strbuf_addbuf(&one, &conflict); | |
363 | else | |
364 | strbuf_addbuf(&two, &conflict); | |
365 | strbuf_release(&conflict); | |
67711cdc | 366 | } else if (is_cmarker(buf.buf, '|', marker_size)) { |
cc58d7df | 367 | if (hunk != RR_SIDE_1) |
c0f16f8e | 368 | break; |
387c9d49 | 369 | hunk = RR_ORIGINAL; |
67711cdc | 370 | } else if (is_cmarker(buf.buf, '=', marker_size)) { |
387c9d49 | 371 | if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL) |
c0f16f8e | 372 | break; |
cc58d7df | 373 | hunk = RR_SIDE_2; |
67711cdc | 374 | } else if (is_cmarker(buf.buf, '>', marker_size)) { |
cc58d7df | 375 | if (hunk != RR_SIDE_2) |
c0f16f8e | 376 | break; |
5b2fd956 SB |
377 | if (strbuf_cmp(&one, &two) > 0) |
378 | strbuf_swap(&one, &two); | |
221444f5 | 379 | has_conflicts = 1; |
5ebbdad3 TG |
380 | rerere_strbuf_putconflict(out, '<', marker_size); |
381 | strbuf_addbuf(out, &one); | |
382 | rerere_strbuf_putconflict(out, '=', marker_size); | |
383 | strbuf_addbuf(out, &two); | |
384 | rerere_strbuf_putconflict(out, '>', marker_size); | |
c0f16f8e | 385 | if (ctx) { |
0d7c419a | 386 | the_hash_algo->update_fn(ctx, one.buf ? |
387 | one.buf : "", | |
388 | one.len + 1); | |
389 | the_hash_algo->update_fn(ctx, two.buf ? | |
390 | two.buf : "", | |
391 | two.len + 1); | |
5b2fd956 | 392 | } |
c0f16f8e | 393 | break; |
cc58d7df | 394 | } else if (hunk == RR_SIDE_1) |
e992d1eb | 395 | strbuf_addbuf(&one, &buf); |
387c9d49 JH |
396 | else if (hunk == RR_ORIGINAL) |
397 | ; /* discard */ | |
cc58d7df | 398 | else if (hunk == RR_SIDE_2) |
e992d1eb | 399 | strbuf_addbuf(&two, &buf); |
5b2fd956 SB |
400 | } |
401 | strbuf_release(&one); | |
402 | strbuf_release(&two); | |
d58ee6db | 403 | strbuf_release(&buf); |
5b2fd956 | 404 | |
c0f16f8e TG |
405 | return has_conflicts; |
406 | } | |
407 | ||
408 | /* | |
409 | * Read contents a file with conflicts, normalize the conflicts | |
410 | * by (1) discarding the common ancestor version in diff3-style, | |
411 | * (2) reordering our side and their side so that whichever sorts | |
412 | * alphabetically earlier comes before the other one, while | |
413 | * computing the "conflict ID", which is just an SHA-1 hash of | |
414 | * one side of the conflict, NUL, the other side of the conflict, | |
415 | * and NUL concatenated together. | |
416 | * | |
417 | * Return 1 if conflict hunks are found, 0 if there are no conflict | |
15beaaa3 | 418 | * hunks and -1 if an error occurred. |
c0f16f8e | 419 | */ |
0d7c419a | 420 | static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size) |
c0f16f8e | 421 | { |
0d7c419a | 422 | git_hash_ctx ctx; |
5ebbdad3 | 423 | struct strbuf buf = STRBUF_INIT, out = STRBUF_INIT; |
c0f16f8e | 424 | int has_conflicts = 0; |
0d7c419a | 425 | if (hash) |
426 | the_hash_algo->init_fn(&ctx); | |
c0f16f8e TG |
427 | |
428 | while (!io->getline(&buf, io)) { | |
429 | if (is_cmarker(buf.buf, '<', marker_size)) { | |
5ebbdad3 | 430 | has_conflicts = handle_conflict(&out, io, marker_size, |
0d7c419a | 431 | hash ? &ctx : NULL); |
c0f16f8e TG |
432 | if (has_conflicts < 0) |
433 | break; | |
5ebbdad3 TG |
434 | rerere_io_putmem(out.buf, out.len, io); |
435 | strbuf_reset(&out); | |
c0f16f8e TG |
436 | } else |
437 | rerere_io_putstr(buf.buf, io); | |
438 | } | |
439 | strbuf_release(&buf); | |
5ebbdad3 | 440 | strbuf_release(&out); |
c0f16f8e | 441 | |
0d7c419a | 442 | if (hash) |
443 | the_hash_algo->final_fn(hash, &ctx); | |
c0f16f8e | 444 | |
221444f5 | 445 | return has_conflicts; |
27d6b085 JH |
446 | } |
447 | ||
cc899eca JH |
448 | /* |
449 | * Scan the path for conflicts, do the "handle_path()" thing above, and | |
450 | * return the number of conflict hunks found. | |
451 | */ | |
d829d491 JH |
452 | static int handle_file(struct index_state *istate, |
453 | const char *path, unsigned char *hash, const char *output) | |
27d6b085 | 454 | { |
221444f5 | 455 | int has_conflicts = 0; |
27d6b085 | 456 | struct rerere_io_file io; |
35843b11 | 457 | int marker_size = ll_merge_marker_size(istate, path); |
27d6b085 JH |
458 | |
459 | memset(&io, 0, sizeof(io)); | |
460 | io.io.getline = rerere_file_getline; | |
461 | io.input = fopen(path, "r"); | |
462 | io.io.wrerror = 0; | |
463 | if (!io.input) | |
2373b650 | 464 | return error_errno(_("could not open '%s'"), path); |
27d6b085 JH |
465 | |
466 | if (output) { | |
467 | io.io.output = fopen(output, "w"); | |
468 | if (!io.io.output) { | |
2373b650 | 469 | error_errno(_("could not write '%s'"), output); |
27d6b085 | 470 | fclose(io.input); |
f7566f07 | 471 | return -1; |
27d6b085 JH |
472 | } |
473 | } | |
474 | ||
0d7c419a | 475 | has_conflicts = handle_path(hash, (struct rerere_io *)&io, marker_size); |
27d6b085 JH |
476 | |
477 | fclose(io.input); | |
478 | if (io.io.wrerror) | |
2373b650 | 479 | error(_("there were errors while writing '%s' (%s)"), |
27d6b085 JH |
480 | path, strerror(io.io.wrerror)); |
481 | if (io.io.output && fclose(io.io.output)) | |
2373b650 | 482 | io.io.wrerror = error_errno(_("failed to flush '%s'"), path); |
27d6b085 | 483 | |
221444f5 | 484 | if (has_conflicts < 0) { |
5b2fd956 | 485 | if (output) |
691f1a28 | 486 | unlink_or_warn(output); |
2373b650 | 487 | return error(_("could not parse conflict hunks in '%s'"), path); |
5b2fd956 | 488 | } |
27d6b085 | 489 | if (io.io.wrerror) |
47d32af2 | 490 | return -1; |
221444f5 | 491 | return has_conflicts; |
5b2fd956 SB |
492 | } |
493 | ||
4b68c2a0 JH |
494 | /* |
495 | * Look at a cache entry at "i" and see if it is not conflicting, | |
496 | * conflicting and we are willing to handle, or conflicting and | |
497 | * we are unable to handle, and return the determination in *type. | |
498 | * Return the cache index to be looked at next, by skipping the | |
499 | * stages we have already looked at in this invocation of this | |
500 | * function. | |
501 | */ | |
35843b11 | 502 | static int check_one_conflict(struct index_state *istate, int i, int *type) |
5b2fd956 | 503 | { |
35843b11 | 504 | const struct cache_entry *e = istate->cache[i]; |
ac49f5ca MZ |
505 | |
506 | if (!ce_stage(e)) { | |
507 | *type = RESOLVED; | |
508 | return i + 1; | |
509 | } | |
510 | ||
511 | *type = PUNTED; | |
11877b9e | 512 | while (i < istate->cache_nr && ce_stage(istate->cache[i]) == 1) |
fb70a06d | 513 | i++; |
ac49f5ca MZ |
514 | |
515 | /* Only handle regular files with both stages #2 and #3 */ | |
35843b11 NTND |
516 | if (i + 1 < istate->cache_nr) { |
517 | const struct cache_entry *e2 = istate->cache[i]; | |
518 | const struct cache_entry *e3 = istate->cache[i + 1]; | |
5b2fd956 SB |
519 | if (ce_stage(e2) == 2 && |
520 | ce_stage(e3) == 3 && | |
ac49f5ca | 521 | ce_same_name(e, e3) && |
5b2fd956 | 522 | S_ISREG(e2->ce_mode) && |
ac49f5ca MZ |
523 | S_ISREG(e3->ce_mode)) |
524 | *type = THREE_STAGED; | |
525 | } | |
526 | ||
527 | /* Skip the entries with the same name */ | |
35843b11 | 528 | while (i < istate->cache_nr && ce_same_name(e, istate->cache[i])) |
ac49f5ca MZ |
529 | i++; |
530 | return i; | |
531 | } | |
532 | ||
4b68c2a0 JH |
533 | /* |
534 | * Scan the index and find paths that have conflicts that rerere can | |
535 | * handle, i.e. the ones that has both stages #2 and #3. | |
536 | * | |
537 | * NEEDSWORK: we do not record or replay a previous "resolve by | |
538 | * deletion" for a delete-modify conflict, as that is inherently risky | |
539 | * without knowing what modification is being discarded. The only | |
540 | * safe case, i.e. both side doing the deletion and modification that | |
541 | * are identical to the previous round, might want to be handled, | |
542 | * though. | |
543 | */ | |
35843b11 | 544 | static int find_conflict(struct repository *r, struct string_list *conflict) |
ac49f5ca MZ |
545 | { |
546 | int i; | |
35843b11 | 547 | |
e1ff0a32 | 548 | if (repo_read_index(r) < 0) |
2373b650 | 549 | return error(_("index file corrupt")); |
ac49f5ca | 550 | |
35843b11 | 551 | for (i = 0; i < r->index->cache_nr;) { |
ac49f5ca | 552 | int conflict_type; |
35843b11 NTND |
553 | const struct cache_entry *e = r->index->cache[i]; |
554 | i = check_one_conflict(r->index, i, &conflict_type); | |
ac49f5ca MZ |
555 | if (conflict_type == THREE_STAGED) |
556 | string_list_insert(conflict, (const char *)e->name); | |
557 | } | |
558 | return 0; | |
559 | } | |
560 | ||
4b68c2a0 JH |
561 | /* |
562 | * The merge_rr list is meant to hold outstanding conflicted paths | |
563 | * that rerere could handle. Abuse the list by adding other types of | |
564 | * entries to allow the caller to show "rerere remaining". | |
565 | * | |
566 | * - Conflicted paths that rerere does not handle are added | |
567 | * - Conflicted paths that have been resolved are marked as such | |
568 | * by storing RERERE_RESOLVED to .util field (where conflict ID | |
569 | * is expected to be stored). | |
570 | * | |
571 | * Do *not* write MERGE_RR file out after calling this function. | |
572 | * | |
573 | * NEEDSWORK: we may want to fix the caller that implements "rerere | |
574 | * remaining" to do this without abusing merge_rr. | |
575 | */ | |
35843b11 | 576 | int rerere_remaining(struct repository *r, struct string_list *merge_rr) |
ac49f5ca MZ |
577 | { |
578 | int i; | |
35843b11 | 579 | |
55e6b354 | 580 | if (setup_rerere(r, merge_rr, RERERE_READONLY)) |
9dd330e6 | 581 | return 0; |
e1ff0a32 | 582 | if (repo_read_index(r) < 0) |
2373b650 | 583 | return error(_("index file corrupt")); |
ac49f5ca | 584 | |
35843b11 | 585 | for (i = 0; i < r->index->cache_nr;) { |
ac49f5ca | 586 | int conflict_type; |
35843b11 NTND |
587 | const struct cache_entry *e = r->index->cache[i]; |
588 | i = check_one_conflict(r->index, i, &conflict_type); | |
ac49f5ca MZ |
589 | if (conflict_type == PUNTED) |
590 | string_list_insert(merge_rr, (const char *)e->name); | |
591 | else if (conflict_type == RESOLVED) { | |
592 | struct string_list_item *it; | |
593 | it = string_list_lookup(merge_rr, (const char *)e->name); | |
afe8a907 | 594 | if (it) { |
1d51eced | 595 | free_rerere_id(it); |
ac49f5ca MZ |
596 | it->util = RERERE_RESOLVED; |
597 | } | |
5b2fd956 SB |
598 | } |
599 | } | |
600 | return 0; | |
601 | } | |
602 | ||
0ce02b36 JH |
603 | /* |
604 | * Try using the given conflict resolution "ID" to see | |
605 | * if that recorded conflict resolves cleanly what we | |
606 | * got in the "cur". | |
607 | */ | |
35843b11 NTND |
608 | static int try_merge(struct index_state *istate, |
609 | const struct rerere_id *id, const char *path, | |
0ce02b36 JH |
610 | mmfile_t *cur, mmbuffer_t *result) |
611 | { | |
35f69671 | 612 | enum ll_merge_result ret; |
0ce02b36 JH |
613 | mmfile_t base = {NULL, 0}, other = {NULL, 0}; |
614 | ||
615 | if (read_mmfile(&base, rerere_path(id, "preimage")) || | |
35f69671 EN |
616 | read_mmfile(&other, rerere_path(id, "postimage"))) { |
617 | ret = LL_MERGE_CONFLICT; | |
618 | } else { | |
0ce02b36 JH |
619 | /* |
620 | * A three-way merge. Note that this honors user-customizable | |
621 | * low-level merge driver settings. | |
622 | */ | |
32eaa468 | 623 | ret = ll_merge(result, path, &base, NULL, cur, "", &other, "", |
35843b11 | 624 | istate, NULL); |
35f69671 | 625 | } |
0ce02b36 JH |
626 | |
627 | free(base.ptr); | |
628 | free(other.ptr); | |
629 | ||
630 | return ret; | |
631 | } | |
632 | ||
cc899eca | 633 | /* |
18bb9934 | 634 | * Find the conflict identified by "id"; the change between its |
cc899eca JH |
635 | * "preimage" (i.e. a previous contents with conflict markers) and its |
636 | * "postimage" (i.e. the corresponding contents with conflicts | |
637 | * resolved) may apply cleanly to the contents stored in "path", i.e. | |
638 | * the conflict this time around. | |
639 | * | |
640 | * Returns 0 for successful replay of recorded resolution, or non-zero | |
641 | * for failure. | |
642 | */ | |
35843b11 | 643 | static int merge(struct index_state *istate, const struct rerere_id *id, const char *path) |
5b2fd956 | 644 | { |
15ed07d5 | 645 | FILE *f; |
5b2fd956 | 646 | int ret; |
0ce02b36 | 647 | mmfile_t cur = {NULL, 0}; |
5b2fd956 | 648 | mmbuffer_t result = {NULL, 0}; |
5b2fd956 | 649 | |
cc899eca JH |
650 | /* |
651 | * Normalize the conflicts in path and write it out to | |
652 | * "thisimage" temporary file. | |
653 | */ | |
35843b11 | 654 | if ((handle_file(istate, path, NULL, rerere_path(id, "thisimage")) < 0) || |
0ce02b36 | 655 | read_mmfile(&cur, rerere_path(id, "thisimage"))) { |
689b8c29 BW |
656 | ret = 1; |
657 | goto out; | |
658 | } | |
cc899eca | 659 | |
35843b11 | 660 | ret = try_merge(istate, id, path, &cur, &result); |
15ed07d5 JH |
661 | if (ret) |
662 | goto out; | |
663 | ||
664 | /* | |
665 | * A successful replay of recorded resolution. | |
666 | * Mark that "postimage" was used to help gc. | |
667 | */ | |
668 | if (utime(rerere_path(id, "postimage"), NULL) < 0) | |
2373b650 | 669 | warning_errno(_("failed utime() on '%s'"), |
033e011e | 670 | rerere_path(id, "postimage")); |
15ed07d5 JH |
671 | |
672 | /* Update "path" with the resolution */ | |
673 | f = fopen(path, "w"); | |
674 | if (!f) | |
2373b650 | 675 | return error_errno(_("could not open '%s'"), path); |
15ed07d5 | 676 | if (fwrite(result.ptr, result.size, 1, f) != 1) |
2373b650 | 677 | error_errno(_("could not write '%s'"), path); |
15ed07d5 | 678 | if (fclose(f)) |
2373b650 | 679 | return error_errno(_("writing '%s' failed"), path); |
5b2fd956 | 680 | |
689b8c29 | 681 | out: |
5b2fd956 | 682 | free(cur.ptr); |
5b2fd956 SB |
683 | free(result.ptr); |
684 | ||
685 | return ret; | |
686 | } | |
687 | ||
35843b11 | 688 | static void update_paths(struct repository *r, struct string_list *update) |
5b2fd956 | 689 | { |
0fa5a2ed | 690 | struct lock_file index_lock = LOCK_INIT; |
5b2fd956 | 691 | int i; |
5b2fd956 | 692 | |
3a95f31d | 693 | repo_hold_locked_index(r, &index_lock, LOCK_DIE_ON_ERROR); |
5b2fd956 SB |
694 | |
695 | for (i = 0; i < update->nr; i++) { | |
c455c87c | 696 | struct string_list_item *item = &update->items[i]; |
35843b11 | 697 | if (add_file_to_index(r->index, item->string, 0)) |
89ea9035 | 698 | exit(128); |
2373b650 | 699 | fprintf_ln(stderr, _("Staged '%s' using previous resolution."), |
a14c7ab8 | 700 | item->string); |
5b2fd956 SB |
701 | } |
702 | ||
35843b11 | 703 | if (write_locked_index(r->index, &index_lock, |
61000814 | 704 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) |
2373b650 | 705 | die(_("unable to write new index file")); |
5b2fd956 SB |
706 | } |
707 | ||
629716d2 JH |
708 | static void remove_variant(struct rerere_id *id) |
709 | { | |
710 | unlink_or_warn(rerere_path(id, "postimage")); | |
711 | unlink_or_warn(rerere_path(id, "preimage")); | |
712 | id->collection->status[id->variant] = 0; | |
713 | } | |
714 | ||
8e7768b2 JH |
715 | /* |
716 | * The path indicated by rr_item may still have conflict for which we | |
717 | * have a recorded resolution, in which case replay it and optionally | |
718 | * update it. Or it may have been resolved by the user and we may | |
719 | * only have the preimage for that conflict, in which case the result | |
720 | * needs to be recorded as a resolution in a postimage file. | |
721 | */ | |
35843b11 NTND |
722 | static void do_rerere_one_path(struct index_state *istate, |
723 | struct string_list_item *rr_item, | |
8e7768b2 JH |
724 | struct string_list *update) |
725 | { | |
726 | const char *path = rr_item->string; | |
a13d1370 | 727 | struct rerere_id *id = rr_item->util; |
629716d2 | 728 | struct rerere_dir *rr_dir = id->collection; |
a13d1370 JH |
729 | int variant; |
730 | ||
a13d1370 | 731 | variant = id->variant; |
8e7768b2 | 732 | |
629716d2 JH |
733 | /* Has the user resolved it already? */ |
734 | if (variant >= 0) { | |
35843b11 | 735 | if (!handle_file(istate, path, NULL, NULL)) { |
629716d2 JH |
736 | copy_file(rerere_path(id, "postimage"), path, 0666); |
737 | id->collection->status[variant] |= RR_HAS_POSTIMAGE; | |
2373b650 | 738 | fprintf_ln(stderr, _("Recorded resolution for '%s'."), path); |
629716d2 JH |
739 | free_rerere_id(rr_item); |
740 | rr_item->util = NULL; | |
741 | return; | |
742 | } | |
c0a5423b | 743 | /* |
629716d2 JH |
744 | * There may be other variants that can cleanly |
745 | * replay. Try them and update the variant number for | |
746 | * this one. | |
c0a5423b | 747 | */ |
629716d2 JH |
748 | } |
749 | ||
750 | /* Does any existing resolution apply cleanly? */ | |
751 | for (variant = 0; variant < rr_dir->status_nr; variant++) { | |
752 | const int both = RR_HAS_PREIMAGE | RR_HAS_POSTIMAGE; | |
753 | struct rerere_id vid = *id; | |
754 | ||
755 | if ((rr_dir->status[variant] & both) != both) | |
756 | continue; | |
8e7768b2 | 757 | |
629716d2 | 758 | vid.variant = variant; |
35843b11 | 759 | if (merge(istate, &vid, path)) |
629716d2 JH |
760 | continue; /* failed to replay */ |
761 | ||
762 | /* | |
763 | * If there already is a different variant that applies | |
764 | * cleanly, there is no point maintaining our own variant. | |
765 | */ | |
766 | if (0 <= id->variant && id->variant != variant) | |
767 | remove_variant(id); | |
8e7768b2 JH |
768 | |
769 | if (rerere_autoupdate) | |
770 | string_list_insert(update, path); | |
771 | else | |
2373b650 TG |
772 | fprintf_ln(stderr, |
773 | _("Resolved '%s' using previous resolution."), | |
774 | path); | |
629716d2 JH |
775 | free_rerere_id(rr_item); |
776 | rr_item->util = NULL; | |
925d73c4 | 777 | return; |
8e7768b2 | 778 | } |
629716d2 JH |
779 | |
780 | /* None of the existing one applies; we need a new variant */ | |
781 | assign_variant(id); | |
782 | ||
783 | variant = id->variant; | |
35843b11 | 784 | handle_file(istate, path, NULL, rerere_path(id, "preimage")); |
629716d2 JH |
785 | if (id->collection->status[variant] & RR_HAS_POSTIMAGE) { |
786 | const char *path = rerere_path(id, "postimage"); | |
787 | if (unlink(path)) | |
2373b650 | 788 | die_errno(_("cannot unlink stray '%s'"), path); |
629716d2 JH |
789 | id->collection->status[variant] &= ~RR_HAS_POSTIMAGE; |
790 | } | |
791 | id->collection->status[variant] |= RR_HAS_PREIMAGE; | |
2373b650 | 792 | fprintf_ln(stderr, _("Recorded preimage for '%s'"), path); |
8e7768b2 JH |
793 | } |
794 | ||
35843b11 NTND |
795 | static int do_plain_rerere(struct repository *r, |
796 | struct string_list *rr, int fd) | |
5b2fd956 | 797 | { |
183113a5 TF |
798 | struct string_list conflict = STRING_LIST_INIT_DUP; |
799 | struct string_list update = STRING_LIST_INIT_DUP; | |
5b2fd956 SB |
800 | int i; |
801 | ||
35843b11 | 802 | find_conflict(r, &conflict); |
5b2fd956 SB |
803 | |
804 | /* | |
cc899eca JH |
805 | * MERGE_RR records paths with conflicts immediately after |
806 | * merge failed. Some of the conflicted paths might have been | |
807 | * hand resolved in the working tree since then, but the | |
808 | * initial run would catch all and register their preimages. | |
5b2fd956 | 809 | */ |
5b2fd956 | 810 | for (i = 0; i < conflict.nr; i++) { |
1d51eced | 811 | struct rerere_id *id; |
0d7c419a | 812 | unsigned char hash[GIT_MAX_RAWSZ]; |
c455c87c | 813 | const char *path = conflict.items[i].string; |
1d51eced | 814 | int ret; |
5b2fd956 | 815 | |
c7a25d37 JH |
816 | /* |
817 | * Ask handle_file() to scan and assign a | |
818 | * conflict ID. No need to write anything out | |
819 | * yet. | |
820 | */ | |
d829d491 | 821 | ret = handle_file(r->index, path, hash, NULL); |
bd7dfa54 | 822 | if (ret != 0 && string_list_has_string(rr, path)) { |
93406a28 TG |
823 | remove_variant(string_list_lookup(rr, path)->util); |
824 | string_list_remove(rr, path, 1); | |
825 | } | |
c7a25d37 JH |
826 | if (ret < 1) |
827 | continue; | |
5b2fd956 | 828 | |
0d7c419a | 829 | id = new_rerere_id(hash); |
18bb9934 | 830 | string_list_insert(rr, path)->util = id; |
cc899eca | 831 | |
c0a5423b JH |
832 | /* Ensure that the directory exists. */ |
833 | mkdir_in_gitdir(rerere_path(id, NULL)); | |
5b2fd956 SB |
834 | } |
835 | ||
8e7768b2 | 836 | for (i = 0; i < rr->nr; i++) |
35843b11 | 837 | do_rerere_one_path(r->index, &rr->items[i], &update); |
5b2fd956 SB |
838 | |
839 | if (update.nr) | |
35843b11 | 840 | update_paths(r, &update); |
5b2fd956 SB |
841 | |
842 | return write_rr(rr, fd); | |
843 | } | |
844 | ||
633e5ad3 | 845 | static void git_rerere_config(void) |
5b2fd956 | 846 | { |
633e5ad3 TA |
847 | git_config_get_bool("rerere.enabled", &rerere_enabled); |
848 | git_config_get_bool("rerere.autoupdate", &rerere_autoupdate); | |
849 | git_config(git_default_config, NULL); | |
5b2fd956 SB |
850 | } |
851 | ||
f932729c JK |
852 | static GIT_PATH_FUNC(git_path_rr_cache, "rr-cache") |
853 | ||
5b2fd956 SB |
854 | static int is_rerere_enabled(void) |
855 | { | |
5b2fd956 SB |
856 | int rr_cache_exists; |
857 | ||
858 | if (!rerere_enabled) | |
859 | return 0; | |
860 | ||
f932729c | 861 | rr_cache_exists = is_directory(git_path_rr_cache()); |
5b2fd956 SB |
862 | if (rerere_enabled < 0) |
863 | return rr_cache_exists; | |
864 | ||
f932729c | 865 | if (!rr_cache_exists && mkdir_in_gitdir(git_path_rr_cache())) |
2373b650 | 866 | die(_("could not create directory '%s'"), git_path_rr_cache()); |
5b2fd956 SB |
867 | return 1; |
868 | } | |
869 | ||
55e6b354 | 870 | int setup_rerere(struct repository *r, struct string_list *merge_rr, int flags) |
5b2fd956 SB |
871 | { |
872 | int fd; | |
873 | ||
633e5ad3 | 874 | git_rerere_config(); |
5b2fd956 SB |
875 | if (!is_rerere_enabled()) |
876 | return -1; | |
877 | ||
cb6020bb JH |
878 | if (flags & (RERERE_AUTOUPDATE|RERERE_NOAUTOUPDATE)) |
879 | rerere_autoupdate = !!(flags & RERERE_AUTOUPDATE); | |
9dd330e6 JK |
880 | if (flags & RERERE_READONLY) |
881 | fd = 0; | |
882 | else | |
102de880 | 883 | fd = hold_lock_file_for_update(&write_lock, |
55e6b354 | 884 | git_path_merge_rr(r), |
9dd330e6 | 885 | LOCK_DIE_ON_ERROR); |
55e6b354 | 886 | read_rr(r, merge_rr); |
5b2fd956 SB |
887 | return fd; |
888 | } | |
889 | ||
cc899eca JH |
890 | /* |
891 | * The main entry point that is called internally from codepaths that | |
892 | * perform mergy operations, possibly leaving conflicted index entries | |
893 | * and working tree files. | |
894 | */ | |
35843b11 | 895 | int repo_rerere(struct repository *r, int flags) |
5b2fd956 | 896 | { |
183113a5 | 897 | struct string_list merge_rr = STRING_LIST_INIT_DUP; |
1869bbe1 | 898 | int fd, status; |
5b2fd956 | 899 | |
55e6b354 | 900 | fd = setup_rerere(r, &merge_rr, flags); |
5b2fd956 SB |
901 | if (fd < 0) |
902 | return 0; | |
35843b11 | 903 | status = do_plain_rerere(r, &merge_rr, fd); |
1869bbe1 JH |
904 | free_rerere_dirs(); |
905 | return status; | |
5b2fd956 | 906 | } |
dea4562b | 907 | |
3d730ed9 JH |
908 | /* |
909 | * Subclass of rerere_io that reads from an in-core buffer that is a | |
910 | * strbuf | |
911 | */ | |
912 | struct rerere_io_mem { | |
913 | struct rerere_io io; | |
914 | struct strbuf input; | |
915 | }; | |
916 | ||
917 | /* | |
918 | * ... and its getline() method implementation | |
919 | */ | |
920 | static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_) | |
921 | { | |
922 | struct rerere_io_mem *io = (struct rerere_io_mem *)io_; | |
923 | char *ep; | |
924 | size_t len; | |
925 | ||
926 | strbuf_release(sb); | |
927 | if (!io->input.len) | |
928 | return -1; | |
929 | ep = memchr(io->input.buf, '\n', io->input.len); | |
930 | if (!ep) | |
931 | ep = io->input.buf + io->input.len; | |
932 | else if (*ep == '\n') | |
933 | ep++; | |
934 | len = ep - io->input.buf; | |
935 | strbuf_add(sb, io->input.buf, len); | |
936 | strbuf_remove(&io->input, 0, len); | |
937 | return 0; | |
938 | } | |
939 | ||
d829d491 JH |
940 | static int handle_cache(struct index_state *istate, |
941 | const char *path, unsigned char *hash, const char *output) | |
3d730ed9 JH |
942 | { |
943 | mmfile_t mmfile[3] = {{NULL}}; | |
944 | mmbuffer_t result = {NULL, 0}; | |
945 | const struct cache_entry *ce; | |
221444f5 | 946 | int pos, len, i, has_conflicts; |
3d730ed9 | 947 | struct rerere_io_mem io; |
35843b11 | 948 | int marker_size = ll_merge_marker_size(istate, path); |
3d730ed9 JH |
949 | |
950 | /* | |
951 | * Reproduce the conflicted merge in-core | |
952 | */ | |
953 | len = strlen(path); | |
35843b11 | 954 | pos = index_name_pos(istate, path, len); |
3d730ed9 JH |
955 | if (0 <= pos) |
956 | return -1; | |
957 | pos = -pos - 1; | |
958 | ||
35843b11 | 959 | while (pos < istate->cache_nr) { |
3d730ed9 JH |
960 | enum object_type type; |
961 | unsigned long size; | |
962 | ||
35843b11 | 963 | ce = istate->cache[pos++]; |
3d730ed9 JH |
964 | if (ce_namelen(ce) != len || memcmp(ce->name, path, len)) |
965 | break; | |
966 | i = ce_stage(ce) - 1; | |
967 | if (!mmfile[i].ptr) { | |
b4f5aca4 | 968 | mmfile[i].ptr = read_object_file(&ce->oid, &type, |
969 | &size); | |
3d730ed9 JH |
970 | mmfile[i].size = size; |
971 | } | |
972 | } | |
973 | for (i = 0; i < 3; i++) | |
974 | if (!mmfile[i].ptr && !mmfile[i].size) | |
975 | mmfile[i].ptr = xstrdup(""); | |
976 | ||
977 | /* | |
978 | * NEEDSWORK: handle conflicts from merges with | |
979 | * merge.renormalize set, too? | |
980 | */ | |
981 | ll_merge(&result, path, &mmfile[0], NULL, | |
982 | &mmfile[1], "ours", | |
32eaa468 | 983 | &mmfile[2], "theirs", |
35843b11 | 984 | istate, NULL); |
3d730ed9 JH |
985 | for (i = 0; i < 3; i++) |
986 | free(mmfile[i].ptr); | |
987 | ||
988 | memset(&io, 0, sizeof(io)); | |
989 | io.io.getline = rerere_mem_getline; | |
990 | if (output) | |
991 | io.io.output = fopen(output, "w"); | |
992 | else | |
993 | io.io.output = NULL; | |
994 | strbuf_init(&io.input, 0); | |
995 | strbuf_attach(&io.input, result.ptr, result.size, result.size); | |
996 | ||
997 | /* | |
998 | * Grab the conflict ID and optionally write the original | |
999 | * contents with conflict markers out. | |
1000 | */ | |
0d7c419a | 1001 | has_conflicts = handle_path(hash, (struct rerere_io *)&io, marker_size); |
3d730ed9 JH |
1002 | strbuf_release(&io.input); |
1003 | if (io.io.output) | |
1004 | fclose(io.io.output); | |
221444f5 | 1005 | return has_conflicts; |
5b2fd956 | 1006 | } |
dea4562b | 1007 | |
35843b11 NTND |
1008 | static int rerere_forget_one_path(struct index_state *istate, |
1009 | const char *path, | |
1010 | struct string_list *rr) | |
dea4562b JH |
1011 | { |
1012 | const char *filename; | |
1d51eced | 1013 | struct rerere_id *id; |
0d7c419a | 1014 | unsigned char hash[GIT_MAX_RAWSZ]; |
dea4562b | 1015 | int ret; |
8d9b5a4a | 1016 | struct string_list_item *item; |
dea4562b | 1017 | |
963ec003 JH |
1018 | /* |
1019 | * Recreate the original conflict from the stages in the | |
1020 | * index and compute the conflict ID | |
1021 | */ | |
d829d491 | 1022 | ret = handle_cache(istate, path, hash, NULL); |
dea4562b | 1023 | if (ret < 1) |
2373b650 | 1024 | return error(_("could not parse conflict hunks in '%s'"), path); |
963ec003 JH |
1025 | |
1026 | /* Nuke the recorded resolution for the conflict */ | |
0d7c419a | 1027 | id = new_rerere_id(hash); |
890fca84 JH |
1028 | |
1029 | for (id->variant = 0; | |
1030 | id->variant < id->collection->status_nr; | |
1031 | id->variant++) { | |
1032 | mmfile_t cur = { NULL, 0 }; | |
1033 | mmbuffer_t result = {NULL, 0}; | |
1034 | int cleanly_resolved; | |
1035 | ||
1036 | if (!has_rerere_resolution(id)) | |
1037 | continue; | |
1038 | ||
d829d491 | 1039 | handle_cache(istate, path, hash, rerere_path(id, "thisimage")); |
890fca84 JH |
1040 | if (read_mmfile(&cur, rerere_path(id, "thisimage"))) { |
1041 | free(cur.ptr); | |
2373b650 | 1042 | error(_("failed to update conflicted state in '%s'"), path); |
8f449614 | 1043 | goto fail_exit; |
890fca84 | 1044 | } |
35843b11 | 1045 | cleanly_resolved = !try_merge(istate, id, path, &cur, &result); |
890fca84 JH |
1046 | free(result.ptr); |
1047 | free(cur.ptr); | |
1048 | if (cleanly_resolved) | |
1049 | break; | |
1050 | } | |
1051 | ||
8f449614 | 1052 | if (id->collection->status_nr <= id->variant) { |
2373b650 | 1053 | error(_("no remembered resolution for '%s'"), path); |
8f449614 JH |
1054 | goto fail_exit; |
1055 | } | |
890fca84 | 1056 | |
18bb9934 | 1057 | filename = rerere_path(id, "postimage"); |
8f449614 JH |
1058 | if (unlink(filename)) { |
1059 | if (errno == ENOENT) | |
2373b650 | 1060 | error(_("no remembered resolution for '%s'"), path); |
8f449614 | 1061 | else |
2373b650 | 1062 | error_errno(_("cannot unlink '%s'"), filename); |
8f449614 | 1063 | goto fail_exit; |
d9d501b0 | 1064 | } |
dea4562b | 1065 | |
963ec003 JH |
1066 | /* |
1067 | * Update the preimage so that the user can resolve the | |
1068 | * conflict in the working tree, run us again to record | |
1069 | * the postimage. | |
1070 | */ | |
d829d491 | 1071 | handle_cache(istate, path, hash, rerere_path(id, "preimage")); |
2373b650 | 1072 | fprintf_ln(stderr, _("Updated preimage for '%s'"), path); |
dea4562b | 1073 | |
963ec003 JH |
1074 | /* |
1075 | * And remember that we can record resolution for this | |
1076 | * conflict when the user is done. | |
1077 | */ | |
8d9b5a4a | 1078 | item = string_list_insert(rr, path); |
1d51eced | 1079 | free_rerere_id(item); |
18bb9934 | 1080 | item->util = id; |
2373b650 | 1081 | fprintf(stderr, _("Forgot resolution for '%s'\n"), path); |
dea4562b | 1082 | return 0; |
8f449614 JH |
1083 | |
1084 | fail_exit: | |
1085 | free(id); | |
1086 | return -1; | |
dea4562b JH |
1087 | } |
1088 | ||
35843b11 | 1089 | int rerere_forget(struct repository *r, struct pathspec *pathspec) |
dea4562b JH |
1090 | { |
1091 | int i, fd; | |
183113a5 TF |
1092 | struct string_list conflict = STRING_LIST_INIT_DUP; |
1093 | struct string_list merge_rr = STRING_LIST_INIT_DUP; | |
dea4562b | 1094 | |
e1ff0a32 | 1095 | if (repo_read_index(r) < 0) |
2373b650 | 1096 | return error(_("index file corrupt")); |
dea4562b | 1097 | |
55e6b354 | 1098 | fd = setup_rerere(r, &merge_rr, RERERE_NOAUTOUPDATE); |
0544574c JK |
1099 | if (fd < 0) |
1100 | return 0; | |
dea4562b | 1101 | |
963ec003 JH |
1102 | /* |
1103 | * The paths may have been resolved (incorrectly); | |
1104 | * recover the original conflicted state and then | |
1105 | * find the conflicted paths. | |
1106 | */ | |
35843b11 NTND |
1107 | unmerge_index(r->index, pathspec); |
1108 | find_conflict(r, &conflict); | |
dea4562b JH |
1109 | for (i = 0; i < conflict.nr; i++) { |
1110 | struct string_list_item *it = &conflict.items[i]; | |
35843b11 | 1111 | if (!match_pathspec(r->index, pathspec, it->string, |
ae8d0824 | 1112 | strlen(it->string), 0, NULL, 0)) |
dea4562b | 1113 | continue; |
35843b11 | 1114 | rerere_forget_one_path(r->index, it->string, &merge_rr); |
dea4562b JH |
1115 | } |
1116 | return write_rr(&merge_rr, fd); | |
1117 | } | |
0f891e7d | 1118 | |
e828de82 JH |
1119 | /* |
1120 | * Garbage collection support | |
1121 | */ | |
1d51eced | 1122 | |
5ea82279 | 1123 | static timestamp_t rerere_created_at(struct rerere_id *id) |
0f891e7d JH |
1124 | { |
1125 | struct stat st; | |
1d51eced | 1126 | |
18bb9934 | 1127 | return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime; |
0f891e7d JH |
1128 | } |
1129 | ||
5ea82279 | 1130 | static timestamp_t rerere_last_used_at(struct rerere_id *id) |
0f891e7d JH |
1131 | { |
1132 | struct stat st; | |
1d51eced | 1133 | |
18bb9934 | 1134 | return stat(rerere_path(id, "postimage"), &st) ? (time_t) 0 : st.st_mtime; |
0f891e7d JH |
1135 | } |
1136 | ||
e828de82 JH |
1137 | /* |
1138 | * Remove the recorded resolution for a given conflict ID | |
1139 | */ | |
1d51eced | 1140 | static void unlink_rr_item(struct rerere_id *id) |
0f891e7d | 1141 | { |
1be1e851 JH |
1142 | unlink_or_warn(rerere_path(id, "thisimage")); |
1143 | remove_variant(id); | |
1144 | id->collection->status[id->variant] = 0; | |
1145 | } | |
1146 | ||
5ea82279 JH |
1147 | static void prune_one(struct rerere_id *id, |
1148 | timestamp_t cutoff_resolve, timestamp_t cutoff_noresolve) | |
1be1e851 | 1149 | { |
5ea82279 JH |
1150 | timestamp_t then; |
1151 | timestamp_t cutoff; | |
1be1e851 JH |
1152 | |
1153 | then = rerere_last_used_at(id); | |
1154 | if (then) | |
1155 | cutoff = cutoff_resolve; | |
1156 | else { | |
1157 | then = rerere_created_at(id); | |
1158 | if (!then) | |
1159 | return; | |
1160 | cutoff = cutoff_noresolve; | |
1161 | } | |
5ea82279 | 1162 | if (then < cutoff) |
1be1e851 | 1163 | unlink_rr_item(id); |
0f891e7d JH |
1164 | } |
1165 | ||
2bc1a87e JK |
1166 | /* Does the basename in "path" look plausibly like an rr-cache entry? */ |
1167 | static int is_rr_cache_dirname(const char *path) | |
1168 | { | |
098c173f JK |
1169 | struct object_id oid; |
1170 | const char *end; | |
1171 | return !parse_oid_hex(path, &oid, &end) && !*end; | |
2bc1a87e JK |
1172 | } |
1173 | ||
55e6b354 | 1174 | void rerere_gc(struct repository *r, struct string_list *rr) |
0f891e7d JH |
1175 | { |
1176 | struct string_list to_remove = STRING_LIST_INIT_DUP; | |
1177 | DIR *dir; | |
1178 | struct dirent *e; | |
1be1e851 | 1179 | int i; |
5ea82279 JH |
1180 | timestamp_t now = time(NULL); |
1181 | timestamp_t cutoff_noresolve = now - 15 * 86400; | |
1182 | timestamp_t cutoff_resolve = now - 60 * 86400; | |
0f891e7d | 1183 | |
55e6b354 | 1184 | if (setup_rerere(r, rr, 0) < 0) |
9dd330e6 JK |
1185 | return; |
1186 | ||
6e96cb52 JH |
1187 | git_config_get_expiry_in_days("gc.rerereresolved", &cutoff_resolve, now); |
1188 | git_config_get_expiry_in_days("gc.rerereunresolved", &cutoff_noresolve, now); | |
633e5ad3 | 1189 | git_config(git_default_config, NULL); |
0f891e7d JH |
1190 | dir = opendir(git_path("rr-cache")); |
1191 | if (!dir) | |
2373b650 | 1192 | die_errno(_("unable to open rr-cache directory")); |
e828de82 | 1193 | /* Collect stale conflict IDs ... */ |
b548f0f1 | 1194 | while ((e = readdir_skip_dot_and_dotdot(dir))) { |
1be1e851 JH |
1195 | struct rerere_dir *rr_dir; |
1196 | struct rerere_id id; | |
1197 | int now_empty; | |
1198 | ||
2bc1a87e | 1199 | if (!is_rr_cache_dirname(e->d_name)) |
1be1e851 JH |
1200 | continue; /* or should we remove e->d_name? */ |
1201 | ||
2bc1a87e JK |
1202 | rr_dir = find_rerere_dir(e->d_name); |
1203 | ||
1be1e851 JH |
1204 | now_empty = 1; |
1205 | for (id.variant = 0, id.collection = rr_dir; | |
1206 | id.variant < id.collection->status_nr; | |
1207 | id.variant++) { | |
5ea82279 | 1208 | prune_one(&id, cutoff_resolve, cutoff_noresolve); |
1be1e851 JH |
1209 | if (id.collection->status[id.variant]) |
1210 | now_empty = 0; | |
0f891e7d | 1211 | } |
1be1e851 | 1212 | if (now_empty) |
0f891e7d JH |
1213 | string_list_append(&to_remove, e->d_name); |
1214 | } | |
a9930e35 | 1215 | closedir(dir); |
1be1e851 JH |
1216 | |
1217 | /* ... and then remove the empty directories */ | |
0f891e7d | 1218 | for (i = 0; i < to_remove.nr; i++) |
1be1e851 | 1219 | rmdir(git_path("rr-cache/%s", to_remove.items[i].string)); |
0f891e7d | 1220 | string_list_clear(&to_remove, 0); |
9dd330e6 | 1221 | rollback_lock_file(&write_lock); |
0f891e7d JH |
1222 | } |
1223 | ||
e828de82 JH |
1224 | /* |
1225 | * During a conflict resolution, after "rerere" recorded the | |
1226 | * preimages, abandon them if the user did not resolve them or | |
1227 | * record their resolutions. And drop $GIT_DIR/MERGE_RR. | |
1228 | * | |
1229 | * NEEDSWORK: shouldn't we be calling this from "reset --hard"? | |
1230 | */ | |
55e6b354 | 1231 | void rerere_clear(struct repository *r, struct string_list *merge_rr) |
0f891e7d JH |
1232 | { |
1233 | int i; | |
1234 | ||
55e6b354 | 1235 | if (setup_rerere(r, merge_rr, 0) < 0) |
9dd330e6 JK |
1236 | return; |
1237 | ||
0f891e7d | 1238 | for (i = 0; i < merge_rr->nr; i++) { |
1d51eced | 1239 | struct rerere_id *id = merge_rr->items[i].util; |
1be1e851 | 1240 | if (!has_rerere_resolution(id)) { |
18bb9934 | 1241 | unlink_rr_item(id); |
1be1e851 JH |
1242 | rmdir(rerere_path(id, NULL)); |
1243 | } | |
0f891e7d | 1244 | } |
55e6b354 | 1245 | unlink_or_warn(git_path_merge_rr(r)); |
9dd330e6 | 1246 | rollback_lock_file(&write_lock); |
0f891e7d | 1247 | } |