2007-07-14 23:14:45 +00:00
|
|
|
#include "builtin.h"
|
2006-12-20 16:39:41 +00:00
|
|
|
#include "cache.h"
|
2009-01-10 12:07:50 +00:00
|
|
|
#include "dir.h"
|
2010-08-05 11:28:37 +00:00
|
|
|
#include "parse-options.h"
|
2008-07-21 18:03:49 +00:00
|
|
|
#include "string-list.h"
|
2008-07-09 12:58:57 +00:00
|
|
|
#include "rerere.h"
|
2006-12-20 16:39:41 +00:00
|
|
|
#include "xdiff/xdiff.h"
|
|
|
|
#include "xdiff-interface.h"
|
|
|
|
|
2010-08-05 11:28:37 +00:00
|
|
|
static const char * const rerere_usage[] = {
|
|
|
|
"git rerere [clear | status | diff | gc]",
|
|
|
|
NULL,
|
|
|
|
};
|
2006-12-20 16:39:41 +00:00
|
|
|
|
|
|
|
/* these values are days */
|
|
|
|
static int cutoff_noresolve = 15;
|
|
|
|
static int cutoff_resolve = 60;
|
|
|
|
|
2008-06-22 06:28:58 +00:00
|
|
|
static time_t rerere_created_at(const char *name)
|
|
|
|
{
|
|
|
|
struct stat st;
|
2009-02-14 22:21:04 +00:00
|
|
|
return stat(rerere_path(name, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
|
2008-06-22 06:28:58 +00:00
|
|
|
}
|
|
|
|
|
2006-12-20 16:39:41 +00:00
|
|
|
static void unlink_rr_item(const char *name)
|
|
|
|
{
|
2009-02-14 22:21:04 +00:00
|
|
|
unlink(rerere_path(name, "thisimage"));
|
|
|
|
unlink(rerere_path(name, "preimage"));
|
|
|
|
unlink(rerere_path(name, "postimage"));
|
2006-12-20 16:39:41 +00:00
|
|
|
rmdir(git_path("rr-cache/%s", name));
|
|
|
|
}
|
|
|
|
|
2008-07-09 12:58:57 +00:00
|
|
|
static int git_rerere_gc_config(const char *var, const char *value, void *cb)
|
|
|
|
{
|
|
|
|
if (!strcmp(var, "gc.rerereresolved"))
|
|
|
|
cutoff_resolve = git_config_int(var, value);
|
|
|
|
else if (!strcmp(var, "gc.rerereunresolved"))
|
|
|
|
cutoff_noresolve = git_config_int(var, value);
|
|
|
|
else
|
|
|
|
return git_default_config(var, value, cb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-21 18:03:49 +00:00
|
|
|
static void garbage_collect(struct string_list *rr)
|
2006-12-20 16:39:41 +00:00
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
struct string_list to_remove = { NULL, 0, 0, 1 };
|
2006-12-20 16:39:41 +00:00
|
|
|
DIR *dir;
|
|
|
|
struct dirent *e;
|
2008-06-22 06:28:58 +00:00
|
|
|
int i, cutoff;
|
2006-12-20 16:39:41 +00:00
|
|
|
time_t now = time(NULL), then;
|
|
|
|
|
2008-07-09 12:58:57 +00:00
|
|
|
git_config(git_rerere_gc_config, NULL);
|
2008-06-22 06:28:58 +00:00
|
|
|
dir = opendir(git_path("rr-cache"));
|
2009-12-04 10:35:57 +00:00
|
|
|
if (!dir)
|
|
|
|
die_errno("unable to open rr-cache directory");
|
2006-12-20 16:39:41 +00:00
|
|
|
while ((e = readdir(dir))) {
|
2009-01-10 12:07:50 +00:00
|
|
|
if (is_dot_or_dotdot(e->d_name))
|
2006-12-20 16:39:41 +00:00
|
|
|
continue;
|
2009-01-10 12:07:50 +00:00
|
|
|
then = rerere_created_at(e->d_name);
|
2008-06-22 06:28:58 +00:00
|
|
|
if (!then)
|
2006-12-20 16:39:41 +00:00
|
|
|
continue;
|
2009-02-14 22:21:04 +00:00
|
|
|
cutoff = (has_rerere_resolution(e->d_name)
|
2008-06-22 06:28:58 +00:00
|
|
|
? cutoff_resolve : cutoff_noresolve);
|
|
|
|
if (then < now - cutoff * 86400)
|
2009-01-10 12:07:50 +00:00
|
|
|
string_list_append(e->d_name, &to_remove);
|
2006-12-20 16:39:41 +00:00
|
|
|
}
|
|
|
|
for (i = 0; i < to_remove.nr; i++)
|
2008-07-21 18:03:49 +00:00
|
|
|
unlink_rr_item(to_remove.items[i].string);
|
|
|
|
string_list_clear(&to_remove, 0);
|
2006-12-20 16:39:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int outf(void *dummy, mmbuffer_t *ptr, int nbuf)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < nbuf; i++)
|
2007-01-08 15:58:23 +00:00
|
|
|
if (write_in_full(1, ptr[i].ptr, ptr[i].size) != ptr[i].size)
|
|
|
|
return -1;
|
2006-12-20 16:39:41 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int diff_two(const char *file1, const char *label1,
|
|
|
|
const char *file2, const char *label2)
|
|
|
|
{
|
|
|
|
xpparam_t xpp;
|
|
|
|
xdemitconf_t xecfg;
|
|
|
|
xdemitcb_t ecb;
|
|
|
|
mmfile_t minus, plus;
|
|
|
|
|
|
|
|
if (read_mmfile(&minus, file1) || read_mmfile(&plus, file2))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
printf("--- a/%s\n+++ b/%s\n", label1, label2);
|
|
|
|
fflush(stdout);
|
2008-10-25 13:30:37 +00:00
|
|
|
memset(&xpp, 0, sizeof(xpp));
|
2010-05-02 13:04:41 +00:00
|
|
|
xpp.flags = 0;
|
2007-07-04 18:05:46 +00:00
|
|
|
memset(&xecfg, 0, sizeof(xecfg));
|
2006-12-20 16:39:41 +00:00
|
|
|
xecfg.ctxlen = 3;
|
|
|
|
ecb.outf = outf;
|
2007-12-13 21:25:07 +00:00
|
|
|
xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
|
2006-12-20 16:39:41 +00:00
|
|
|
|
|
|
|
free(minus.ptr);
|
|
|
|
free(plus.ptr);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-18 00:06:47 +00:00
|
|
|
int cmd_rerere(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
struct string_list merge_rr = { NULL, 0, 0, 1 };
|
2010-08-05 11:28:37 +00:00
|
|
|
int i, fd, autoupdate = -1, flags = 0;
|
|
|
|
|
|
|
|
struct option options[] = {
|
|
|
|
OPT_SET_INT(0, "rerere-autoupdate", &autoupdate,
|
|
|
|
"register clean resolutions in index", 1),
|
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
|
|
|
|
|
|
|
|
if (autoupdate == 1)
|
|
|
|
flags = RERERE_AUTOUPDATE;
|
|
|
|
if (autoupdate == 0)
|
|
|
|
flags = RERERE_NOAUTOUPDATE;
|
|
|
|
|
|
|
|
if (argc < 1)
|
2009-12-04 08:20:48 +00:00
|
|
|
return rerere(flags);
|
2009-11-09 15:05:01 +00:00
|
|
|
|
2010-08-05 11:28:37 +00:00
|
|
|
if (!strcmp(argv[0], "forget")) {
|
|
|
|
const char **pathspec = get_pathspec(prefix, argv + 1);
|
2010-01-21 08:23:48 +00:00
|
|
|
return rerere_forget(pathspec);
|
|
|
|
}
|
2009-11-09 15:05:01 +00:00
|
|
|
|
2009-12-04 08:20:48 +00:00
|
|
|
fd = setup_rerere(&merge_rr, flags);
|
2007-09-18 00:06:47 +00:00
|
|
|
if (fd < 0)
|
|
|
|
return 0;
|
2006-12-20 16:39:41 +00:00
|
|
|
|
2010-08-05 11:28:37 +00:00
|
|
|
if (!strcmp(argv[0], "clear")) {
|
2006-12-20 16:39:41 +00:00
|
|
|
for (i = 0; i < merge_rr.nr; i++) {
|
|
|
|
const char *name = (const char *)merge_rr.items[i].util;
|
2009-02-14 22:21:04 +00:00
|
|
|
if (!has_rerere_resolution(name))
|
2006-12-20 16:39:41 +00:00
|
|
|
unlink_rr_item(name);
|
|
|
|
}
|
2009-04-29 21:22:56 +00:00
|
|
|
unlink_or_warn(git_path("rr-cache/MERGE_RR"));
|
2010-08-05 11:28:37 +00:00
|
|
|
} else if (!strcmp(argv[0], "gc"))
|
2006-12-20 16:39:41 +00:00
|
|
|
garbage_collect(&merge_rr);
|
2010-08-05 11:28:37 +00:00
|
|
|
else if (!strcmp(argv[0], "status"))
|
2006-12-20 16:39:41 +00:00
|
|
|
for (i = 0; i < merge_rr.nr; i++)
|
2008-07-21 18:03:49 +00:00
|
|
|
printf("%s\n", merge_rr.items[i].string);
|
2010-08-05 11:28:37 +00:00
|
|
|
else if (!strcmp(argv[0], "diff"))
|
2006-12-20 16:39:41 +00:00
|
|
|
for (i = 0; i < merge_rr.nr; i++) {
|
2008-07-21 18:03:49 +00:00
|
|
|
const char *path = merge_rr.items[i].string;
|
2006-12-20 16:39:41 +00:00
|
|
|
const char *name = (const char *)merge_rr.items[i].util;
|
2009-02-14 22:21:04 +00:00
|
|
|
diff_two(rerere_path(name, "preimage"), path, path, path);
|
2006-12-20 16:39:41 +00:00
|
|
|
}
|
|
|
|
else
|
2010-08-05 11:28:37 +00:00
|
|
|
usage_with_options(rerere_usage, options);
|
2006-12-20 16:39:41 +00:00
|
|
|
|
2008-07-21 18:03:49 +00:00
|
|
|
string_list_clear(&merge_rr, 1);
|
2006-12-20 16:39:41 +00:00
|
|
|
return 0;
|
|
|
|
}
|