X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=851722037df936c2b4e0ab6a9389291e74d5ae60;hb=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;hp=8297b7f3a950e66baa5369eb551ab9de453bf13b;hpb=fbe082a528861af785be15bb37d1c7d8f574daa4;p=git.git diff --git a/diff-tree.c b/diff-tree.c index 8297b7f3..85172203 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -1,6 +1,6 @@ -#include #include "cache.h" #include "diff.h" +#include "commit.h" static int show_root_diff = 0; static int verbose_header = 0; @@ -8,13 +8,12 @@ static int ignore_merges = 1; static int recursive = 0; static int show_tree_entry_in_recursive = 0; static int read_stdin = 0; -static int diff_output_format = DIFF_FORMAT_HUMAN; -static int detect_rename = 0; -static int reverse_diff = 0; -static int diff_score_opt = 0; -static const char *pickaxe = NULL; + +static struct diff_options diff_options; + static const char *header = NULL; static const char *header_prefix = ""; +static enum cmit_fmt commit_format = CMIT_FMT_RAW; // What paths are we interested in? static int nr_paths = 0; @@ -40,10 +39,12 @@ static const unsigned char *extract(void *tree, unsigned long size, const char * int len = strlen(tree)+1; const unsigned char *sha1 = tree + len; const char *path = strchr(tree, ' '); + unsigned int mode; - if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1) + if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1) die("corrupt tree file"); *pathp = path+1; + *modep = DIFF_FILE_CANON_MODE(mode); return sha1; } @@ -84,7 +85,7 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const return; } - diff_addremove(prefix[0], mode, sha1, base, path); + diff_addremove(&diff_options, prefix[0], mode, sha1, base, path); } static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base) @@ -108,7 +109,8 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns show_file("+", tree2, size2, base); return 1; } - if (!memcmp(sha1, sha2, 20) && mode1 == mode2) + if (!diff_options.find_copies_harder && + !memcmp(sha1, sha2, 20) && mode1 == mode2) return 0; /* @@ -125,13 +127,14 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns int retval; char *newbase = malloc_base(base, path1, pathlen1); if (show_tree_entry_in_recursive) - diff_change(mode1, mode2, sha1, sha2, base, path1); + diff_change(&diff_options, mode1, mode2, + sha1, sha2, base, path1); retval = diff_tree_sha1(sha1, sha2, newbase); free(newbase); return retval; } - diff_change(mode1, mode2, sha1, sha2, base, path1); + diff_change(&diff_options, mode1, mode2, sha1, sha2, base, path1); return 0; } @@ -253,37 +256,26 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co return retval; } -static void call_diff_setup(void) +static void call_diff_setup_done(void) { - diff_setup(reverse_diff); + diff_setup_done(&diff_options); } static int call_diff_flush(void) { - if (detect_rename) - diffcore_rename(detect_rename, diff_score_opt); - if (pickaxe) - diffcore_pickaxe(pickaxe); + diffcore_std(&diff_options); if (diff_queue_is_empty()) { - diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); + int saved_fmt = diff_options.output_format; + diff_options.output_format = DIFF_FORMAT_NO_OUTPUT; + diff_flush(&diff_options); + diff_options.output_format = saved_fmt; return 0; } if (header) { - if (diff_output_format == DIFF_FORMAT_MACHINE) { - const char *ep, *cp; - for (cp = header; *cp; cp = ep) { - ep = strchr(cp, '\n'); - if (ep == 0) ep = cp + strlen(cp); - printf("%.*s%c", ep-cp, cp, 0); - if (*ep) ep++; - } - } - else { - printf("%s", header); - } + printf("%s%c", header, diff_options.line_termination); header = NULL; } - diff_flush(diff_output_format, 1); + diff_flush(&diff_options); return 1; } @@ -292,7 +284,7 @@ static int diff_tree_sha1_top(const unsigned char *old, { int ret; - call_diff_setup(); + call_diff_setup_done(); ret = diff_tree_sha1(old, new, base); call_diff_flush(); return ret; @@ -304,7 +296,7 @@ static int diff_root_tree(const unsigned char *new, const char *base) void *tree; unsigned long size; - call_diff_setup(); + call_diff_setup_done(); tree = read_object_with_reference(new, "tree", &size, NULL); if (!tree) die("unable to read root tree (%s)", sha1_to_hex(new)); @@ -314,85 +306,16 @@ static int diff_root_tree(const unsigned char *new, const char *base) return retval; } -static int get_one_line(const char *msg, unsigned long len) -{ - int ret = 0; - - while (len--) { - ret++; - if (*msg++ == '\n') - break; - } - return ret; -} - -static int add_author_info(char *buf, const char *line, int len) -{ - char *date; - unsigned int namelen; - unsigned long time; - int tz; - - line += strlen("author "); - date = strchr(line, '>'); - if (!date) - return 0; - namelen = ++date - line; - time = strtoul(date, &date, 10); - tz = strtol(date, NULL, 10); - - return sprintf(buf, "Author: %.*s\nDate: %s\n", - namelen, line, - show_date(time, tz)); -} - -static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len) +static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len) { static char this_header[16384]; int offset; - offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent); - if (verbose_header) { - int hdr = 1; - - for (;;) { - const char *line = msg; - int linelen = get_one_line(msg, len); - - if (!linelen) - break; - - /* - * We want some slop for indentation and a possible - * final "...". Thus the "+ 20". - */ - if (offset + linelen + 20 > sizeof(this_header)) { - memcpy(this_header + offset, " ...\n", 8); - offset += 8; - break; - } - - msg += linelen; - len -= linelen; - if (linelen == 1) - hdr = 0; - if (hdr) { - if (!memcmp(line, "author ", 7)) - offset += add_author_info(this_header + offset, line, linelen); - continue; - } - memset(this_header + offset, ' ', 4); - memcpy(this_header + offset + 4, line, linelen); - offset += linelen + 4; - } - /* Make sure there is an EOLN */ - if (this_header[offset-1] != '\n') - this_header[offset++] = '\n'; - /* Add _another_ EOLN if we are doing diff output */ - this_header[offset++] = '\n'; - this_header[offset] = 0; - } + if (!verbose_header) + return commit; + offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent); + offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset); return this_header; } @@ -438,6 +361,7 @@ static int diff_tree_commit(const unsigned char *commit, const char *name) } offset += 48; } + free(buf); return 0; } @@ -463,17 +387,32 @@ static int diff_tree_stdin(char *line) return diff_tree_commit(commit, line); } -static char *diff_tree_usage = -"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-m] [-s] [-v] [-t] "; +static int count_paths(const char **paths) +{ + int i = 0; + while (*paths++) + i++; + return i; +} + +static const char diff_tree_usage[] = +"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] " +"[] " +COMMON_DIFF_OPTIONS_HELP; int main(int argc, const char **argv) { int nr_sha1; char line[1000]; unsigned char sha1[2][20]; + const char *prefix = setup_git_directory(); + git_config(git_default_config); nr_sha1 = 0; + diff_setup(&diff_options); + for (;;) { + int diff_opt_cnt; const char *arg; argv++; @@ -490,6 +429,16 @@ int main(int argc, const char **argv) break; } + diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc); + if (diff_opt_cnt < 0) + usage(diff_tree_usage); + else if (diff_opt_cnt) { + argv += diff_opt_cnt - 1; + argc -= diff_opt_cnt - 1; + continue; + } + + if (!strcmp(arg, "--")) { argv++; argc--; @@ -503,44 +452,19 @@ int main(int argc, const char **argv) recursive = show_tree_entry_in_recursive = 1; continue; } - if (!strcmp(arg, "-R")) { - reverse_diff = 1; - continue; - } - if (!strcmp(arg, "-p")) { - diff_output_format = DIFF_FORMAT_PATCH; - recursive = 1; - continue; - } - if (!strncmp(arg, "-S", 2)) { - pickaxe = arg + 2; - continue; - } - if (!strncmp(arg, "-M", 2)) { - detect_rename = DIFF_DETECT_RENAME; - diff_score_opt = diff_scoreopt_parse(arg); - continue; - } - if (!strncmp(arg, "-C", 2)) { - detect_rename = DIFF_DETECT_COPY; - diff_score_opt = diff_scoreopt_parse(arg); - continue; - } - if (!strcmp(arg, "-z")) { - diff_output_format = DIFF_FORMAT_MACHINE; - continue; - } if (!strcmp(arg, "-m")) { ignore_merges = 0; continue; } - if (!strcmp(arg, "-s")) { - diff_output_format = DIFF_FORMAT_NO_OUTPUT; + if (!strcmp(arg, "-v")) { + verbose_header = 1; + header_prefix = "diff-tree "; continue; } - if (!strcmp(arg, "-v")) { + if (!strncmp(arg, "--pretty", 8)) { verbose_header = 1; header_prefix = "diff-tree "; + commit_format = get_commit_format(arg+8); continue; } if (!strcmp(arg, "--stdin")) { @@ -553,12 +477,14 @@ int main(int argc, const char **argv) } usage(diff_tree_usage); } + if (diff_options.output_format == DIFF_FORMAT_PATCH) + recursive = 1; - if (argc > 0) { + paths = get_pathspec(prefix, argv); + if (paths) { int i; - paths = argv; - nr_paths = argc; + nr_paths = count_paths(paths); pathlens = xmalloc(nr_paths * sizeof(int)); for (i=0; i