1 #include "builtin.h"
2 #include "cache.h"
3 #include "config.h"
4 #include "dir.h"
5 #include "parse-options.h"
6 #include "string-list.h"
7 #include "rerere.h"
8 #include "xdiff/xdiff.h"
9 #include "xdiff-interface.h"
10 #include "pathspec.h"
11
12 static const char * const rerere_usage[] = {
13 N_("git rerere [clear | forget <path>... | status | remaining | diff | gc]"),
14 NULL,
15 };
16
outf(void * dummy,mmbuffer_t * ptr,int nbuf)17 static int outf(void *dummy, mmbuffer_t *ptr, int nbuf)
18 {
19 int i;
20 for (i = 0; i < nbuf; i++)
21 if (write_in_full(1, ptr[i].ptr, ptr[i].size) < 0)
22 return -1;
23 return 0;
24 }
25
diff_two(const char * file1,const char * label1,const char * file2,const char * label2)26 static int diff_two(const char *file1, const char *label1,
27 const char *file2, const char *label2)
28 {
29 xpparam_t xpp;
30 xdemitconf_t xecfg;
31 xdemitcb_t ecb = { .out_line = outf };
32 mmfile_t minus, plus;
33 int ret;
34
35 if (read_mmfile(&minus, file1) || read_mmfile(&plus, file2))
36 return -1;
37
38 printf("--- a/%s\n+++ b/%s\n", label1, label2);
39 fflush(stdout);
40 memset(&xpp, 0, sizeof(xpp));
41 xpp.flags = 0;
42 memset(&xecfg, 0, sizeof(xecfg));
43 xecfg.ctxlen = 3;
44 ret = xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
45
46 free(minus.ptr);
47 free(plus.ptr);
48 return ret;
49 }
50
cmd_rerere(int argc,const char ** argv,const char * prefix)51 int cmd_rerere(int argc, const char **argv, const char *prefix)
52 {
53 struct string_list merge_rr = STRING_LIST_INIT_DUP;
54 int i, autoupdate = -1, flags = 0;
55
56 struct option options[] = {
57 OPT_SET_INT(0, "rerere-autoupdate", &autoupdate,
58 N_("register clean resolutions in index"), 1),
59 OPT_END(),
60 };
61
62 argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
63
64 git_config(git_xmerge_config, NULL);
65
66 if (autoupdate == 1)
67 flags = RERERE_AUTOUPDATE;
68 if (autoupdate == 0)
69 flags = RERERE_NOAUTOUPDATE;
70
71 if (argc < 1)
72 return repo_rerere(the_repository, flags);
73
74 if (!strcmp(argv[0], "forget")) {
75 struct pathspec pathspec;
76 if (argc < 2)
77 warning(_("'git rerere forget' without paths is deprecated"));
78 parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
79 prefix, argv + 1);
80 return rerere_forget(the_repository, &pathspec);
81 }
82
83 if (!strcmp(argv[0], "clear")) {
84 rerere_clear(the_repository, &merge_rr);
85 } else if (!strcmp(argv[0], "gc"))
86 rerere_gc(the_repository, &merge_rr);
87 else if (!strcmp(argv[0], "status")) {
88 if (setup_rerere(the_repository, &merge_rr,
89 flags | RERERE_READONLY) < 0)
90 return 0;
91 for (i = 0; i < merge_rr.nr; i++)
92 printf("%s\n", merge_rr.items[i].string);
93 } else if (!strcmp(argv[0], "remaining")) {
94 rerere_remaining(the_repository, &merge_rr);
95 for (i = 0; i < merge_rr.nr; i++) {
96 if (merge_rr.items[i].util != RERERE_RESOLVED)
97 printf("%s\n", merge_rr.items[i].string);
98 else
99 /* prepare for later call to
100 * string_list_clear() */
101 merge_rr.items[i].util = NULL;
102 }
103 } else if (!strcmp(argv[0], "diff")) {
104 if (setup_rerere(the_repository, &merge_rr,
105 flags | RERERE_READONLY) < 0)
106 return 0;
107 for (i = 0; i < merge_rr.nr; i++) {
108 const char *path = merge_rr.items[i].string;
109 const struct rerere_id *id = merge_rr.items[i].util;
110 if (diff_two(rerere_path(id, "preimage"), path, path, path))
111 die(_("unable to generate diff for '%s'"), rerere_path(id, NULL));
112 }
113 } else
114 usage_with_options(rerere_usage, options);
115
116 string_list_clear(&merge_rr, 1);
117 return 0;
118 }
119