Merge branch 'maint-1.6.5' into maint-1.6.6
[git/mjg.git] / builtin-rerere.c
blob2be9ffb77b38ae687537f3599c9d11e3fbc026a9
1 #include "builtin.h"
2 #include "cache.h"
3 #include "dir.h"
4 #include "string-list.h"
5 #include "rerere.h"
6 #include "xdiff/xdiff.h"
7 #include "xdiff-interface.h"
9 static const char git_rerere_usage[] =
10 "git rerere [clear | status | diff | gc]";
12 /* these values are days */
13 static int cutoff_noresolve = 15;
14 static int cutoff_resolve = 60;
16 static time_t rerere_created_at(const char *name)
18 struct stat st;
19 return stat(rerere_path(name, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
22 static void unlink_rr_item(const char *name)
24 unlink(rerere_path(name, "thisimage"));
25 unlink(rerere_path(name, "preimage"));
26 unlink(rerere_path(name, "postimage"));
27 rmdir(git_path("rr-cache/%s", name));
30 static int git_rerere_gc_config(const char *var, const char *value, void *cb)
32 if (!strcmp(var, "gc.rerereresolved"))
33 cutoff_resolve = git_config_int(var, value);
34 else if (!strcmp(var, "gc.rerereunresolved"))
35 cutoff_noresolve = git_config_int(var, value);
36 else
37 return git_default_config(var, value, cb);
38 return 0;
41 static void garbage_collect(struct string_list *rr)
43 struct string_list to_remove = { NULL, 0, 0, 1 };
44 DIR *dir;
45 struct dirent *e;
46 int i, cutoff;
47 time_t now = time(NULL), then;
49 git_config(git_rerere_gc_config, NULL);
50 dir = opendir(git_path("rr-cache"));
51 if (!dir)
52 die_errno("unable to open rr-cache directory");
53 while ((e = readdir(dir))) {
54 if (is_dot_or_dotdot(e->d_name))
55 continue;
56 then = rerere_created_at(e->d_name);
57 if (!then)
58 continue;
59 cutoff = (has_rerere_resolution(e->d_name)
60 ? cutoff_resolve : cutoff_noresolve);
61 if (then < now - cutoff * 86400)
62 string_list_append(e->d_name, &to_remove);
64 for (i = 0; i < to_remove.nr; i++)
65 unlink_rr_item(to_remove.items[i].string);
66 string_list_clear(&to_remove, 0);
69 static int outf(void *dummy, mmbuffer_t *ptr, int nbuf)
71 int i;
72 for (i = 0; i < nbuf; i++)
73 if (write_in_full(1, ptr[i].ptr, ptr[i].size) != ptr[i].size)
74 return -1;
75 return 0;
78 static int diff_two(const char *file1, const char *label1,
79 const char *file2, const char *label2)
81 xpparam_t xpp;
82 xdemitconf_t xecfg;
83 xdemitcb_t ecb;
84 mmfile_t minus, plus;
86 if (read_mmfile(&minus, file1) || read_mmfile(&plus, file2))
87 return 1;
89 printf("--- a/%s\n+++ b/%s\n", label1, label2);
90 fflush(stdout);
91 memset(&xpp, 0, sizeof(xpp));
92 xpp.flags = XDF_NEED_MINIMAL;
93 memset(&xecfg, 0, sizeof(xecfg));
94 xecfg.ctxlen = 3;
95 ecb.outf = outf;
96 xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
98 free(minus.ptr);
99 free(plus.ptr);
100 return 0;
103 int cmd_rerere(int argc, const char **argv, const char *prefix)
105 struct string_list merge_rr = { NULL, 0, 0, 1 };
106 int i, fd;
108 if (argc < 2)
109 return rerere();
111 if (!strcmp(argv[1], "-h"))
112 usage(git_rerere_usage);
114 fd = setup_rerere(&merge_rr);
115 if (fd < 0)
116 return 0;
118 if (!strcmp(argv[1], "clear")) {
119 for (i = 0; i < merge_rr.nr; i++) {
120 const char *name = (const char *)merge_rr.items[i].util;
121 if (!has_rerere_resolution(name))
122 unlink_rr_item(name);
124 unlink_or_warn(git_path("rr-cache/MERGE_RR"));
125 } else if (!strcmp(argv[1], "gc"))
126 garbage_collect(&merge_rr);
127 else if (!strcmp(argv[1], "status"))
128 for (i = 0; i < merge_rr.nr; i++)
129 printf("%s\n", merge_rr.items[i].string);
130 else if (!strcmp(argv[1], "diff"))
131 for (i = 0; i < merge_rr.nr; i++) {
132 const char *path = merge_rr.items[i].string;
133 const char *name = (const char *)merge_rr.items[i].util;
134 diff_two(rerere_path(name, "preimage"), path, path, path);
136 else
137 usage(git_rerere_usage);
139 string_list_clear(&merge_rr, 1);
140 return 0;