/*
* 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 int parse_oneside_change(const char *cp, int *mode,
- unsigned char *sha1, char *path)
-{
- int ch, m;
-
- m = 0;
- while ((ch = *cp) && '0' <= ch && ch <= '7') {
- m = (m << 3) | (ch - '0');
- cp++;
- }
- *mode = m;
- if (strncmp(cp, "\tblob\t", 6) && strncmp(cp, " blob ", 6))
- return -1;
- cp += 6;
- if (get_sha1_hex(cp, sha1))
- return -1;
- cp += 40;
- if ((*cp != '\t') && *cp != ' ')
- return -1;
- strcpy(path, ++cp);
- return 0;
-}
-
-static int parse_diff_raw_output(const char *buf)
-{
- char path[PATH_MAX];
- unsigned char old_sha1[20], new_sha1[20];
- const char *cp = buf;
- int ch, old_mode, new_mode;
-
- switch (*cp++) {
- case 'U':
- diff_unmerge(cp + 1);
- break;
- case '+':
- parse_oneside_change(cp, &new_mode, new_sha1, path);
- diff_addremove('+', new_mode, new_sha1, path, NULL);
- break;
- case '-':
- parse_oneside_change(cp, &old_mode, old_sha1, path);
- diff_addremove('-', old_mode, old_sha1, path, NULL);
- break;
- case '*':
- 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) && strncmp(cp, " blob ", 6))
- return -1;
- cp += 6;
- if (get_sha1_hex(cp, old_sha1))
- return -1;
- cp += 40;
- if (strncmp(cp, "->", 2))
- return -1;
- cp += 2;
- if (get_sha1_hex(cp, new_sha1))
- return -1;
- cp += 40;
- if ((*cp != '\t') && *cp != ' ')
- return -1;
- strcpy(path, ++cp);
- diff_change(old_mode, new_mode, old_sha1, new_sha1, path, NULL);
- break;
- default:
- return -1;
- }
- return 0;
-}
+static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int line_termination = '\n';
+static int inter_name_termination = '\t';
static const char *diff_helper_usage =
- "git-diff-helper [-z] [-R] [-M] paths...";
+ "git-diff-helper [-z] [-S<string>] paths...";
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;
- else if (av[1][1] == 'M') {
- detect_rename = 1;
- diff_score_opt = diff_scoreopt_parse(av[1]);
+ 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
usage(diff_helper_usage);
ac--; av++;
}
- /* the remaining parameters are paths patterns */
+ garbage_flush_format = (line_termination == 0) ? "%s" : "%s\n";
- diff_setup(detect_rename, diff_score_opt, reverse, -1, av+1, ac-1);
+ /* 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);
- if (status) {
- diff_flush();
- printf("%s%c", sb.buf, line_termination);
+ 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;
}
+ if (1 < ac)
+ diffcore_pathspec(av + 1);
+ if (pickaxe)
+ diffcore_pickaxe(pickaxe, pickaxe_opts);
+ diff_flush(DIFF_FORMAT_PATCH, 0);
+ printf(garbage_flush_format, sb.buf);
}
-
- diff_flush();
+ if (1 < ac)
+ diffcore_pathspec(av + 1);
+ if (pickaxe)
+ diffcore_pickaxe(pickaxe, pickaxe_opts);
+ diff_flush(DIFF_FORMAT_PATCH, 0);
return 0;
}
projects / git.git / blobdiff