X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-tree.c;h=233a25066818b49c94112f6f2680c6f6d7c881f8;hb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;hp=59d12f2ba1325bad77dd062936c20cd9cc4d602f;hpb=850e82d889f374465dc7aa6cb4af3098c7e02f1f;p=git.git diff --git a/diff-tree.c b/diff-tree.c index 59d12f2b..233a2506 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -3,12 +3,17 @@ #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 read_stdin = 0; static int line_termination = '\n'; static int generate_patch = 0; +static int detect_rename = 0; +static int reverse_diff = 0; +static int diff_score_opt = 0; +static char *pickaxe = 0; static const char *header = NULL; static const char *header_prefix = ""; @@ -82,21 +87,13 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const die("corrupt tree sha %s", sha1_to_hex(sha1)); show_tree(prefix, tree, size, newbase); - + free(tree); free(newbase); return; } - if (generate_patch) { - if (!S_ISDIR(mode)) - diff_addremove(prefix[0], mode, sha1, base, path); - } - else - printf("%s%06o\t%s\t%s\t%s%s%c", prefix, mode, - S_ISDIR(mode) ? "tree" : "blob", - sha1_to_hex(sha1), base, path, - line_termination); + 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) @@ -105,14 +102,13 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns const char *path1, *path2; const unsigned char *sha1, *sha2; int cmp, pathlen1, pathlen2; - char old_sha1_hex[50]; sha1 = extract(tree1, size1, &path1, &mode1); sha2 = extract(tree2, size2, &path2, &mode2); pathlen1 = strlen(path1); pathlen2 = strlen(path2); - cmp = cache_name_compare(path1, pathlen1, path2, pathlen2); + cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2); if (cmp < 0) { show_file("-", tree1, size1, base); return -1; @@ -149,17 +145,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns if (silent) return 0; - if (generate_patch) { - if (!S_ISDIR(mode1)) - diff_change(mode1, mode2, sha1, sha2, base, path1); - } - else { - strcpy(old_sha1_hex, sha1_to_hex(sha1)); - printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1, mode2, - S_ISDIR(mode1) ? "tree" : "blob", - old_sha1_hex, sha1_to_hex(sha2), base, path1, - line_termination); - } + diff_change(mode1, mode2, sha1, sha2, base, path1); return 0; } @@ -258,7 +244,7 @@ static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned lon update_tree_entry(&tree2, &size2); continue; } - die("diff-tree: internal error"); + die("git-diff-tree: internal error"); } return 0; } @@ -269,10 +255,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co unsigned long size1, size2; int retval; - tree1 = read_object_with_reference(old, "tree", &size1, 0); + 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, 0); + 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); @@ -281,6 +267,37 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co return retval; } +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); + ret = diff_tree_sha1(old, new, base); + diff_flush(); + return ret; +} + +static int diff_root_tree(const unsigned char *new, const char *base) +{ + int retval; + void *tree; + unsigned long size; + + diff_setup(detect_rename, diff_score_opt, pickaxe, + reverse_diff, (generate_patch ? -1 : line_termination), + NULL, 0); + 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(); + return retval; +} + static int get_one_line(const char *msg, unsigned long len) { int ret = 0; @@ -359,25 +376,31 @@ static int diff_tree_commit(const unsigned char *commit, const char *name) if (!buf) return -1; - /* More than one parent? */ - if (ignore_merges) { - if (!memcmp(buf + 46 + 48, "parent ", 7)) - return 0; - } - 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(parent, commit, ""); + diff_tree_sha1_top(parent, commit, ""); if (!header && verbose_header) header_prefix = "\ndiff-tree "; offset += 48; @@ -401,14 +424,14 @@ static int diff_tree_stdin(char *line) line[81] = 0; sprintf(this_header, "%s (from %s)\n", line, line+41); header = this_header; - return diff_tree_sha1(parent, commit, ""); + return diff_tree_sha1_top(parent, commit, ""); } line[40] = 0; return diff_tree_commit(commit, line); } static char *diff_tree_usage = -"diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] "; +"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-m] [-s] [-v] "; int main(int argc, char **argv) { @@ -443,10 +466,29 @@ int main(int argc, char **argv) recursive = 1; continue; } + if (!strcmp(arg, "-R")) { + reverse_diff = 1; + continue; + } if (!strcmp(arg, "-p")) { recursive = generate_patch = 1; continue; } + if (!strncmp(arg, "-S", 2)) { + pickaxe = arg + 2; + continue; + } + if (!strncmp(arg, "-M", 2)) { + detect_rename = recursive = generate_patch = 1; + diff_score_opt = diff_scoreopt_parse(arg); + continue; + } + if (!strncmp(arg, "-C", 2)) { + detect_rename = 2; + recursive = generate_patch = 1; + diff_score_opt = diff_scoreopt_parse(arg); + continue; + } if (!strcmp(arg, "-z")) { line_termination = '\0'; continue; @@ -468,6 +510,10 @@ int main(int argc, char **argv) read_stdin = 1; continue; } + if (!strcmp(arg, "--root")) { + show_root_diff = 1; + continue; + } usage(diff_tree_usage); } @@ -490,7 +536,7 @@ int main(int argc, char **argv) diff_tree_commit(sha1[0], NULL); break; case 2: - diff_tree_sha1(sha1[0], sha1[1], ""); + diff_tree_sha1_top(sha1[0], sha1[1], ""); break; }