X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=f55a35a9d5f9ae4e3f7d3fd778a953cc9cc533ad;hb=9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3;hp=44bc2381c9cd4ab6e10e8bd8b519b564a1b9014b;hpb=3815f423ae39bf774de3c268c6d3e3b72128a4e5;p=git.git diff --git a/diff-tree.c b/diff-tree.c index 44bc2381..f55a35a9 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -6,7 +6,10 @@ static int show_root_diff = 0; static int no_commit_id = 0; static int verbose_header = 0; static int ignore_merges = 1; +static int combine_merges = 0; +static int dense_combined_merges = 0; static int read_stdin = 0; +static int always_show_header = 0; static const char *header = NULL; static const char *header_prefix = ""; @@ -80,42 +83,53 @@ static const char *generate_header(const unsigned char *commit_sha1, offset = sprintf(this_header, "%s%s ", header_prefix, diff_unique_abbrev(commit_sha1, abbrev)); - offset += sprintf(this_header + offset, "(from %s)\n", - parent_sha1 ? - diff_unique_abbrev(parent_sha1, abbrev) : "root"); + 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_sha1) +static int diff_tree_commit(struct commit *commit) { - struct commit *commit; struct commit_list *parents; - char name[50]; - unsigned char sha1[20]; + unsigned const char *sha1 = commit->object.sha1; - sprintf(name, "%s^0", sha1_to_hex(commit_sha1)); - if (get_sha1(name, sha1)) - return -1; - name[40] = 0; - commit = lookup_commit(sha1); - /* Root commit? */ if (show_root_diff && !commit->parents) { header = generate_header(sha1, NULL, commit); - diff_root_tree(commit_sha1, ""); + diff_root_tree(sha1, ""); } /* More than one parent? */ - if (ignore_merges && commit->parents && commit->parents->next) - return 0; + 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; + } + } 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, commit_sha1, ""); + diff_tree_sha1_top(parent->object.sha1, sha1, ""); if (!header && verbose_header) { header_prefix = "\ndiff-tree "; /* @@ -127,33 +141,54 @@ static int diff_tree_commit(const unsigned char *commit_sha1) 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]; - int abbrev = diff_options.abbrev; + 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", - diff_unique_abbrev(commit, abbrev), - diff_unique_abbrev(parent, abbrev)); - 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); } 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" @@ -216,6 +251,14 @@ int main(int argc, const char **argv) ignore_merges = 0; continue; } + if (!strcmp(arg, "-c")) { + combine_merges = 1; + continue; + } + if (!strcmp(arg, "--cc")) { + dense_combined_merges = combine_merges = 1; + continue; + } if (!strcmp(arg, "-v")) { verbose_header = 1; header_prefix = "diff-tree "; @@ -239,8 +282,20 @@ int main(int argc, const char **argv) no_commit_id = 1; continue; } + if (!strcmp(arg, "--always")) { + always_show_header = 1; + continue; + } usage(diff_tree_usage); } + + if (combine_merges) + ignore_merges = 0; + + /* We can only do dense combined merges with diff output */ + if (dense_combined_merges) + diff_options.output_format = DIFF_FORMAT_PATCH; + if (diff_options.output_format == DIFF_FORMAT_PATCH) diff_options.recursive = 1; @@ -253,7 +308,7 @@ int main(int argc, const char **argv) usage(diff_tree_usage); break; case 1: - diff_tree_commit(sha1[0]); + diff_tree_commit_sha1(sha1[0]); break; case 2: diff_tree_sha1_top(sha1[0], sha1[1], "");