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 time_t rerere_created_at(const char *name
)
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
);
37 return git_default_config(var
, value
, cb
);
41 static void garbage_collect(struct string_list
*rr
)
43 struct string_list to_remove
= { NULL
, 0, 0, 1 };
47 time_t now
= time(NULL
), then
;
49 git_config(git_rerere_gc_config
, NULL
);
50 dir
= opendir(git_path("rr-cache"));
51 while ((e
= readdir(dir
))) {
52 if (is_dot_or_dotdot(e
->d_name
))
54 then
= rerere_created_at(e
->d_name
);
57 cutoff
= (has_rerere_resolution(e
->d_name
)
58 ? cutoff_resolve
: cutoff_noresolve
);
59 if (then
< now
- cutoff
* 86400)
60 string_list_append(e
->d_name
, &to_remove
);
62 for (i
= 0; i
< to_remove
.nr
; i
++)
63 unlink_rr_item(to_remove
.items
[i
].string
);
64 string_list_clear(&to_remove
, 0);
67 static int outf(void *dummy
, mmbuffer_t
*ptr
, int nbuf
)
70 for (i
= 0; i
< nbuf
; i
++)
71 if (write_in_full(1, ptr
[i
].ptr
, ptr
[i
].size
) != ptr
[i
].size
)
76 static int diff_two(const char *file1
, const char *label1
,
77 const char *file2
, const char *label2
)
84 if (read_mmfile(&minus
, file1
) || read_mmfile(&plus
, file2
))
87 printf("--- a/%s\n+++ b/%s\n", label1
, label2
);
89 memset(&xpp
, 0, sizeof(xpp
));
90 xpp
.flags
= XDF_NEED_MINIMAL
;
91 memset(&xecfg
, 0, sizeof(xecfg
));
94 xdi_diff(&minus
, &plus
, &xpp
, &xecfg
, &ecb
);
101 int cmd_rerere(int argc
, const char **argv
, const char *prefix
)
103 struct string_list merge_rr
= { NULL
, 0, 0, 1 };
109 fd
= setup_rerere(&merge_rr
);
113 if (!strcmp(argv
[1], "clear")) {
114 for (i
= 0; i
< merge_rr
.nr
; i
++) {
115 const char *name
= (const char *)merge_rr
.items
[i
].util
;
116 if (!has_rerere_resolution(name
))
117 unlink_rr_item(name
);
119 unlink_or_warn(git_path("rr-cache/MERGE_RR"));
120 } else if (!strcmp(argv
[1], "gc"))
121 garbage_collect(&merge_rr
);
122 else if (!strcmp(argv
[1], "status"))
123 for (i
= 0; i
< merge_rr
.nr
; i
++)
124 printf("%s\n", merge_rr
.items
[i
].string
);
125 else if (!strcmp(argv
[1], "diff"))
126 for (i
= 0; i
< merge_rr
.nr
; i
++) {
127 const char *path
= merge_rr
.items
[i
].string
;
128 const char *name
= (const char *)merge_rr
.items
[i
].util
;
129 diff_two(rerere_path(name
, "preimage"), path
, path
, path
);
132 usage(git_rerere_usage
);
134 string_list_clear(&merge_rr
, 1);