4 #include "string-list.h"
6 #include "xdiff-interface.h"
8 #include "resolve-undo.h"
12 #include "sha1-lookup.h"
16 #define THREE_STAGED 2
17 void *RERERE_RESOLVED
= &RERERE_RESOLVED
;
19 /* if rerere_enabled == -1, fall back to detection of .git/rr-cache */
20 static int rerere_enabled
= -1;
22 /* automatically update cleanly resolved paths to the index */
23 static int rerere_autoupdate
;
25 static int rerere_dir_nr
;
26 static int rerere_dir_alloc
;
28 #define RR_HAS_POSTIMAGE 1
29 #define RR_HAS_PREIMAGE 2
30 static struct rerere_dir
{
31 unsigned char sha1
[20];
32 int status_alloc
, status_nr
;
33 unsigned char *status
;
36 static void free_rerere_dirs(void)
39 for (i
= 0; i
< rerere_dir_nr
; i
++) {
40 free(rerere_dir
[i
]->status
);
43 FREE_AND_NULL(rerere_dir
);
44 rerere_dir_nr
= rerere_dir_alloc
= 0;
47 static void free_rerere_id(struct string_list_item
*item
)
52 static const char *rerere_id_hex(const struct rerere_id
*id
)
54 return sha1_to_hex(id
->collection
->sha1
);
57 static void fit_variant(struct rerere_dir
*rr_dir
, int 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
;
68 static void assign_variant(struct rerere_id
*id
)
71 struct rerere_dir
*rr_dir
= id
->collection
;
73 variant
= id
->variant
;
75 for (variant
= 0; variant
< rr_dir
->status_nr
; variant
++)
76 if (!rr_dir
->status
[variant
])
79 fit_variant(rr_dir
, variant
);
80 id
->variant
= variant
;
83 const char *rerere_path(const struct rerere_id
*id
, const char *file
)
86 return git_path("rr-cache/%s", rerere_id_hex(id
));
89 return git_path("rr-cache/%s/%s", rerere_id_hex(id
), file
);
91 return git_path("rr-cache/%s/%s.%d",
92 rerere_id_hex(id
), file
, id
->variant
);
95 static int is_rr_file(const char *name
, const char *filename
, int *variant
)
100 if (!strcmp(name
, filename
)) {
104 if (!skip_prefix(name
, filename
, &suffix
) || *suffix
!= '.')
108 *variant
= strtol(suffix
+ 1, &ep
, 10);
114 static void scan_rerere_dir(struct rerere_dir
*rr_dir
)
117 DIR *dir
= opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir
->sha1
)));
121 while ((de
= readdir(dir
)) != NULL
) {
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
;
135 static const unsigned char *rerere_dir_sha1(size_t i
, void *table
)
137 struct rerere_dir
**rr_dir
= table
;
138 return rr_dir
[i
]->sha1
;
141 static struct rerere_dir
*find_rerere_dir(const char *hex
)
143 unsigned char sha1
[20];
144 struct rerere_dir
*rr_dir
;
147 if (get_sha1_hex(hex
, sha1
))
148 return NULL
; /* BUG */
149 pos
= sha1_pos(sha1
, rerere_dir
, rerere_dir_nr
, rerere_dir_sha1
);
151 rr_dir
= xmalloc(sizeof(*rr_dir
));
152 hashcpy(rr_dir
->sha1
, sha1
);
153 rr_dir
->status
= NULL
;
154 rr_dir
->status_nr
= 0;
155 rr_dir
->status_alloc
= 0;
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. */
162 MOVE_ARRAY(rerere_dir
+ pos
+ 1, rerere_dir
+ pos
,
163 rerere_dir_nr
- pos
- 1);
164 rerere_dir
[pos
] = rr_dir
;
165 scan_rerere_dir(rr_dir
);
167 return rerere_dir
[pos
];
170 static int has_rerere_resolution(const struct rerere_id
*id
)
172 const int both
= RR_HAS_POSTIMAGE
|RR_HAS_PREIMAGE
;
173 int variant
= id
->variant
;
177 return ((id
->collection
->status
[variant
] & both
) == both
);
180 static struct rerere_id
*new_rerere_id_hex(char *hex
)
182 struct rerere_id
*id
= xmalloc(sizeof(*id
));
183 id
->collection
= find_rerere_dir(hex
);
184 id
->variant
= -1; /* not known yet */
188 static struct rerere_id
*new_rerere_id(unsigned char *sha1
)
190 return new_rerere_id_hex(sha1_to_hex(sha1
));
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).
200 static void read_rr(struct string_list
*rr
)
202 struct strbuf buf
= STRBUF_INIT
;
203 FILE *in
= fopen_or_warn(git_path_merge_rr(), "r");
207 while (!strbuf_getwholeline(&buf
, in
, '\0')) {
209 unsigned char sha1
[20];
210 struct rerere_id
*id
;
213 /* There has to be the hash, tab, path and then NUL */
214 if (buf
.len
< 42 || get_sha1_hex(buf
.buf
, sha1
))
215 die(_("corrupt MERGE_RR"));
217 if (buf
.buf
[40] != '.') {
222 variant
= strtol(buf
.buf
+ 41, &path
, 10);
224 die(_("corrupt MERGE_RR"));
226 if (*(path
++) != '\t')
227 die(_("corrupt MERGE_RR"));
229 id
= new_rerere_id_hex(buf
.buf
);
230 id
->variant
= variant
;
231 string_list_insert(rr
, path
)->util
= id
;
233 strbuf_release(&buf
);
237 static struct lock_file write_lock
;
239 static int write_rr(struct string_list
*rr
, int out_fd
)
242 for (i
= 0; i
< rr
->nr
; i
++) {
243 struct strbuf buf
= STRBUF_INIT
;
244 struct rerere_id
*id
;
246 assert(rr
->items
[i
].util
!= RERERE_RESOLVED
);
248 id
= rr
->items
[i
].util
;
251 assert(id
->variant
>= 0);
253 strbuf_addf(&buf
, "%s.%d\t%s%c",
254 rerere_id_hex(id
), id
->variant
,
255 rr
->items
[i
].string
, 0);
257 strbuf_addf(&buf
, "%s\t%s%c",
259 rr
->items
[i
].string
, 0);
261 if (write_in_full(out_fd
, buf
.buf
, buf
.len
) < 0)
262 die(_("unable to write rerere record"));
264 strbuf_release(&buf
);
266 if (commit_lock_file(&write_lock
) != 0)
267 die(_("unable to write rerere record"));
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
280 int (*getline
)(struct strbuf
*, struct rerere_io
*);
283 /* some more stuff */
286 static void ferr_write(const void *p
, size_t count
, FILE *fp
, int *err
)
290 if (fwrite(p
, count
, 1, fp
) != 1)
294 static inline void ferr_puts(const char *s
, FILE *fp
, int *err
)
296 ferr_write(s
, strlen(s
), fp
, err
);
299 static void rerere_io_putstr(const char *str
, struct rerere_io
*io
)
302 ferr_puts(str
, io
->output
, &io
->wrerror
);
306 * Write a conflict marker to io->output (if defined).
308 static void rerere_io_putconflict(int ch
, int size
, struct rerere_io
*io
)
313 if (size
<= sizeof(buf
) - 2) {
314 memset(buf
, ch
, size
);
316 buf
[size
+ 1] = '\0';
319 int sz
= sizeof(buf
) - 1;
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.
328 sz
-= (sz
- size
) + 1;
333 rerere_io_putstr(buf
, io
);
337 static void rerere_io_putmem(const char *mem
, size_t sz
, struct rerere_io
*io
)
340 ferr_write(mem
, sz
, io
->output
, &io
->wrerror
);
344 * Subclass of rerere_io that reads from an on-disk file
346 struct rerere_io_file
{
352 * ... and its getline() method implementation
354 static int rerere_file_getline(struct strbuf
*sb
, struct rerere_io
*io_
)
356 struct rerere_io_file
*io
= (struct rerere_io_file
*)io_
;
357 return strbuf_getwholeline(sb
, io
->input
, '\n');
361 * Require the exact number of conflict marker letters, no more, no
362 * less, followed by SP or any whitespace
365 static int is_cmarker(char *buf
, int marker_char
, int marker_size
)
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.
377 want_sp
= (marker_char
== '<') || (marker_char
== '>');
379 while (marker_size
--)
380 if (*buf
++ != marker_char
)
382 if (want_sp
&& *buf
!= ' ')
384 return isspace(*buf
);
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.
396 * Return the number of conflict hunks found.
398 static int handle_path(unsigned char *sha1
, struct rerere_io
*io
, int marker_size
)
403 RR_CONTEXT
= 0, RR_SIDE_1
, RR_SIDE_2
, RR_ORIGINAL
405 struct strbuf one
= STRBUF_INIT
, two
= STRBUF_INIT
;
406 struct strbuf buf
= STRBUF_INIT
;
411 while (!io
->getline(&buf
, io
)) {
412 if (is_cmarker(buf
.buf
, '<', marker_size
)) {
413 if (hunk
!= RR_CONTEXT
)
416 } else if (is_cmarker(buf
.buf
, '|', marker_size
)) {
417 if (hunk
!= RR_SIDE_1
)
420 } else if (is_cmarker(buf
.buf
, '=', marker_size
)) {
421 if (hunk
!= RR_SIDE_1
&& hunk
!= RR_ORIGINAL
)
424 } else if (is_cmarker(buf
.buf
, '>', marker_size
)) {
425 if (hunk
!= RR_SIDE_2
)
427 if (strbuf_cmp(&one
, &two
) > 0)
428 strbuf_swap(&one
, &two
);
431 rerere_io_putconflict('<', marker_size
, io
);
432 rerere_io_putmem(one
.buf
, one
.len
, io
);
433 rerere_io_putconflict('=', marker_size
, io
);
434 rerere_io_putmem(two
.buf
, two
.len
, io
);
435 rerere_io_putconflict('>', marker_size
, io
);
437 git_SHA1_Update(&ctx
, one
.buf
? one
.buf
: "",
439 git_SHA1_Update(&ctx
, two
.buf
? two
.buf
: "",
444 } else if (hunk
== RR_SIDE_1
)
445 strbuf_addbuf(&one
, &buf
);
446 else if (hunk
== RR_ORIGINAL
)
448 else if (hunk
== RR_SIDE_2
)
449 strbuf_addbuf(&two
, &buf
);
451 rerere_io_putstr(buf
.buf
, io
);
454 hunk
= 99; /* force error exit */
457 strbuf_release(&one
);
458 strbuf_release(&two
);
459 strbuf_release(&buf
);
462 git_SHA1_Final(sha1
, &ctx
);
463 if (hunk
!= RR_CONTEXT
)
469 * Scan the path for conflicts, do the "handle_path()" thing above, and
470 * return the number of conflict hunks found.
472 static int handle_file(const char *path
, unsigned char *sha1
, const char *output
)
475 struct rerere_io_file io
;
476 int marker_size
= ll_merge_marker_size(path
);
478 memset(&io
, 0, sizeof(io
));
479 io
.io
.getline
= rerere_file_getline
;
480 io
.input
= fopen(path
, "r");
483 return error_errno(_("could not open '%s'"), path
);
486 io
.io
.output
= fopen(output
, "w");
488 error_errno(_("could not write '%s'"), output
);
494 hunk_no
= handle_path(sha1
, (struct rerere_io
*)&io
, marker_size
);
498 error(_("there were errors while writing '%s' (%s)"),
499 path
, strerror(io
.io
.wrerror
));
500 if (io
.io
.output
&& fclose(io
.io
.output
))
501 io
.io
.wrerror
= error_errno(_("failed to flush '%s'"), path
);
505 unlink_or_warn(output
);
506 return error(_("could not parse conflict hunks in '%s'"), path
);
514 * Look at a cache entry at "i" and see if it is not conflicting,
515 * conflicting and we are willing to handle, or conflicting and
516 * we are unable to handle, and return the determination in *type.
517 * Return the cache index to be looked at next, by skipping the
518 * stages we have already looked at in this invocation of this
521 static int check_one_conflict(int i
, int *type
)
523 const struct cache_entry
*e
= active_cache
[i
];
531 while (ce_stage(active_cache
[i
]) == 1)
534 /* Only handle regular files with both stages #2 and #3 */
535 if (i
+ 1 < active_nr
) {
536 const struct cache_entry
*e2
= active_cache
[i
];
537 const struct cache_entry
*e3
= active_cache
[i
+ 1];
538 if (ce_stage(e2
) == 2 &&
540 ce_same_name(e
, e3
) &&
541 S_ISREG(e2
->ce_mode
) &&
542 S_ISREG(e3
->ce_mode
))
543 *type
= THREE_STAGED
;
546 /* Skip the entries with the same name */
547 while (i
< active_nr
&& ce_same_name(e
, active_cache
[i
]))
553 * Scan the index and find paths that have conflicts that rerere can
554 * handle, i.e. the ones that has both stages #2 and #3.
556 * NEEDSWORK: we do not record or replay a previous "resolve by
557 * deletion" for a delete-modify conflict, as that is inherently risky
558 * without knowing what modification is being discarded. The only
559 * safe case, i.e. both side doing the deletion and modification that
560 * are identical to the previous round, might want to be handled,
563 static int find_conflict(struct string_list
*conflict
)
566 if (read_cache() < 0)
567 return error(_("index file corrupt"));
569 for (i
= 0; i
< active_nr
;) {
571 const struct cache_entry
*e
= active_cache
[i
];
572 i
= check_one_conflict(i
, &conflict_type
);
573 if (conflict_type
== THREE_STAGED
)
574 string_list_insert(conflict
, (const char *)e
->name
);
580 * The merge_rr list is meant to hold outstanding conflicted paths
581 * that rerere could handle. Abuse the list by adding other types of
582 * entries to allow the caller to show "rerere remaining".
584 * - Conflicted paths that rerere does not handle are added
585 * - Conflicted paths that have been resolved are marked as such
586 * by storing RERERE_RESOLVED to .util field (where conflict ID
587 * is expected to be stored).
589 * Do *not* write MERGE_RR file out after calling this function.
591 * NEEDSWORK: we may want to fix the caller that implements "rerere
592 * remaining" to do this without abusing merge_rr.
594 int rerere_remaining(struct string_list
*merge_rr
)
597 if (setup_rerere(merge_rr
, RERERE_READONLY
))
599 if (read_cache() < 0)
600 return error(_("index file corrupt"));
602 for (i
= 0; i
< active_nr
;) {
604 const struct cache_entry
*e
= active_cache
[i
];
605 i
= check_one_conflict(i
, &conflict_type
);
606 if (conflict_type
== PUNTED
)
607 string_list_insert(merge_rr
, (const char *)e
->name
);
608 else if (conflict_type
== RESOLVED
) {
609 struct string_list_item
*it
;
610 it
= string_list_lookup(merge_rr
, (const char *)e
->name
);
613 it
->util
= RERERE_RESOLVED
;
621 * Try using the given conflict resolution "ID" to see
622 * if that recorded conflict resolves cleanly what we
625 static int try_merge(const struct rerere_id
*id
, const char *path
,
626 mmfile_t
*cur
, mmbuffer_t
*result
)
629 mmfile_t base
= {NULL
, 0}, other
= {NULL
, 0};
631 if (read_mmfile(&base
, rerere_path(id
, "preimage")) ||
632 read_mmfile(&other
, rerere_path(id
, "postimage")))
636 * A three-way merge. Note that this honors user-customizable
637 * low-level merge driver settings.
639 ret
= ll_merge(result
, path
, &base
, NULL
, cur
, "", &other
, "", NULL
);
648 * Find the conflict identified by "id"; the change between its
649 * "preimage" (i.e. a previous contents with conflict markers) and its
650 * "postimage" (i.e. the corresponding contents with conflicts
651 * resolved) may apply cleanly to the contents stored in "path", i.e.
652 * the conflict this time around.
654 * Returns 0 for successful replay of recorded resolution, or non-zero
657 static int merge(const struct rerere_id
*id
, const char *path
)
661 mmfile_t cur
= {NULL
, 0};
662 mmbuffer_t result
= {NULL
, 0};
665 * Normalize the conflicts in path and write it out to
666 * "thisimage" temporary file.
668 if ((handle_file(path
, NULL
, rerere_path(id
, "thisimage")) < 0) ||
669 read_mmfile(&cur
, rerere_path(id
, "thisimage"))) {
674 ret
= try_merge(id
, path
, &cur
, &result
);
679 * A successful replay of recorded resolution.
680 * Mark that "postimage" was used to help gc.
682 if (utime(rerere_path(id
, "postimage"), NULL
) < 0)
683 warning_errno(_("failed utime() on '%s'"),
684 rerere_path(id
, "postimage"));
686 /* Update "path" with the resolution */
687 f
= fopen(path
, "w");
689 return error_errno(_("could not open '%s'"), path
);
690 if (fwrite(result
.ptr
, result
.size
, 1, f
) != 1)
691 error_errno(_("could not write '%s'"), path
);
693 return error_errno(_("writing '%s' failed"), path
);
702 static void update_paths(struct string_list
*update
)
704 struct lock_file index_lock
= LOCK_INIT
;
707 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
709 for (i
= 0; i
< update
->nr
; i
++) {
710 struct string_list_item
*item
= &update
->items
[i
];
711 if (add_file_to_cache(item
->string
, 0))
713 fprintf_ln(stderr
, _("Staged '%s' using previous resolution."),
717 if (write_locked_index(&the_index
, &index_lock
,
718 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
719 die(_("unable to write new index file"));
722 static void remove_variant(struct rerere_id
*id
)
724 unlink_or_warn(rerere_path(id
, "postimage"));
725 unlink_or_warn(rerere_path(id
, "preimage"));
726 id
->collection
->status
[id
->variant
] = 0;
730 * The path indicated by rr_item may still have conflict for which we
731 * have a recorded resolution, in which case replay it and optionally
732 * update it. Or it may have been resolved by the user and we may
733 * only have the preimage for that conflict, in which case the result
734 * needs to be recorded as a resolution in a postimage file.
736 static void do_rerere_one_path(struct string_list_item
*rr_item
,
737 struct string_list
*update
)
739 const char *path
= rr_item
->string
;
740 struct rerere_id
*id
= rr_item
->util
;
741 struct rerere_dir
*rr_dir
= id
->collection
;
744 variant
= id
->variant
;
746 /* Has the user resolved it already? */
748 if (!handle_file(path
, NULL
, NULL
)) {
749 copy_file(rerere_path(id
, "postimage"), path
, 0666);
750 id
->collection
->status
[variant
] |= RR_HAS_POSTIMAGE
;
751 fprintf_ln(stderr
, _("Recorded resolution for '%s'."), path
);
752 free_rerere_id(rr_item
);
753 rr_item
->util
= NULL
;
757 * There may be other variants that can cleanly
758 * replay. Try them and update the variant number for
763 /* Does any existing resolution apply cleanly? */
764 for (variant
= 0; variant
< rr_dir
->status_nr
; variant
++) {
765 const int both
= RR_HAS_PREIMAGE
| RR_HAS_POSTIMAGE
;
766 struct rerere_id vid
= *id
;
768 if ((rr_dir
->status
[variant
] & both
) != both
)
771 vid
.variant
= variant
;
772 if (merge(&vid
, path
))
773 continue; /* failed to replay */
776 * If there already is a different variant that applies
777 * cleanly, there is no point maintaining our own variant.
779 if (0 <= id
->variant
&& id
->variant
!= variant
)
782 if (rerere_autoupdate
)
783 string_list_insert(update
, path
);
786 _("Resolved '%s' using previous resolution."),
788 free_rerere_id(rr_item
);
789 rr_item
->util
= NULL
;
793 /* None of the existing one applies; we need a new variant */
796 variant
= id
->variant
;
797 handle_file(path
, NULL
, rerere_path(id
, "preimage"));
798 if (id
->collection
->status
[variant
] & RR_HAS_POSTIMAGE
) {
799 const char *path
= rerere_path(id
, "postimage");
801 die_errno(_("cannot unlink stray '%s'"), path
);
802 id
->collection
->status
[variant
] &= ~RR_HAS_POSTIMAGE
;
804 id
->collection
->status
[variant
] |= RR_HAS_PREIMAGE
;
805 fprintf_ln(stderr
, _("Recorded preimage for '%s'"), path
);
808 static int do_plain_rerere(struct string_list
*rr
, int fd
)
810 struct string_list conflict
= STRING_LIST_INIT_DUP
;
811 struct string_list update
= STRING_LIST_INIT_DUP
;
814 find_conflict(&conflict
);
817 * MERGE_RR records paths with conflicts immediately after
818 * merge failed. Some of the conflicted paths might have been
819 * hand resolved in the working tree since then, but the
820 * initial run would catch all and register their preimages.
822 for (i
= 0; i
< conflict
.nr
; i
++) {
823 struct rerere_id
*id
;
824 unsigned char sha1
[20];
825 const char *path
= conflict
.items
[i
].string
;
829 * Ask handle_file() to scan and assign a
830 * conflict ID. No need to write anything out
833 ret
= handle_file(path
, sha1
, NULL
);
834 has_string
= string_list_has_string(rr
, path
);
835 if (ret
< 0 && has_string
) {
836 remove_variant(string_list_lookup(rr
, path
)->util
);
837 string_list_remove(rr
, path
, 1);
839 if (ret
< 1 || has_string
)
842 id
= new_rerere_id(sha1
);
843 string_list_insert(rr
, path
)->util
= id
;
845 /* Ensure that the directory exists. */
846 mkdir_in_gitdir(rerere_path(id
, NULL
));
849 for (i
= 0; i
< rr
->nr
; i
++)
850 do_rerere_one_path(&rr
->items
[i
], &update
);
853 update_paths(&update
);
855 return write_rr(rr
, fd
);
858 static void git_rerere_config(void)
860 git_config_get_bool("rerere.enabled", &rerere_enabled
);
861 git_config_get_bool("rerere.autoupdate", &rerere_autoupdate
);
862 git_config(git_default_config
, NULL
);
865 static GIT_PATH_FUNC(git_path_rr_cache
, "rr-cache")
867 static int is_rerere_enabled(void)
874 rr_cache_exists
= is_directory(git_path_rr_cache());
875 if (rerere_enabled
< 0)
876 return rr_cache_exists
;
878 if (!rr_cache_exists
&& mkdir_in_gitdir(git_path_rr_cache()))
879 die(_("could not create directory '%s'"), git_path_rr_cache());
883 int setup_rerere(struct string_list
*merge_rr
, int flags
)
888 if (!is_rerere_enabled())
891 if (flags
& (RERERE_AUTOUPDATE
|RERERE_NOAUTOUPDATE
))
892 rerere_autoupdate
= !!(flags
& RERERE_AUTOUPDATE
);
893 if (flags
& RERERE_READONLY
)
896 fd
= hold_lock_file_for_update(&write_lock
, git_path_merge_rr(),
903 * The main entry point that is called internally from codepaths that
904 * perform mergy operations, possibly leaving conflicted index entries
905 * and working tree files.
907 int rerere(int flags
)
909 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
912 fd
= setup_rerere(&merge_rr
, flags
);
915 status
= do_plain_rerere(&merge_rr
, fd
);
921 * Subclass of rerere_io that reads from an in-core buffer that is a
924 struct rerere_io_mem
{
930 * ... and its getline() method implementation
932 static int rerere_mem_getline(struct strbuf
*sb
, struct rerere_io
*io_
)
934 struct rerere_io_mem
*io
= (struct rerere_io_mem
*)io_
;
941 ep
= memchr(io
->input
.buf
, '\n', io
->input
.len
);
943 ep
= io
->input
.buf
+ io
->input
.len
;
944 else if (*ep
== '\n')
946 len
= ep
- io
->input
.buf
;
947 strbuf_add(sb
, io
->input
.buf
, len
);
948 strbuf_remove(&io
->input
, 0, len
);
952 static int handle_cache(const char *path
, unsigned char *sha1
, const char *output
)
954 mmfile_t mmfile
[3] = {{NULL
}};
955 mmbuffer_t result
= {NULL
, 0};
956 const struct cache_entry
*ce
;
957 int pos
, len
, i
, hunk_no
;
958 struct rerere_io_mem io
;
959 int marker_size
= ll_merge_marker_size(path
);
962 * Reproduce the conflicted merge in-core
965 pos
= cache_name_pos(path
, len
);
970 while (pos
< active_nr
) {
971 enum object_type type
;
974 ce
= active_cache
[pos
++];
975 if (ce_namelen(ce
) != len
|| memcmp(ce
->name
, path
, len
))
977 i
= ce_stage(ce
) - 1;
978 if (!mmfile
[i
].ptr
) {
979 mmfile
[i
].ptr
= read_object_file(&ce
->oid
, &type
,
981 mmfile
[i
].size
= size
;
984 for (i
= 0; i
< 3; i
++)
985 if (!mmfile
[i
].ptr
&& !mmfile
[i
].size
)
986 mmfile
[i
].ptr
= xstrdup("");
989 * NEEDSWORK: handle conflicts from merges with
990 * merge.renormalize set, too?
992 ll_merge(&result
, path
, &mmfile
[0], NULL
,
994 &mmfile
[2], "theirs", NULL
);
995 for (i
= 0; i
< 3; i
++)
998 memset(&io
, 0, sizeof(io
));
999 io
.io
.getline
= rerere_mem_getline
;
1001 io
.io
.output
= fopen(output
, "w");
1003 io
.io
.output
= NULL
;
1004 strbuf_init(&io
.input
, 0);
1005 strbuf_attach(&io
.input
, result
.ptr
, result
.size
, result
.size
);
1008 * Grab the conflict ID and optionally write the original
1009 * contents with conflict markers out.
1011 hunk_no
= handle_path(sha1
, (struct rerere_io
*)&io
, marker_size
);
1012 strbuf_release(&io
.input
);
1014 fclose(io
.io
.output
);
1018 static int rerere_forget_one_path(const char *path
, struct string_list
*rr
)
1020 const char *filename
;
1021 struct rerere_id
*id
;
1022 unsigned char sha1
[20];
1024 struct string_list_item
*item
;
1027 * Recreate the original conflict from the stages in the
1028 * index and compute the conflict ID
1030 ret
= handle_cache(path
, sha1
, NULL
);
1032 return error(_("could not parse conflict hunks in '%s'"), path
);
1034 /* Nuke the recorded resolution for the conflict */
1035 id
= new_rerere_id(sha1
);
1037 for (id
->variant
= 0;
1038 id
->variant
< id
->collection
->status_nr
;
1040 mmfile_t cur
= { NULL
, 0 };
1041 mmbuffer_t result
= {NULL
, 0};
1042 int cleanly_resolved
;
1044 if (!has_rerere_resolution(id
))
1047 handle_cache(path
, sha1
, rerere_path(id
, "thisimage"));
1048 if (read_mmfile(&cur
, rerere_path(id
, "thisimage"))) {
1050 error(_("failed to update conflicted state in '%s'"), path
);
1053 cleanly_resolved
= !try_merge(id
, path
, &cur
, &result
);
1056 if (cleanly_resolved
)
1060 if (id
->collection
->status_nr
<= id
->variant
) {
1061 error(_("no remembered resolution for '%s'"), path
);
1065 filename
= rerere_path(id
, "postimage");
1066 if (unlink(filename
)) {
1067 if (errno
== ENOENT
)
1068 error(_("no remembered resolution for '%s'"), path
);
1070 error_errno(_("cannot unlink '%s'"), filename
);
1075 * Update the preimage so that the user can resolve the
1076 * conflict in the working tree, run us again to record
1079 handle_cache(path
, sha1
, rerere_path(id
, "preimage"));
1080 fprintf_ln(stderr
, _("Updated preimage for '%s'"), path
);
1083 * And remember that we can record resolution for this
1084 * conflict when the user is done.
1086 item
= string_list_insert(rr
, path
);
1087 free_rerere_id(item
);
1089 fprintf(stderr
, _("Forgot resolution for '%s'\n"), path
);
1097 int rerere_forget(struct pathspec
*pathspec
)
1100 struct string_list conflict
= STRING_LIST_INIT_DUP
;
1101 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
1103 if (read_cache() < 0)
1104 return error(_("index file corrupt"));
1106 fd
= setup_rerere(&merge_rr
, RERERE_NOAUTOUPDATE
);
1111 * The paths may have been resolved (incorrectly);
1112 * recover the original conflicted state and then
1113 * find the conflicted paths.
1115 unmerge_cache(pathspec
);
1116 find_conflict(&conflict
);
1117 for (i
= 0; i
< conflict
.nr
; i
++) {
1118 struct string_list_item
*it
= &conflict
.items
[i
];
1119 if (!match_pathspec(pathspec
, it
->string
,
1120 strlen(it
->string
), 0, NULL
, 0))
1122 rerere_forget_one_path(it
->string
, &merge_rr
);
1124 return write_rr(&merge_rr
, fd
);
1128 * Garbage collection support
1131 static timestamp_t
rerere_created_at(struct rerere_id
*id
)
1135 return stat(rerere_path(id
, "preimage"), &st
) ? (time_t) 0 : st
.st_mtime
;
1138 static timestamp_t
rerere_last_used_at(struct rerere_id
*id
)
1142 return stat(rerere_path(id
, "postimage"), &st
) ? (time_t) 0 : st
.st_mtime
;
1146 * Remove the recorded resolution for a given conflict ID
1148 static void unlink_rr_item(struct rerere_id
*id
)
1150 unlink_or_warn(rerere_path(id
, "thisimage"));
1152 id
->collection
->status
[id
->variant
] = 0;
1155 static void prune_one(struct rerere_id
*id
,
1156 timestamp_t cutoff_resolve
, timestamp_t cutoff_noresolve
)
1161 then
= rerere_last_used_at(id
);
1163 cutoff
= cutoff_resolve
;
1165 then
= rerere_created_at(id
);
1168 cutoff
= cutoff_noresolve
;
1174 void rerere_gc(struct string_list
*rr
)
1176 struct string_list to_remove
= STRING_LIST_INIT_DUP
;
1180 timestamp_t now
= time(NULL
);
1181 timestamp_t cutoff_noresolve
= now
- 15 * 86400;
1182 timestamp_t cutoff_resolve
= now
- 60 * 86400;
1184 if (setup_rerere(rr
, 0) < 0)
1187 git_config_get_expiry_in_days("gc.rerereresolved", &cutoff_resolve
, now
);
1188 git_config_get_expiry_in_days("gc.rerereunresolved", &cutoff_noresolve
, now
);
1189 git_config(git_default_config
, NULL
);
1190 dir
= opendir(git_path("rr-cache"));
1192 die_errno(_("unable to open rr-cache directory"));
1193 /* Collect stale conflict IDs ... */
1194 while ((e
= readdir(dir
))) {
1195 struct rerere_dir
*rr_dir
;
1196 struct rerere_id id
;
1199 if (is_dot_or_dotdot(e
->d_name
))
1201 rr_dir
= find_rerere_dir(e
->d_name
);
1203 continue; /* or should we remove e->d_name? */
1206 for (id
.variant
= 0, id
.collection
= rr_dir
;
1207 id
.variant
< id
.collection
->status_nr
;
1209 prune_one(&id
, cutoff_resolve
, cutoff_noresolve
);
1210 if (id
.collection
->status
[id
.variant
])
1214 string_list_append(&to_remove
, e
->d_name
);
1218 /* ... and then remove the empty directories */
1219 for (i
= 0; i
< to_remove
.nr
; i
++)
1220 rmdir(git_path("rr-cache/%s", to_remove
.items
[i
].string
));
1221 string_list_clear(&to_remove
, 0);
1222 rollback_lock_file(&write_lock
);
1226 * During a conflict resolution, after "rerere" recorded the
1227 * preimages, abandon them if the user did not resolve them or
1228 * record their resolutions. And drop $GIT_DIR/MERGE_RR.
1230 * NEEDSWORK: shouldn't we be calling this from "reset --hard"?
1232 void rerere_clear(struct string_list
*merge_rr
)
1236 if (setup_rerere(merge_rr
, 0) < 0)
1239 for (i
= 0; i
< merge_rr
->nr
; i
++) {
1240 struct rerere_id
*id
= merge_rr
->items
[i
].util
;
1241 if (!has_rerere_resolution(id
)) {
1243 rmdir(rerere_path(id
, NULL
));
1246 unlink_or_warn(git_path_merge_rr());
1247 rollback_lock_file(&write_lock
);