2005-04-26 16:25:05 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
|
|
*/
|
2005-04-26 01:26:45 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "strbuf.h"
|
|
|
|
#include "diff.h"
|
|
|
|
|
2005-05-21 22:02:51 +00:00
|
|
|
static const char *pickaxe = NULL;
|
2005-05-27 22:55:28 +00:00
|
|
|
static int pickaxe_opts = 0;
|
2005-06-03 08:36:43 +00:00
|
|
|
static const char *orderfile = NULL;
|
2005-06-12 03:57:13 +00:00
|
|
|
static const char *diff_filter = NULL;
|
2005-05-22 02:42:18 +00:00
|
|
|
static int line_termination = '\n';
|
|
|
|
static int inter_name_termination = '\t';
|
2005-05-18 06:29:49 +00:00
|
|
|
|
2005-06-03 08:36:43 +00:00
|
|
|
static void flush_them(int ac, const char **av)
|
|
|
|
{
|
2005-06-12 03:57:13 +00:00
|
|
|
diffcore_std_no_resolve(av + 1,
|
|
|
|
pickaxe, pickaxe_opts,
|
|
|
|
orderfile, diff_filter);
|
2005-07-15 00:59:17 +00:00
|
|
|
diff_flush(DIFF_FORMAT_PATCH, '\n');
|
2005-06-03 08:36:43 +00:00
|
|
|
}
|
|
|
|
|
2005-07-29 09:01:26 +00:00
|
|
|
static const char diff_helper_usage[] =
|
2005-06-19 20:14:53 +00:00
|
|
|
"git-diff-helper [-z] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]";
|
2005-04-26 01:26:45 +00:00
|
|
|
|
2005-04-28 17:13:01 +00:00
|
|
|
int main(int ac, const char **av) {
|
2005-05-23 21:55:33 +00:00
|
|
|
struct strbuf sb;
|
2005-05-28 04:05:38 +00:00
|
|
|
const char *garbage_flush_format;
|
2005-04-26 01:26:45 +00:00
|
|
|
|
2005-05-23 21:55:33 +00:00
|
|
|
strbuf_init(&sb);
|
2005-04-26 01:26:45 +00:00
|
|
|
|
|
|
|
while (1 < ac && av[1][0] == '-') {
|
2005-05-23 21:55:33 +00:00
|
|
|
if (av[1][1] == 'z')
|
2005-05-22 02:42:18 +00:00
|
|
|
line_termination = inter_name_termination = 0;
|
2005-05-21 09:40:01 +00:00
|
|
|
else if (av[1][1] == 'S') {
|
|
|
|
pickaxe = av[1] + 2;
|
|
|
|
}
|
2005-05-27 22:55:28 +00:00
|
|
|
else if (!strcmp(av[1], "--pickaxe-all"))
|
|
|
|
pickaxe_opts = DIFF_PICKAXE_ALL;
|
2005-06-12 03:57:13 +00:00
|
|
|
else if (!strncmp(av[1], "--diff-filter=", 14))
|
|
|
|
diff_filter = av[1] + 14;
|
|
|
|
else if (!strncmp(av[1], "-O", 2))
|
|
|
|
orderfile = av[1] + 2;
|
2005-04-26 01:26:45 +00:00
|
|
|
else
|
2005-05-14 01:41:36 +00:00
|
|
|
usage(diff_helper_usage);
|
2005-04-26 01:26:45 +00:00
|
|
|
ac--; av++;
|
|
|
|
}
|
2005-05-28 04:05:38 +00:00
|
|
|
garbage_flush_format = (line_termination == 0) ? "%s" : "%s\n";
|
|
|
|
|
2005-04-26 01:26:45 +00:00
|
|
|
/* the remaining parameters are paths patterns */
|
|
|
|
|
2005-05-23 21:55:33 +00:00
|
|
|
diff_setup(0);
|
2005-04-26 01:26:45 +00:00
|
|
|
while (1) {
|
2005-05-23 21:55:33 +00:00
|
|
|
unsigned old_mode, new_mode;
|
|
|
|
unsigned char old_sha1[20], new_sha1[20];
|
|
|
|
char old_path[PATH_MAX];
|
|
|
|
int status, score, two_paths;
|
|
|
|
char new_path[PATH_MAX];
|
|
|
|
|
|
|
|
int ch;
|
|
|
|
char *cp, *ep;
|
|
|
|
|
|
|
|
read_line(&sb, stdin, line_termination);
|
|
|
|
if (sb.eof)
|
2005-04-26 01:26:45 +00:00
|
|
|
break;
|
2005-05-23 21:55:33 +00:00
|
|
|
switch (sb.buf[0]) {
|
2005-05-22 02:42:18 +00:00
|
|
|
case ':':
|
2005-05-23 21:55:33 +00:00
|
|
|
/* parse the first part up to the status */
|
|
|
|
cp = sb.buf + 1;
|
|
|
|
old_mode = new_mode = 0;
|
|
|
|
while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
|
|
|
|
old_mode = (old_mode << 3) | (ch - '0');
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
if (*cp++ != ' ')
|
2005-05-22 02:42:18 +00:00
|
|
|
break;
|
2005-05-23 21:55:33 +00:00
|
|
|
while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
|
|
|
|
new_mode = (new_mode << 3) | (ch - '0');
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
if (*cp++ != ' ')
|
2005-05-22 02:42:18 +00:00
|
|
|
break;
|
2005-05-23 21:55:33 +00:00
|
|
|
if (get_sha1_hex(cp, old_sha1))
|
|
|
|
break;
|
|
|
|
cp += 40;
|
|
|
|
if (*cp++ != ' ')
|
|
|
|
break;
|
|
|
|
if (get_sha1_hex(cp, new_sha1))
|
|
|
|
break;
|
|
|
|
cp += 40;
|
|
|
|
if (*cp++ != ' ')
|
|
|
|
break;
|
|
|
|
status = *cp++;
|
|
|
|
if (!strchr("MCRNDU", status))
|
|
|
|
break;
|
|
|
|
two_paths = score = 0;
|
2005-07-25 20:05:44 +00:00
|
|
|
if (status == DIFF_STATUS_RENAMED ||
|
|
|
|
status == DIFF_STATUS_COPIED)
|
2005-05-23 21:55:33 +00:00
|
|
|
two_paths = 1;
|
|
|
|
|
2005-05-29 23:54:59 +00:00
|
|
|
/* pick up score if exists */
|
|
|
|
if (sscanf(cp, "%d", &score) != 1)
|
|
|
|
score = 0;
|
|
|
|
cp = strchr(cp,
|
|
|
|
inter_name_termination);
|
|
|
|
if (!cp)
|
|
|
|
break;
|
2005-05-23 21:55:33 +00:00
|
|
|
if (*cp++ != inter_name_termination)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* first pathname */
|
|
|
|
if (!line_termination) {
|
|
|
|
read_line(&sb, stdin, line_termination);
|
|
|
|
if (sb.eof)
|
|
|
|
break;
|
|
|
|
strcpy(old_path, sb.buf);
|
|
|
|
}
|
|
|
|
else if (!two_paths)
|
|
|
|
strcpy(old_path, cp);
|
|
|
|
else {
|
|
|
|
ep = strchr(cp, inter_name_termination);
|
|
|
|
if (!ep)
|
|
|
|
break;
|
|
|
|
strncpy(old_path, cp, ep-cp);
|
|
|
|
old_path[ep-cp] = 0;
|
|
|
|
cp = ep + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* second pathname */
|
|
|
|
if (!two_paths)
|
|
|
|
strcpy(new_path, old_path);
|
|
|
|
else {
|
|
|
|
if (!line_termination) {
|
|
|
|
read_line(&sb, stdin,
|
|
|
|
line_termination);
|
|
|
|
if (sb.eof)
|
|
|
|
break;
|
|
|
|
strcpy(new_path, sb.buf);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
strcpy(new_path, cp);
|
|
|
|
}
|
|
|
|
diff_helper_input(old_mode, new_mode,
|
|
|
|
old_sha1, new_sha1,
|
|
|
|
old_path, status, score,
|
|
|
|
new_path);
|
|
|
|
continue;
|
2005-05-18 18:33:46 +00:00
|
|
|
}
|
2005-06-03 08:36:43 +00:00
|
|
|
flush_them(ac, av);
|
2005-05-28 04:05:38 +00:00
|
|
|
printf(garbage_flush_format, sb.buf);
|
2005-04-26 01:26:45 +00:00
|
|
|
}
|
2005-06-03 08:36:43 +00:00
|
|
|
flush_them(ac, av);
|
2005-04-26 01:26:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|