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"
|
2013-07-14 08:35:40 +00:00
|
|
|
#include "pathspec.h"
|
2006-12-20 16:39:41 +00:00
|
|
|
|
2010-08-05 11:28:37 +00:00
|
|
|
static const char * const rerere_usage[] = {
|
2012-08-20 12:32:38 +00:00
|
|
|
N_("git rerere [clear | forget path... | status | remaining | diff | gc]"),
|
2010-08-05 11:28:37 +00:00
|
|
|
NULL,
|
|
|
|
};
|
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)
|
|
|
|
{
|
2010-07-04 19:46:19 +00:00
|
|
|
struct string_list merge_rr = STRING_LIST_INIT_DUP;
|
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,
|
2012-08-20 12:32:38 +00:00
|
|
|
N_("register clean resolutions in index"), 1),
|
2010-08-05 11:28:37 +00:00
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
|
|
|
|
|
2014-04-30 04:08:29 +00:00
|
|
|
git_config(git_xmerge_config, NULL);
|
|
|
|
|
2010-08-05 11:28:37 +00:00
|
|
|
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")) {
|
2013-07-14 08:35:40 +00:00
|
|
|
struct pathspec pathspec;
|
2011-03-01 13:21:05 +00:00
|
|
|
if (argc < 2)
|
|
|
|
warning("'git rerere forget' without paths is deprecated");
|
2013-07-14 08:35:40 +00:00
|
|
|
parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
|
|
|
|
prefix, argv + 1);
|
|
|
|
return rerere_forget(&pathspec);
|
2010-01-21 08:23:48 +00:00
|
|
|
}
|
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")) {
|
2011-05-08 19:55:34 +00:00
|
|
|
rerere_clear(&merge_rr);
|
2010-08-05 11:28:37 +00:00
|
|
|
} else if (!strcmp(argv[0], "gc"))
|
2011-05-08 19:55:34 +00:00
|
|
|
rerere_gc(&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);
|
2011-02-16 10:47:44 +00:00
|
|
|
else if (!strcmp(argv[0], "remaining")) {
|
|
|
|
rerere_remaining(&merge_rr);
|
|
|
|
for (i = 0; i < merge_rr.nr; i++) {
|
|
|
|
if (merge_rr.items[i].util != RERERE_RESOLVED)
|
|
|
|
printf("%s\n", merge_rr.items[i].string);
|
|
|
|
else
|
|
|
|
/* prepare for later call to
|
|
|
|
* string_list_clear() */
|
|
|
|
merge_rr.items[i].util = NULL;
|
|
|
|
}
|
|
|
|
} 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;
|
2015-07-05 00:38:34 +00:00
|
|
|
const struct rerere_id *id = merge_rr.items[i].util;
|
2015-07-06 21:45:55 +00:00
|
|
|
diff_two(rerere_path(id, "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;
|
|
|
|
}
|