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