X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-helper.c;h=63aff6969863f6fb3da94c9866067e1c779831a3;hb=69f956e10484f92f9e0ab191b668c79d697b9f0f;hp=cd0bad06bae35b4900bd53df794fc1e9fd4ff9b3;hpb=902b92e00e491a60d55c4b2bce122903b8347f34;p=git.git diff --git a/diff-helper.c b/diff-helper.c index cd0bad06..63aff696 100644 --- a/diff-helper.c +++ b/diff-helper.c @@ -1,143 +1,153 @@ /* * Copyright (C) 2005 Junio C Hamano */ -#include #include "cache.h" #include "strbuf.h" #include "diff.h" -static int matches_pathspec(const char *name, const char **spec, int cnt) -{ - int i; - int namelen = strlen(name); - for (i = 0; i < cnt; i++) { - int speclen = strlen(spec[i]); - if (! strncmp(spec[i], name, speclen) && - speclen <= namelen && - (name[speclen] == 0 || - name[speclen] == '/')) - return 1; - } - return 0; -} +static const char *pickaxe = NULL; +static int pickaxe_opts = 0; +static const char *orderfile = NULL; +static const char *diff_filter = NULL; +static int line_termination = '\n'; +static int inter_name_termination = '\t'; -static int parse_oneside_change(const char *cp, struct diff_spec *one, - char *path) +static void flush_them(int ac, const char **av) { - int ch; - - one->file_valid = one->sha1_valid = 1; - one->mode = 0; - while ((ch = *cp) && '0' <= ch && ch <= '7') { - one->mode = (one->mode << 3) | (ch - '0'); - cp++; - } - - if (strncmp(cp, "\tblob\t", 6)) - return -1; - cp += 6; - if (get_sha1_hex(cp, one->blob_sha1)) - return -1; - cp += 40; - if (*cp++ != '\t') - return -1; - strcpy(path, cp); - return 0; -} - -static int parse_diff_raw_output(const char *buf, - const char **spec, int cnt, int reverse) -{ - struct diff_spec old, new; - char path[PATH_MAX]; - const char *cp = buf; - int ch; - - switch (*cp++) { - case 'U': - if (!cnt || matches_pathspec(cp + 1, spec, cnt)) - diff_unmerge(cp + 1); - return 0; - case '+': - old.file_valid = 0; - parse_oneside_change(cp, &new, path); - break; - case '-': - new.file_valid = 0; - parse_oneside_change(cp, &old, path); - break; - case '*': - old.file_valid = old.sha1_valid = - new.file_valid = new.sha1_valid = 1; - old.mode = new.mode = 0; - while ((ch = *cp) && ('0' <= ch && ch <= '7')) { - old.mode = (old.mode << 3) | (ch - '0'); - cp++; - } - if (strncmp(cp, "->", 2)) - return -1; - cp += 2; - while ((ch = *cp) && ('0' <= ch && ch <= '7')) { - new.mode = (new.mode << 3) | (ch - '0'); - cp++; - } - if (strncmp(cp, "\tblob\t", 6)) - return -1; - cp += 6; - if (get_sha1_hex(cp, old.blob_sha1)) - return -1; - cp += 40; - if (strncmp(cp, "->", 2)) - return -1; - cp += 2; - if (get_sha1_hex(cp, new.blob_sha1)) - return -1; - cp += 40; - if (*cp++ != '\t') - return -1; - strcpy(path, cp); - break; - default: - return -1; - } - if (!cnt || matches_pathspec(path, spec, cnt)) { - if (reverse) - run_external_diff(path, &new, &old); - else - run_external_diff(path, &old, &new); - } - return 0; + diffcore_std_no_resolve(av + 1, + pickaxe, pickaxe_opts, + orderfile, diff_filter); + diff_flush(DIFF_FORMAT_PATCH); } static const char *diff_helper_usage = -"git-diff-helper [-R] [-z] paths..."; +"git-diff-helper [-z] [-O] [-S] [--pickaxe-all] [...]"; int main(int ac, const char **av) { struct strbuf sb; - int reverse = 0; - int line_termination = '\n'; + const char *garbage_flush_format; strbuf_init(&sb); while (1 < ac && av[1][0] == '-') { - if (av[1][1] == 'R') - reverse = 1; - else if (av[1][1] == 'z') - line_termination = 0; + if (av[1][1] == 'z') + line_termination = inter_name_termination = 0; + else if (av[1][1] == 'S') { + pickaxe = av[1] + 2; + } + else if (!strcmp(av[1], "--pickaxe-all")) + pickaxe_opts = DIFF_PICKAXE_ALL; + else if (!strncmp(av[1], "--diff-filter=", 14)) + diff_filter = av[1] + 14; + else if (!strncmp(av[1], "-O", 2)) + orderfile = av[1] + 2; else usage(diff_helper_usage); ac--; av++; } + garbage_flush_format = (line_termination == 0) ? "%s" : "%s\n"; + /* the remaining parameters are paths patterns */ + diff_setup(0); while (1) { - int status; + 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) break; - status = parse_diff_raw_output(sb.buf, av+1, ac-1, reverse); - if (status) - fprintf(stderr, "cannot parse %s\n", sb.buf); + switch (sb.buf[0]) { + case ':': + /* 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++ != ' ') + break; + while ((ch = *cp) && ('0' <= ch && ch <= '7')) { + new_mode = (new_mode << 3) | (ch - '0'); + cp++; + } + if (*cp++ != ' ') + break; + 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; + if (status == 'R' || status == 'C') + two_paths = 1; + + /* pick up score if exists */ + if (sscanf(cp, "%d", &score) != 1) + score = 0; + cp = strchr(cp, + inter_name_termination); + if (!cp) + break; + 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; + } + flush_them(ac, av); + printf(garbage_flush_format, sb.buf); } + flush_them(ac, av); return 0; }