X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-tree.c;h=c33f54a2d4c2885aed55c4fc9cd5e6c6f6259783;hb=f345b0a066572206aac4a4f9a57d746e213b6bff;hp=68186484b14d8e3293d1436f772b59b0132d3287;hpb=d6db01075b65da2b8584a0450619390893aae103;p=git.git diff --git a/diff-tree.c b/diff-tree.c index 68186484b..c33f54a2d 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -2,24 +2,25 @@ #include "cache.h" #include "diff.h" -static int silent = 0; static int show_root_diff = 0; static int verbose_header = 0; static int ignore_merges = 1; static int recursive = 0; +static int show_tree_entry_in_recursive = 0; static int read_stdin = 0; -static int line_termination = '\n'; -static int generate_patch = 0; +static int diff_output_format = DIFF_FORMAT_HUMAN; static int detect_rename = 0; -static int reverse_diff = 0; +static int diff_setup_opt = 0; static int diff_score_opt = 0; static const char *pickaxe = NULL; +static int pickaxe_opts = 0; +static int diff_break_opt = -1; static const char *header = NULL; static const char *header_prefix = ""; // What paths are we interested in? static int nr_paths = 0; -static char **paths = NULL; +static const char **paths = NULL; static int *pathlens = NULL; static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base); @@ -68,14 +69,6 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const const char *path; const unsigned char *sha1 = extract(tree, size, &path, &mode); - if (header) { - printf("%s", header); - header = NULL; - } - - if (silent) - return; - if (recursive && S_ISDIR(mode)) { char type[20]; unsigned long size; @@ -133,18 +126,13 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns if (recursive && S_ISDIR(mode1)) { int retval; char *newbase = malloc_base(base, path1, pathlen1); + if (show_tree_entry_in_recursive) + diff_change(mode1, mode2, sha1, sha2, base, path1); retval = diff_tree_sha1(sha1, sha2, newbase); free(newbase); return retval; } - if (header) { - printf("%s", header); - header = NULL; - } - if (silent) - return 0; - diff_change(mode1, mode2, sha1, sha2, base, path1); return 0; } @@ -267,16 +255,41 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co return retval; } +static void call_diff_setup(void) +{ + diff_setup(diff_setup_opt); +} + +static int call_diff_flush(void) +{ + diffcore_std(0, + detect_rename, diff_score_opt, + pickaxe, pickaxe_opts, + diff_break_opt); + if (diff_queue_is_empty()) { + diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); + return 0; + } + if (header) { + const char *fmt = "%s"; + if (diff_output_format == DIFF_FORMAT_MACHINE) + fmt = "%s%c"; + + printf(fmt, header, 0); + header = NULL; + } + diff_flush(diff_output_format, 1); + return 1; +} + static int diff_tree_sha1_top(const unsigned char *old, const unsigned char *new, const char *base) { int ret; - diff_setup(detect_rename, diff_score_opt, pickaxe, - reverse_diff, (generate_patch ? -1 : line_termination), - NULL, 0); + call_diff_setup(); ret = diff_tree_sha1(old, new, base); - diff_flush(); + call_diff_flush(); return ret; } @@ -286,15 +299,13 @@ static int diff_root_tree(const unsigned char *new, const char *base) void *tree; unsigned long size; - diff_setup(detect_rename, diff_score_opt, pickaxe, - reverse_diff, (generate_patch ? -1 : line_termination), - NULL, 0); + call_diff_setup(); tree = read_object_with_reference(new, "tree", &size, NULL); if (!tree) die("unable to read root tree (%s)", sha1_to_hex(new)); retval = diff_tree("", 0, tree, size, base); free(tree); - diff_flush(); + call_diff_flush(); return retval; } @@ -373,8 +384,7 @@ static char *generate_header(const char *commit, const char *parent, const char if (this_header[offset-1] != '\n') this_header[offset++] = '\n'; /* Add _another_ EOLN if we are doing diff output */ - if (!silent) - this_header[offset++] = '\n'; + this_header[offset++] = '\n'; this_header[offset] = 0; } @@ -420,8 +430,6 @@ static int diff_tree_commit(const unsigned char *commit, const char *name) * Don't print multiple merge entries if we * don't print the diffs. */ - if (silent) - break; } offset += 48; } @@ -451,9 +459,9 @@ static int diff_tree_stdin(char *line) } static char *diff_tree_usage = -"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-m] [-s] [-v] "; +"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-m] [-s] [-v] [-t] "; -int main(int argc, char **argv) +int main(int argc, const char **argv) { int nr_sha1; char line[1000]; @@ -461,7 +469,7 @@ int main(int argc, char **argv) nr_sha1 = 0; for (;;) { - char *arg; + const char *arg; argv++; argc--; @@ -486,31 +494,43 @@ int main(int argc, char **argv) recursive = 1; continue; } + if (!strcmp(arg, "-t")) { + recursive = show_tree_entry_in_recursive = 1; + continue; + } if (!strcmp(arg, "-R")) { - reverse_diff = 1; + diff_setup_opt |= DIFF_SETUP_REVERSE; continue; } if (!strcmp(arg, "-p")) { - recursive = generate_patch = 1; + diff_output_format = DIFF_FORMAT_PATCH; + recursive = 1; continue; } if (!strncmp(arg, "-S", 2)) { pickaxe = arg + 2; continue; } + if (!strcmp(arg, "--pickaxe-all")) { + pickaxe_opts = DIFF_PICKAXE_ALL; + continue; + } if (!strncmp(arg, "-M", 2)) { - detect_rename = recursive = generate_patch = 1; + detect_rename = DIFF_DETECT_RENAME; diff_score_opt = diff_scoreopt_parse(arg); continue; } if (!strncmp(arg, "-C", 2)) { - detect_rename = 2; - recursive = generate_patch = 1; + detect_rename = DIFF_DETECT_COPY; diff_score_opt = diff_scoreopt_parse(arg); continue; } + if (!strncmp(arg, "-B", 2)) { + diff_break_opt = diff_scoreopt_parse(arg); + continue; + } if (!strcmp(arg, "-z")) { - line_termination = '\0'; + diff_output_format = DIFF_FORMAT_MACHINE; continue; } if (!strcmp(arg, "-m")) { @@ -518,7 +538,7 @@ int main(int argc, char **argv) continue; } if (!strcmp(arg, "-s")) { - silent = 1; + diff_output_format = DIFF_FORMAT_NO_OUTPUT; continue; } if (!strcmp(arg, "-v")) { @@ -563,6 +583,9 @@ int main(int argc, char **argv) if (!read_stdin) return 0; + if (detect_rename) + diff_setup_opt |= (DIFF_SETUP_USE_SIZE_CACHE | + DIFF_SETUP_USE_CACHE); while (fgets(line, sizeof(line), stdin)) diff_tree_stdin(line);