]>
Commit | Line | Data |
---|---|---|
baffc0e7 | 1 | #include "builtin.h" |
658f3650 | 2 | #include "cache.h" |
b2141fc1 | 3 | #include "config.h" |
8ca12c0d | 4 | #include "dir.h" |
672d1b78 | 5 | #include "parse-options.h" |
c455c87c | 6 | #include "string-list.h" |
5b2fd956 | 7 | #include "rerere.h" |
658f3650 JS |
8 | #include "xdiff/xdiff.h" |
9 | #include "xdiff-interface.h" | |
01a10b0a | 10 | #include "pathspec.h" |
658f3650 | 11 | |
672d1b78 | 12 | static const char * const rerere_usage[] = { |
9c9b4f2f | 13 | N_("git rerere [clear | forget <path>... | status | remaining | diff | gc]"), |
672d1b78 JN |
14 | NULL, |
15 | }; | |
658f3650 | 16 | |
658f3650 JS |
17 | static int outf(void *dummy, mmbuffer_t *ptr, int nbuf) |
18 | { | |
19 | int i; | |
20 | for (i = 0; i < nbuf; i++) | |
06f46f23 | 21 | if (write_in_full(1, ptr[i].ptr, ptr[i].size) < 0) |
93822c22 | 22 | return -1; |
658f3650 JS |
23 | return 0; |
24 | } | |
25 | ||
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; | |
32 | mmfile_t minus, plus; | |
3efb9880 | 33 | int ret; |
658f3650 JS |
34 | |
35 | if (read_mmfile(&minus, file1) || read_mmfile(&plus, file2)) | |
3efb9880 | 36 | return -1; |
658f3650 JS |
37 | |
38 | printf("--- a/%s\n+++ b/%s\n", label1, label2); | |
39 | fflush(stdout); | |
9ccd0a88 | 40 | memset(&xpp, 0, sizeof(xpp)); |
582aa00b | 41 | xpp.flags = 0; |
30b25010 | 42 | memset(&xecfg, 0, sizeof(xecfg)); |
658f3650 | 43 | xecfg.ctxlen = 3; |
658f3650 | 44 | ecb.outf = outf; |
3efb9880 | 45 | ret = xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb); |
658f3650 JS |
46 | |
47 | free(minus.ptr); | |
48 | free(plus.ptr); | |
3efb9880 | 49 | return ret; |
658f3650 JS |
50 | } |
51 | ||
d8b7db0a KH |
52 | int cmd_rerere(int argc, const char **argv, const char *prefix) |
53 | { | |
183113a5 | 54 | struct string_list merge_rr = STRING_LIST_INIT_DUP; |
9dd330e6 | 55 | int i, autoupdate = -1, flags = 0; |
672d1b78 JN |
56 | |
57 | struct option options[] = { | |
58 | OPT_SET_INT(0, "rerere-autoupdate", &autoupdate, | |
0ff07f24 | 59 | N_("register clean resolutions in index"), 1), |
672d1b78 JN |
60 | OPT_END(), |
61 | }; | |
62 | ||
63 | argc = parse_options(argc, argv, prefix, options, rerere_usage, 0); | |
64 | ||
de3d8bb7 FC |
65 | git_config(git_xmerge_config, NULL); |
66 | ||
672d1b78 JN |
67 | if (autoupdate == 1) |
68 | flags = RERERE_AUTOUPDATE; | |
69 | if (autoupdate == 0) | |
70 | flags = RERERE_NOAUTOUPDATE; | |
71 | ||
72 | if (argc < 1) | |
35843b11 | 73 | return repo_rerere(the_repository, flags); |
99caeed0 | 74 | |
672d1b78 | 75 | if (!strcmp(argv[0], "forget")) { |
01a10b0a | 76 | struct pathspec pathspec; |
5d2c3b01 | 77 | if (argc < 2) |
2373b650 | 78 | warning(_("'git rerere forget' without paths is deprecated")); |
01a10b0a NTND |
79 | parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, |
80 | prefix, argv + 1); | |
35843b11 | 81 | return rerere_forget(the_repository, &pathspec); |
5a9f0395 | 82 | } |
99caeed0 | 83 | |
672d1b78 | 84 | if (!strcmp(argv[0], "clear")) { |
0f891e7d | 85 | rerere_clear(&merge_rr); |
672d1b78 | 86 | } else if (!strcmp(argv[0], "gc")) |
0f891e7d | 87 | rerere_gc(&merge_rr); |
9dd330e6 JK |
88 | else if (!strcmp(argv[0], "status")) { |
89 | if (setup_rerere(&merge_rr, flags | RERERE_READONLY) < 0) | |
90 | return 0; | |
658f3650 | 91 | for (i = 0; i < merge_rr.nr; i++) |
c455c87c | 92 | printf("%s\n", merge_rr.items[i].string); |
9dd330e6 | 93 | } else if (!strcmp(argv[0], "remaining")) { |
35843b11 | 94 | rerere_remaining(the_repository, &merge_rr); |
ac49f5ca MZ |
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 | } | |
9dd330e6 JK |
103 | } else if (!strcmp(argv[0], "diff")) { |
104 | if (setup_rerere(&merge_rr, flags | RERERE_READONLY) < 0) | |
105 | return 0; | |
658f3650 | 106 | for (i = 0; i < merge_rr.nr; i++) { |
c455c87c | 107 | const char *path = merge_rr.items[i].string; |
1d51eced | 108 | const struct rerere_id *id = merge_rr.items[i].util; |
590f6e42 | 109 | if (diff_two(rerere_path(id, "preimage"), path, path, path)) |
2373b650 | 110 | die(_("unable to generate diff for '%s'"), rerere_path(id, NULL)); |
658f3650 | 111 | } |
9dd330e6 | 112 | } else |
672d1b78 | 113 | usage_with_options(rerere_usage, options); |
658f3650 | 114 | |
c455c87c | 115 | string_list_clear(&merge_rr, 1); |
658f3650 JS |
116 | return 0; |
117 | } |