mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
81e50eabf0
Update the diff-raw format as Linus and I discussed, except that it does not use sequence of underscore '_' letters to express nonexistence. All '0' mode is used for that purpose instead. The new diff-raw format can express rename/copy, and the earlier restriction that -M and -C _must_ be used with the patch format output is no longer necessary. The patch makes -M and -C flags independent of -p flag, so you need to say git-whatchanged -M -p to get the diff/patch format. Updated are both documentations and tests. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
135 lines
3 KiB
C
135 lines
3 KiB
C
/*
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
*/
|
|
#include <limits.h>
|
|
#include "cache.h"
|
|
#include "strbuf.h"
|
|
#include "diff.h"
|
|
|
|
static int detect_rename = 0;
|
|
static int diff_score_opt = 0;
|
|
static const char *pickaxe = NULL;
|
|
static int diff_output_style = DIFF_FORMAT_PATCH;
|
|
static int line_termination = '\n';
|
|
static int inter_name_termination = '\t';
|
|
|
|
static int parse_diff_raw(char *buf1, char *buf2, char *buf3)
|
|
{
|
|
char old_path[PATH_MAX];
|
|
unsigned char old_sha1[20], new_sha1[20];
|
|
char *ep;
|
|
char *cp = buf1;
|
|
int ch, old_mode, new_mode;
|
|
|
|
old_mode = new_mode = 0;
|
|
while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
|
|
old_mode = (old_mode << 3) | (ch - '0');
|
|
cp++;
|
|
}
|
|
if (*cp++ != ' ')
|
|
return -1;
|
|
while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
|
|
new_mode = (new_mode << 3) | (ch - '0');
|
|
cp++;
|
|
}
|
|
if (*cp++ != ' ')
|
|
return -1;
|
|
if (get_sha1_hex(cp, old_sha1))
|
|
return -1;
|
|
cp += 40;
|
|
if (*cp++ != ' ')
|
|
return -1;
|
|
if (get_sha1_hex(cp, new_sha1))
|
|
return -1;
|
|
cp += 40;
|
|
if (*cp++ != inter_name_termination)
|
|
return -1;
|
|
if (buf2)
|
|
cp = buf2;
|
|
ep = strchr(cp, inter_name_termination);
|
|
if (!ep)
|
|
return -1;
|
|
*ep++ = 0;
|
|
strcpy(old_path, cp);
|
|
diff_guif(old_mode, new_mode, old_sha1, new_sha1,
|
|
old_path, buf3 ? buf3 : ep);
|
|
return 0;
|
|
}
|
|
|
|
static const char *diff_helper_usage =
|
|
"git-diff-helper [-z] [-R] [-M] [-C] [-S<string>] paths...";
|
|
|
|
int main(int ac, const char **av) {
|
|
struct strbuf sb1, sb2, sb3;
|
|
int reverse_diff = 0;
|
|
|
|
strbuf_init(&sb1);
|
|
strbuf_init(&sb2);
|
|
strbuf_init(&sb3);
|
|
|
|
while (1 < ac && av[1][0] == '-') {
|
|
if (av[1][1] == 'R')
|
|
reverse_diff = 1;
|
|
else if (av[1][1] == 'z')
|
|
line_termination = inter_name_termination = 0;
|
|
else if (av[1][1] == 'p') /* hidden from the help */
|
|
diff_output_style = DIFF_FORMAT_HUMAN;
|
|
else if (av[1][1] == 'P') /* hidden from the help */
|
|
diff_output_style = DIFF_FORMAT_MACHINE;
|
|
else if (av[1][1] == 'M') {
|
|
detect_rename = 1;
|
|
diff_score_opt = diff_scoreopt_parse(av[1]);
|
|
}
|
|
else if (av[1][1] == 'C') {
|
|
detect_rename = 2;
|
|
diff_score_opt = diff_scoreopt_parse(av[1]);
|
|
}
|
|
else if (av[1][1] == 'S') {
|
|
pickaxe = av[1] + 2;
|
|
}
|
|
else
|
|
usage(diff_helper_usage);
|
|
ac--; av++;
|
|
}
|
|
/* the remaining parameters are paths patterns */
|
|
|
|
diff_setup(reverse_diff, diff_output_style);
|
|
while (1) {
|
|
int status;
|
|
read_line(&sb1, stdin, line_termination);
|
|
if (sb1.eof)
|
|
break;
|
|
switch (sb1.buf[0]) {
|
|
case 'U':
|
|
diff_unmerge(sb1.buf + 2);
|
|
continue;
|
|
case ':':
|
|
break;
|
|
default:
|
|
goto unrecognized;
|
|
}
|
|
if (!line_termination) {
|
|
read_line(&sb2, stdin, line_termination);
|
|
if (sb2.eof)
|
|
break;
|
|
read_line(&sb3, stdin, line_termination);
|
|
if (sb3.eof)
|
|
break;
|
|
status = parse_diff_raw(sb1.buf+1, sb2.buf, sb3.buf);
|
|
}
|
|
else
|
|
status = parse_diff_raw(sb1.buf+1, NULL, NULL);
|
|
if (status) {
|
|
unrecognized:
|
|
diff_flush(av+1, ac-1);
|
|
printf("%s%c", sb1.buf, line_termination);
|
|
}
|
|
}
|
|
if (detect_rename)
|
|
diff_detect_rename(detect_rename, diff_score_opt);
|
|
if (pickaxe)
|
|
diff_pickaxe(pickaxe);
|
|
diff_flush(av+1, ac-1);
|
|
return 0;
|
|
}
|