X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=f55a35a9d5f9ae4e3f7d3fd778a953cc9cc533ad;hb=9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3;hp=ea237051ee5e5249f8096ae75b188b6b7a55011a;hpb=acb46f8769dd0031a98a284e06ebc5a09b151bfd;p=git.git diff --git a/diff-tree.c b/diff-tree.c index ea237051..f55a35a9 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -1,289 +1,38 @@ -#include #include "cache.h" #include "diff.h" #include "commit.h" static int show_root_diff = 0; +static int no_commit_id = 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 combine_merges = 0; +static int dense_combined_merges = 0; static int read_stdin = 0; -static int diff_output_format = DIFF_FORMAT_HUMAN; -static int detect_rename = 0; -static int find_copies_harder = 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 *orderfile = NULL; -static const char *diff_filter = NULL; +static int always_show_header = 0; + 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; -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); - -static void update_tree_entry(void **bufp, unsigned long *sizep) -{ - void *buf = *bufp; - unsigned long size = *sizep; - int len = strlen(buf) + 1 + 20; - - if (size < len) - die("corrupt tree file"); - *bufp = buf + len; - *sizep = size - len; -} - -static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep) -{ - 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", &mode) != 1) - die("corrupt tree file"); - *pathp = path+1; - *modep = DIFF_FILE_CANON_MODE(mode); - return sha1; -} - -static char *malloc_base(const char *base, const char *path, int pathlen) -{ - int baselen = strlen(base); - char *newbase = xmalloc(baselen + pathlen + 2); - memcpy(newbase, base, baselen); - memcpy(newbase + baselen, path, pathlen); - memcpy(newbase + baselen + pathlen, "/", 2); - return newbase; -} - -static void show_file(const char *prefix, void *tree, unsigned long size, const char *base); -static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base); - -/* A file entry went away or appeared */ -static void show_file(const char *prefix, void *tree, unsigned long size, const char *base) -{ - unsigned mode; - const char *path; - const unsigned char *sha1 = extract(tree, size, &path, &mode); - - if (recursive && S_ISDIR(mode)) { - char type[20]; - unsigned long size; - char *newbase = malloc_base(base, path, strlen(path)); - void *tree; - - tree = read_sha1_file(sha1, type, &size); - if (!tree || strcmp(type, "tree")) - die("corrupt tree sha %s", sha1_to_hex(sha1)); - - show_tree(prefix, tree, size, newbase); - - free(tree); - free(newbase); - return; - } - - diff_addremove(prefix[0], mode, sha1, base, path); -} - -static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base) -{ - unsigned mode1, mode2; - const char *path1, *path2; - const unsigned char *sha1, *sha2; - int cmp, pathlen1, pathlen2; - - sha1 = extract(tree1, size1, &path1, &mode1); - sha2 = extract(tree2, size2, &path2, &mode2); - - pathlen1 = strlen(path1); - pathlen2 = strlen(path2); - cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2); - if (cmp < 0) { - show_file("-", tree1, size1, base); - return -1; - } - if (cmp > 0) { - show_file("+", tree2, size2, base); - return 1; - } - if (!find_copies_harder && !memcmp(sha1, sha2, 20) && mode1 == mode2) - return 0; - - /* - * If the filemode has changed to/from a directory from/to a regular - * file, we need to consider it a remove and an add. - */ - if (S_ISDIR(mode1) != S_ISDIR(mode2)) { - show_file("-", tree1, size1, base); - show_file("+", tree2, size2, base); - return 0; - } - - 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; - } - - diff_change(mode1, mode2, sha1, sha2, base, path1); - return 0; -} - -static int interesting(void *tree, unsigned long size, const char *base) -{ - const char *path; - unsigned mode; - int i; - int baselen, pathlen; - - if (!nr_paths) - return 1; - - (void)extract(tree, size, &path, &mode); - - pathlen = strlen(path); - baselen = strlen(base); - - for (i=0; i < nr_paths; i++) { - const char *match = paths[i]; - int matchlen = pathlens[i]; - - if (baselen >= matchlen) { - /* If it doesn't match, move along... */ - if (strncmp(base, match, matchlen)) - continue; - - /* The base is a subdirectory of a path which was specified. */ - return 1; - } - - /* Does the base match? */ - if (strncmp(base, match, baselen)) - continue; - - match += baselen; - matchlen -= baselen; - - if (pathlen > matchlen) - continue; - - if (matchlen > pathlen) { - if (match[pathlen] != '/') - continue; - if (!S_ISDIR(mode)) - continue; - } - - if (strncmp(path, match, pathlen)) - continue; - - return 1; - } - return 0; /* No matches */ -} - -/* A whole sub-tree went away or appeared */ -static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base) -{ - while (size) { - if (interesting(tree, size, base)) - show_file(prefix, tree, size, base); - update_tree_entry(&tree, &size); - } -} - -static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base) -{ - while (size1 | size2) { - if (nr_paths && size1 && !interesting(tree1, size1, base)) { - update_tree_entry(&tree1, &size1); - continue; - } - if (nr_paths && size2 && !interesting(tree2, size2, base)) { - update_tree_entry(&tree2, &size2); - continue; - } - if (!size1) { - show_file("+", tree2, size2, base); - update_tree_entry(&tree2, &size2); - continue; - } - if (!size2) { - show_file("-", tree1, size1, base); - update_tree_entry(&tree1, &size1); - continue; - } - switch (compare_tree_entry(tree1, size1, tree2, size2, base)) { - case -1: - update_tree_entry(&tree1, &size1); - continue; - case 0: - update_tree_entry(&tree1, &size1); - /* Fallthrough */ - case 1: - update_tree_entry(&tree2, &size2); - continue; - } - die("git-diff-tree: internal error"); - } - return 0; -} - -static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base) -{ - void *tree1, *tree2; - unsigned long size1, size2; - int retval; - - tree1 = read_object_with_reference(old, "tree", &size1, NULL); - if (!tree1) - die("unable to read source tree (%s)", sha1_to_hex(old)); - tree2 = read_object_with_reference(new, "tree", &size2, NULL); - if (!tree2) - die("unable to read destination tree (%s)", sha1_to_hex(new)); - retval = diff_tree(tree1, size1, tree2, size2, base); - free(tree1); - free(tree2); - return retval; -} - -static void call_diff_setup(void) -{ - diff_setup(diff_setup_opt); -} +static struct diff_options diff_options; static int call_diff_flush(void) { - diffcore_std(NULL, - detect_rename, diff_score_opt, - pickaxe, pickaxe_opts, - diff_break_opt, - orderfile, - diff_filter); + diffcore_std(&diff_options); if (diff_queue_is_empty()) { - diff_flush(DIFF_FORMAT_NO_OUTPUT); + 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) { - printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n'); + if (!no_commit_id) + printf("%s%c", header, diff_options.line_termination); header = NULL; } - diff_flush(diff_output_format); + diff_flush(&diff_options); return 1; } @@ -292,8 +41,7 @@ static int diff_tree_sha1_top(const unsigned char *old, { int ret; - call_diff_setup(); - ret = diff_tree_sha1(old, new, base); + ret = diff_tree_sha1(old, new, base, &diff_options); call_diff_flush(); return ret; } @@ -302,64 +50,86 @@ static int diff_root_tree(const unsigned char *new, const char *base) { int retval; void *tree; - unsigned long size; + struct tree_desc empty, real; - call_diff_setup(); - tree = read_object_with_reference(new, "tree", &size, NULL); + tree = read_object_with_reference(new, "tree", &real.size, NULL); if (!tree) die("unable to read root tree (%s)", sha1_to_hex(new)); - retval = diff_tree("", 0, tree, size, base); + real.buf = tree; + + empty.buf = ""; + empty.size = 0; + retval = diff_tree(&empty, &real, base, &diff_options); free(tree); call_diff_flush(); return retval; } -static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len) +static const char *generate_header(const unsigned char *commit_sha1, + const unsigned char *parent_sha1, + const struct commit *commit) { static char this_header[16384]; int offset; + unsigned long len; + int abbrev = diff_options.abbrev; + const char *msg = commit->buffer; 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 sha1_to_hex(commit_sha1); + + len = strlen(msg); + + offset = sprintf(this_header, "%s%s ", + header_prefix, + diff_unique_abbrev(commit_sha1, abbrev)); + if (commit_sha1 != parent_sha1) + offset += sprintf(this_header + offset, "(from %s)\n", + parent_sha1 + ? diff_unique_abbrev(parent_sha1, abbrev) + : "root"); + else + offset += sprintf(this_header + offset, "(from parents)\n"); + offset += pretty_print_commit(commit_format, commit, len, + this_header + offset, + sizeof(this_header) - offset, abbrev); + if (always_show_header) { + puts(this_header); + return NULL; + } return this_header; } -static int diff_tree_commit(const unsigned char *commit, const char *name) +static int diff_tree_commit(struct commit *commit) { - unsigned long size, offset; - char *buf = read_object_with_reference(commit, "commit", &size, NULL); - - if (!buf) - return -1; - - if (!name) { - static char commit_name[60]; - strcpy(commit_name, sha1_to_hex(commit)); - name = commit_name; - } + struct commit_list *parents; + unsigned const char *sha1 = commit->object.sha1; /* Root commit? */ - if (show_root_diff && memcmp(buf + 46, "parent ", 7)) { - header = generate_header(name, "root", buf, size); - diff_root_tree(commit, ""); + if (show_root_diff && !commit->parents) { + header = generate_header(sha1, NULL, commit); + diff_root_tree(sha1, ""); } /* More than one parent? */ - if (ignore_merges) { - if (!memcmp(buf + 46 + 48, "parent ", 7)) + if (commit->parents && commit->parents->next) { + if (ignore_merges) return 0; + else if (combine_merges) { + header = generate_header(sha1, sha1, commit); + header = diff_tree_combined_merge(sha1, header, + dense_combined_merges, + &diff_options); + if (!header && verbose_header) + header_prefix = "\ndiff-tree "; + return 0; + } } - offset = 46; - while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) { - unsigned char parent[20]; - if (get_sha1_hex(buf + offset + 7, parent)) - return -1; - header = generate_header(name, sha1_to_hex(parent), buf, size); - diff_tree_sha1_top(parent, commit, ""); + for (parents = commit->parents; parents; parents = parents->next) { + struct commit *parent = parents->item; + header = generate_header(sha1, parent->object.sha1, commit); + diff_tree_sha1_top(parent->object.sha1, sha1, ""); if (!header && verbose_header) { header_prefix = "\ndiff-tree "; /* @@ -367,44 +137,76 @@ static int diff_tree_commit(const unsigned char *commit, const char *name) * don't print the diffs. */ } - offset += 48; } return 0; } +static int diff_tree_commit_sha1(const unsigned char *sha1) +{ + struct commit *commit = lookup_commit_reference(sha1); + if (!commit) + return -1; + return diff_tree_commit(commit); +} + static int diff_tree_stdin(char *line) { int len = strlen(line); - unsigned char commit[20], parent[20]; - static char this_header[1000]; + unsigned char sha1[20]; + struct commit *commit; if (!len || line[len-1] != '\n') return -1; line[len-1] = 0; - if (get_sha1_hex(line, commit)) + if (get_sha1_hex(line, sha1)) + return -1; + commit = lookup_commit(sha1); + if (!commit || parse_commit(commit)) return -1; - if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) { - line[40] = 0; - line[81] = 0; - sprintf(this_header, "%s (from %s)\n", line, line+41); - header = this_header; - return diff_tree_sha1_top(parent, commit, ""); + if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) { + /* Graft the fake parents locally to the commit */ + int pos = 41; + struct commit_list **pptr, *parents; + + /* Free the real parent list */ + for (parents = commit->parents; parents; ) { + struct commit_list *tmp = parents->next; + free(parents); + parents = tmp; + } + commit->parents = NULL; + pptr = &(commit->parents); + while (line[pos] && !get_sha1_hex(line + pos, sha1)) { + struct commit *parent = lookup_commit(sha1); + if (parent) { + pptr = &commit_list_insert(parent, pptr)->next; + } + pos += 41; + } } - line[40] = 0; - return diff_tree_commit(commit, line); + return diff_tree_commit(commit); } -static char *diff_tree_usage = -"git-diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-R] [-B] [-M] [-C] [--find-copies-header] [-O] [-S] [--pickaxe-all] "; +static const char diff_tree_usage[] = +"git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] " +"[] [] [...]\n" +" -r diff recursively\n" +" --root include the initial commit as diff against /dev/null\n" +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_diff_config); nr_sha1 = 0; + diff_setup(&diff_options); + for (;;) { + int diff_opt_cnt; const char *arg; argv++; @@ -421,75 +223,40 @@ 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--; break; } if (!strcmp(arg, "-r")) { - recursive = 1; + diff_options.recursive = 1; continue; } if (!strcmp(arg, "-t")) { - recursive = show_tree_entry_in_recursive = 1; - continue; - } - if (!strcmp(arg, "-R")) { - diff_setup_opt |= DIFF_SETUP_REVERSE; - continue; - } - if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) { - diff_output_format = DIFF_FORMAT_PATCH; - recursive = 1; - continue; - } - if (!strncmp(arg, "-S", 2)) { - pickaxe = arg + 2; - continue; - } - if (!strncmp(arg, "-O", 2)) { - orderfile = arg + 2; - continue; - } - if (!strncmp(arg, "--diff-filter=", 14)) { - diff_filter = arg + 14; - continue; - } - if (!strcmp(arg, "--pickaxe-all")) { - pickaxe_opts = DIFF_PICKAXE_ALL; - continue; - } - if (!strncmp(arg, "-M", 2)) { - detect_rename = DIFF_DETECT_RENAME; - if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1) - usage(diff_tree_usage); - continue; - } - if (!strncmp(arg, "-C", 2)) { - detect_rename = DIFF_DETECT_COPY; - if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1) - usage(diff_tree_usage); - continue; - } - if (!strncmp(arg, "-B", 2)) { - if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1) - usage(diff_tree_usage); - continue; - } - if (!strcmp(arg, "--find-copies-harder")) { - find_copies_harder = 1; - continue; - } - if (!strcmp(arg, "-z")) { - diff_output_format = DIFF_FORMAT_MACHINE; + diff_options.recursive = 1; + diff_options.tree_in_recursive = 1; continue; } if (!strcmp(arg, "-m")) { ignore_merges = 0; continue; } - if (!strcmp(arg, "-s")) { - diff_output_format = DIFF_FORMAT_NO_OUTPUT; + if (!strcmp(arg, "-c")) { + combine_merges = 1; + continue; + } + if (!strcmp(arg, "--cc")) { + dense_combined_merges = combine_merges = 1; continue; } if (!strcmp(arg, "-v")) { @@ -511,20 +278,29 @@ int main(int argc, const char **argv) show_root_diff = 1; continue; } + if (!strcmp(arg, "--no-commit-id")) { + no_commit_id = 1; + continue; + } + if (!strcmp(arg, "--always")) { + always_show_header = 1; + continue; + } usage(diff_tree_usage); } - if (find_copies_harder && detect_rename != DIFF_DETECT_COPY) - usage(diff_tree_usage); - if (argc > 0) { - int i; + if (combine_merges) + ignore_merges = 0; - paths = argv; - nr_paths = argc; - pathlens = xmalloc(nr_paths * sizeof(int)); - for (i=0; i