#include "cache.h"
+#include "diff.h"
+#include "commit.h"
+#include "log-tree.h"
-struct tree_entry;
+static struct rev_info log_tree_opt;
-static struct tree_entry *update_tree_entry(void **bufp, unsigned long *sizep)
+static int diff_tree_commit_sha1(const unsigned char *sha1)
{
- void *buf = *bufp;
- unsigned long size = *sizep;
- int len = strlen(buf) + 1 + 20;
-
- if (size < len)
- usage("corrupt tree file");
- *bufp = buf + len;
- *sizep = size - len;
- return buf;
+ struct commit *commit = lookup_commit_reference(sha1);
+ if (!commit)
+ return -1;
+ return log_tree_commit(&log_tree_opt, commit);
}
-static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
+static int diff_tree_stdin(char *line)
{
- int len = strlen(tree)+1;
- const unsigned char *sha1 = tree + len;
- const char *path = strchr(tree, ' ');
+ int len = strlen(line);
+ unsigned char sha1[20];
+ struct commit *commit;
- if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
- usage("corrupt tree file");
- *pathp = path+1;
- return sha1;
-}
+ if (!len || line[len-1] != '\n')
+ return -1;
+ line[len-1] = 0;
+ 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, sha1)) {
+ /* Graft the fake parents locally to the commit */
+ int pos = 41;
+ struct commit_list **pptr, *parents;
-static void show_file(const char *prefix, void *tree, unsigned long size)
-{
- unsigned mode;
- const char *path;
- const unsigned char *sha1 = extract(tree, size, &path, &mode);
- printf("%s%o %s %s%c", prefix, mode, sha1_to_hex(sha1), path, 0);
+ /* 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;
+ }
+ }
+ return log_tree_commit(&log_tree_opt, commit);
}
-static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2)
+static const char diff_tree_usage[] =
+"git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
+"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\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)
{
- unsigned mode1, mode2;
- const char *path1, *path2;
- const unsigned char *sha1, *sha2;
- int cmp;
+ int nr_sha1;
+ char line[1000];
+ struct object *tree1, *tree2;
+ static struct rev_info *opt = &log_tree_opt;
+ struct object_list *list;
+ int read_stdin = 0;
- sha1 = extract(tree1, size1, &path1, &mode1);
- sha2 = extract(tree2, size2, &path2, &mode2);
+ git_config(git_diff_config);
+ nr_sha1 = 0;
+ init_revisions(opt);
+ opt->abbrev = 0;
+ opt->diff = 1;
+ argc = setup_revisions(argc, argv, opt, NULL);
- cmp = cache_name_compare(path1, strlen(path1), path2, strlen(path2));
- if (cmp < 0) {
- show_file("-", tree1, size1);
- return -1;
- }
- if (cmp > 0) {
- show_file("+", tree2, size2);
- return 1;
- }
- if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
- return 0;
- show_file("<", tree1, size1);
- show_file(">", tree2, size2);
- return 0;
-}
+ while (--argc > 0) {
+ const char *arg = *++argv;
-static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2)
-{
- while (size1 | size2) {
- if (!size1) {
- show_file("+", tree2, size2);
- update_tree_entry(&tree2, &size2);
- continue;
- }
- if (!size2) {
- show_file("-", tree1, size1);
- update_tree_entry(&tree1, &size1);
+ if (!strcmp(arg, "--stdin")) {
+ read_stdin = 1;
continue;
}
- switch (compare_tree_entry(tree1, size1, tree2, size2)) {
- case -1:
- update_tree_entry(&tree1, &size1);
- continue;
- case 0:
- update_tree_entry(&tree1, &size1);
- /* Fallthrough */
- case 1:
- update_tree_entry(&tree2, &size2);
- continue;
+ usage(diff_tree_usage);
+ }
+
+ /*
+ * NOTE! "setup_revisions()" will have inserted the revisions
+ * it parsed in reverse order. So if you do
+ *
+ * git-diff-tree a b
+ *
+ * the commit list will be "b" -> "a" -> NULL, so we reverse
+ * the order of the objects if the first one is not marked
+ * UNINTERESTING.
+ */
+ nr_sha1 = 0;
+ list = opt->pending_objects;
+ if (list) {
+ nr_sha1++;
+ tree1 = list->item;
+ list = list->next;
+ if (list) {
+ nr_sha1++;
+ tree2 = tree1;
+ tree1 = list->item;
+ if (list->next)
+ usage(diff_tree_usage);
+ /* Switch them around if the second one was uninteresting.. */
+ if (tree2->flags & UNINTERESTING) {
+ struct object *tmp = tree2;
+ tree2 = tree1;
+ tree1 = tmp;
+ }
}
- usage("diff-tree: internal error");
}
- return 0;
-}
-int main(int argc, char **argv)
-{
- unsigned char old[20], new[20];
- void *tree1, *tree2;
- unsigned long size1, size2;
- char type[20];
+ switch (nr_sha1) {
+ case 0:
+ if (!read_stdin)
+ usage(diff_tree_usage);
+ break;
+ case 1:
+ diff_tree_commit_sha1(tree1->sha1);
+ break;
+ case 2:
+ diff_tree_sha1(tree1->sha1,
+ tree2->sha1,
+ "", &opt->diffopt);
+ log_tree_diff_flush(opt);
+ break;
+ }
- if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
- usage("diff-tree <tree sha1> <tree sha1>");
- tree1 = read_sha1_file(old, type, &size1);
- if (!tree1 || strcmp(type, "tree"))
- usage("unable to read source tree");
- tree2 = read_sha1_file(new, type, &size2);
- if (!tree2 || strcmp(type, "tree"))
- usage("unable to read destination tree");
- return diff_tree(tree1, size1, tree2, size2);
+ if (!read_stdin)
+ return 0;
+
+ 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);
+
+ return 0;
}