X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=2b79dd0a68c30343d74e3e82c056fef6a355e82e;hb=2283645b85dc91ca958b05066511083255a8612a;hp=ed323d877cad1e78e08f84c1e9ee1ebb09f05d91;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git diff --git a/diff-tree.c b/diff-tree.c index ed323d87..2b79dd0a 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -1,155 +1,58 @@ #include "cache.h" #include "diff.h" #include "commit.h" +#include "log-tree.h" -static int show_root_diff = 0; -static int verbose_header = 0; -static int ignore_merges = 1; -static int read_stdin = 0; +static struct log_tree_opt log_tree_opt; -static const char *header = NULL; -static const char *header_prefix = ""; -static enum cmit_fmt commit_format = CMIT_FMT_RAW; - -static struct diff_options diff_options; - -static void call_diff_setup_done(void) -{ - diff_setup_done(&diff_options); -} - -static int call_diff_flush(void) -{ - diffcore_std(&diff_options); - if (diff_queue_is_empty()) { - 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_options.line_termination); - header = NULL; - } - diff_flush(&diff_options); - return 1; -} - -static int diff_tree_sha1_top(const unsigned char *old, - const unsigned char *new, const char *base) -{ - int ret; - - call_diff_setup_done(); - ret = diff_tree_sha1(old, new, base, &diff_options); - call_diff_flush(); - return ret; -} - -static int diff_root_tree(const unsigned char *new, const char *base) -{ - int retval; - void *tree; - struct tree_desc empty, real; - - call_diff_setup_done(); - tree = read_object_with_reference(new, "tree", &real.size, NULL); - if (!tree) - die("unable to read root tree (%s)", sha1_to_hex(new)); - 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 char this_header[16384]; - int offset; - - 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; -} - -static int diff_tree_commit(const unsigned char *commit, const char *name) +static int diff_tree_commit_sha1(const unsigned char *sha1) { - unsigned long size, offset; - char *buf = read_object_with_reference(commit, "commit", &size, NULL); - - if (!buf) + struct commit *commit = lookup_commit_reference(sha1); + if (!commit) return -1; - - if (!name) { - static char commit_name[60]; - strcpy(commit_name, sha1_to_hex(commit)); - name = commit_name; - } - - /* Root commit? */ - if (show_root_diff && memcmp(buf + 46, "parent ", 7)) { - header = generate_header(name, "root", buf, size); - diff_root_tree(commit, ""); - } - - /* More than one parent? */ - if (ignore_merges) { - if (!memcmp(buf + 46 + 48, "parent ", 7)) - 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, ""); - if (!header && verbose_header) { - header_prefix = "\ndiff-tree "; - /* - * Don't print multiple merge entries if we - * don't print the diffs. - */ - } - offset += 48; - } - free(buf); - return 0; + return log_tree_commit(&log_tree_opt, 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 log_tree_commit(&log_tree_opt, commit); } static const char diff_tree_usage[] = -"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] " +"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" @@ -161,13 +64,15 @@ int main(int argc, const char **argv) char line[1000]; unsigned char sha1[2][20]; const char *prefix = setup_git_directory(); + static struct log_tree_opt *opt = &log_tree_opt; + int read_stdin = 0; - git_config(git_default_config); + git_config(git_diff_config); nr_sha1 = 0; - diff_setup(&diff_options); + init_log_tree_opt(opt); for (;;) { - int diff_opt_cnt; + int opt_cnt; const char *arg; argv++; @@ -184,59 +89,39 @@ int main(int argc, const char **argv) break; } - diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc); - if (diff_opt_cnt < 0) + opt_cnt = log_tree_opt_parse(opt, argv, argc); + if (opt_cnt < 0) usage(diff_tree_usage); - else if (diff_opt_cnt) { - argv += diff_opt_cnt - 1; - argc -= diff_opt_cnt - 1; + else if (opt_cnt) { + argv += opt_cnt - 1; + argc -= opt_cnt - 1; continue; } - if (!strcmp(arg, "--")) { argv++; argc--; break; } - if (!strcmp(arg, "-r")) { - diff_options.recursive = 1; - continue; - } - if (!strcmp(arg, "-t")) { - diff_options.recursive = 1; - diff_options.tree_in_recursive = 1; - continue; - } - if (!strcmp(arg, "-m")) { - ignore_merges = 0; - continue; - } - if (!strcmp(arg, "-v")) { - verbose_header = 1; - header_prefix = "diff-tree "; - continue; - } - if (!strncmp(arg, "--pretty", 8)) { - verbose_header = 1; - header_prefix = "diff-tree "; - commit_format = get_commit_format(arg+8); - continue; - } if (!strcmp(arg, "--stdin")) { read_stdin = 1; continue; } - if (!strcmp(arg, "--root")) { - show_root_diff = 1; - continue; - } usage(diff_tree_usage); } - if (diff_options.output_format == DIFF_FORMAT_PATCH) - diff_options.recursive = 1; - diff_tree_setup_paths(get_pathspec(prefix, argv)); + if (opt->combine_merges) + opt->ignore_merges = 0; + + /* We can only do dense combined merges with diff output */ + if (opt->dense_combined_merges) + opt->diffopt.output_format = DIFF_FORMAT_PATCH; + + if (opt->diffopt.output_format == DIFF_FORMAT_PATCH) + opt->diffopt.recursive = 1; + + diff_tree_setup_paths(get_pathspec(prefix, argv), opt); + diff_setup_done(&opt->diffopt); switch (nr_sha1) { case 0: @@ -244,18 +129,19 @@ int main(int argc, const char **argv) usage(diff_tree_usage); break; case 1: - diff_tree_commit(sha1[0], NULL); + diff_tree_commit_sha1(sha1[0]); break; case 2: - diff_tree_sha1_top(sha1[0], sha1[1], ""); + diff_tree_sha1(sha1[0], sha1[1], "", &opt->diffopt); + log_tree_diff_flush(opt); break; } if (!read_stdin) return 0; - if (diff_options.detect_rename) - diff_options.setup |= (DIFF_SETUP_USE_SIZE_CACHE | + if (opt->diffopt.detect_rename) + opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE | DIFF_SETUP_USE_CACHE); while (fgets(line, sizeof(line), stdin)) diff_tree_stdin(line);