4 #include "string-list.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 const char *rr_path(const char *name
, const char *file
)
18 return git_path("rr-cache/%s/%s", name
, file
);
21 static time_t rerere_created_at(const char *name
)
24 return stat(rr_path(name
, "preimage"), &st
) ? (time_t) 0 : st
.st_mtime
;
27 static int has_resolution(const char *name
)
30 return !stat(rr_path(name
, "postimage"), &st
);
33 static void unlink_rr_item(const char *name
)
35 unlink(rr_path(name
, "thisimage"));
36 unlink(rr_path(name
, "preimage"));
37 unlink(rr_path(name
, "postimage"));
38 rmdir(git_path("rr-cache/%s", name
));
41 static int git_rerere_gc_config(const char *var
, const char *value
, void *cb
)
43 if (!strcmp(var
, "gc.rerereresolved"))
44 cutoff_resolve
= git_config_int(var
, value
);
45 else if (!strcmp(var
, "gc.rerereunresolved"))
46 cutoff_noresolve
= git_config_int(var
, value
);
48 return git_default_config(var
, value
, cb
);
52 static void garbage_collect(struct string_list
*rr
)
54 struct string_list to_remove
= { NULL
, 0, 0, 1 };
58 time_t now
= time(NULL
), then
;
60 git_config(git_rerere_gc_config
, NULL
);
61 dir
= opendir(git_path("rr-cache"));
62 while ((e
= readdir(dir
))) {
63 if (is_dot_or_dotdot(e
->d_name
))
65 then
= rerere_created_at(e
->d_name
);
68 cutoff
= (has_resolution(e
->d_name
)
69 ? cutoff_resolve
: cutoff_noresolve
);
70 if (then
< now
- cutoff
* 86400)
71 string_list_append(e
->d_name
, &to_remove
);
73 for (i
= 0; i
< to_remove
.nr
; i
++)
74 unlink_rr_item(to_remove
.items
[i
].string
);
75 string_list_clear(&to_remove
, 0);
78 static int outf(void *dummy
, mmbuffer_t
*ptr
, int nbuf
)
81 for (i
= 0; i
< nbuf
; i
++)
82 if (write_in_full(1, ptr
[i
].ptr
, ptr
[i
].size
) != ptr
[i
].size
)
87 static int diff_two(const char *file1
, const char *label1
,
88 const char *file2
, const char *label2
)
95 if (read_mmfile(&minus
, file1
) || read_mmfile(&plus
, file2
))
98 printf("--- a/%s\n+++ b/%s\n", label1
, label2
);
100 memset(&xpp
, 0, sizeof(xpp
));
101 xpp
.flags
= XDF_NEED_MINIMAL
;
102 memset(&xecfg
, 0, sizeof(xecfg
));
105 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
112 int cmd_rerere(int argc
, const char **argv
, const char *prefix
)
114 struct string_list merge_rr
= { NULL
, 0, 0, 1 };
120 fd
= setup_rerere(&merge_rr
);
124 if (!strcmp(argv
[1], "clear")) {
125 for (i
= 0; i
< merge_rr
.nr
; i
++) {
126 const char *name
= (const char *)merge_rr
.items
[i
].util
;
127 if (!has_resolution(name
))
128 unlink_rr_item(name
);
130 unlink(git_path("rr-cache/MERGE_RR"));
131 } else if (!strcmp(argv
[1], "gc"))
132 garbage_collect(&merge_rr
);
133 else if (!strcmp(argv
[1], "status"))
134 for (i
= 0; i
< merge_rr
.nr
; i
++)
135 printf("%s\n", merge_rr
.items
[i
].string
);
136 else if (!strcmp(argv
[1], "diff"))
137 for (i
= 0; i
< merge_rr
.nr
; i
++) {
138 const char *path
= merge_rr
.items
[i
].string
;
139 const char *name
= (const char *)merge_rr
.items
[i
].util
;
140 diff_two(rr_path(name
, "preimage"), path
, path
, path
);
143 usage(git_rerere_usage
);
145 string_list_clear(&merge_rr
, 1);