5 #include "parse-options.h"
6 #include "repository.h"
7 #include "string-list.h"
9 #include "xdiff/xdiff.h"
10 #include "xdiff-interface.h"
13 static const char * const rerere_usage
[] = {
14 N_("git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"),
18 static int outf(void *dummy UNUSED
, mmbuffer_t
*ptr
, int nbuf
)
21 for (i
= 0; i
< nbuf
; i
++)
22 if (write_in_full(1, ptr
[i
].ptr
, ptr
[i
].size
) < 0)
27 static int diff_two(const char *file1
, const char *label1
,
28 const char *file2
, const char *label2
)
32 xdemitcb_t ecb
= { .out_line
= outf
};
36 if (read_mmfile(&minus
, file1
) || read_mmfile(&plus
, file2
))
39 printf("--- a/%s\n+++ b/%s\n", label1
, label2
);
41 memset(&xpp
, 0, sizeof(xpp
));
43 memset(&xecfg
, 0, sizeof(xecfg
));
45 ret
= xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
52 int cmd_rerere(int argc
, const char **argv
, const char *prefix
)
54 struct string_list merge_rr
= STRING_LIST_INIT_DUP
;
55 int i
, autoupdate
= -1, flags
= 0;
57 struct option options
[] = {
58 OPT_SET_INT(0, "rerere-autoupdate", &autoupdate
,
59 N_("register clean resolutions in index"), 1),
63 argc
= parse_options(argc
, argv
, prefix
, options
, rerere_usage
, 0);
65 git_config(git_xmerge_config
, NULL
);
68 flags
= RERERE_AUTOUPDATE
;
70 flags
= RERERE_NOAUTOUPDATE
;
73 return repo_rerere(the_repository
, flags
);
75 if (!strcmp(argv
[0], "forget")) {
76 struct pathspec pathspec
;
78 warning(_("'git rerere forget' without paths is deprecated"));
79 parse_pathspec(&pathspec
, 0, PATHSPEC_PREFER_CWD
,
81 return rerere_forget(the_repository
, &pathspec
);
84 if (!strcmp(argv
[0], "clear")) {
85 rerere_clear(the_repository
, &merge_rr
);
86 } else if (!strcmp(argv
[0], "gc"))
87 rerere_gc(the_repository
, &merge_rr
);
88 else if (!strcmp(argv
[0], "status")) {
89 if (setup_rerere(the_repository
, &merge_rr
,
90 flags
| RERERE_READONLY
) < 0)
92 for (i
= 0; i
< merge_rr
.nr
; i
++)
93 printf("%s\n", merge_rr
.items
[i
].string
);
94 } else if (!strcmp(argv
[0], "remaining")) {
95 rerere_remaining(the_repository
, &merge_rr
);
96 for (i
= 0; i
< merge_rr
.nr
; i
++) {
97 if (merge_rr
.items
[i
].util
!= RERERE_RESOLVED
)
98 printf("%s\n", merge_rr
.items
[i
].string
);
100 /* prepare for later call to
101 * string_list_clear() */
102 merge_rr
.items
[i
].util
= NULL
;
104 } else if (!strcmp(argv
[0], "diff")) {
105 if (setup_rerere(the_repository
, &merge_rr
,
106 flags
| RERERE_READONLY
) < 0)
108 for (i
= 0; i
< merge_rr
.nr
; i
++) {
109 const char *path
= merge_rr
.items
[i
].string
;
110 const struct rerere_id
*id
= merge_rr
.items
[i
].util
;
111 if (diff_two(rerere_path(id
, "preimage"), path
, path
, path
))
112 die(_("unable to generate diff for '%s'"), rerere_path(id
, NULL
));
115 usage_with_options(rerere_usage
, options
);
117 string_list_clear(&merge_rr
, 1);