git.oblomov.eu Git - git/blob - builtin/diff-tree.c

   1 #include "cache.h"
   2 #include "config.h"
   3 #include "diff.h"
   4 #include "commit.h"
   5 #include "log-tree.h"
   6 #include "builtin.h"
   7 #include "submodule.h"
   8
   9 static struct rev_info log_tree_opt;
  10
  11 static int diff_tree_commit_oid(const struct object_id *oid)
  12 {
  13         struct commit *commit = lookup_commit_reference(oid);
  14         if (!commit)
  15                 return -1;
  16         return log_tree_commit(&log_tree_opt, commit);
  17 }
  18
  19 /* Diff one or more commits. */
  20 static int stdin_diff_commit(struct commit *commit, const char *p)
  21 {
  22         struct object_id oid;
  23         struct commit_list **pptr = NULL;
  24
  25         /* Graft the fake parents locally to the commit */
  26         while (isspace(*p++) && !parse_oid_hex(p, &oid, &p)) {
  27                 struct commit *parent = lookup_commit(&oid);
  28                 if (!pptr) {
  29                         /* Free the real parent list */
  30                         free_commit_list(commit->parents);
  31                         commit->parents = NULL;
  32                         pptr = &(commit->parents);
  33                 }
  34                 if (parent) {
  35                         pptr = &commit_list_insert(parent, pptr)->next;
  36                 }
  37         }
  38         return log_tree_commit(&log_tree_opt, commit);
  39 }
  40
  41 /* Diff two trees. */
  42 static int stdin_diff_trees(struct tree *tree1, const char *p)
  43 {
  44         struct object_id oid;
  45         struct tree *tree2;
  46         if (!isspace(*p++) || parse_oid_hex(p, &oid, &p) || *p)
  47                 return error("Need exactly two trees, separated by a space");
  48         tree2 = lookup_tree(&oid);
  49         if (!tree2 || parse_tree(tree2))
  50                 return -1;
  51         printf("%s %s\n", oid_to_hex(&tree1->object.oid),
  52                           oid_to_hex(&tree2->object.oid));
  53         diff_tree_oid(&tree1->object.oid, &tree2->object.oid,
  54                       "", &log_tree_opt.diffopt);
  55         log_tree_diff_flush(&log_tree_opt);
  56         return 0;
  57 }
  58
  59 static int diff_tree_stdin(char *line)
  60 {
  61         int len = strlen(line);
  62         struct object_id oid;
  63         struct object *obj;
  64         const char *p;
  65
  66         if (!len || line[len-1] != '\n')
  67                 return -1;
  68         line[len-1] = 0;
  69         if (parse_oid_hex(line, &oid, &p))
  70                 return -1;
  71         obj = parse_object(&oid);
  72         if (!obj)
  73                 return -1;
  74         if (obj->type == OBJ_COMMIT)
  75                 return stdin_diff_commit((struct commit *)obj, p);
  76         if (obj->type == OBJ_TREE)
  77                 return stdin_diff_trees((struct tree *)obj, p);
  78         error("Object %s is a %s, not a commit or tree",
  79               oid_to_hex(&oid), typename(obj->type));
  80         return -1;
  81 }
  82
  83 static const char diff_tree_usage[] =
  84 "git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
  85 "[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
  86 "  -r            diff recursively\n"
  87 "  --root        include the initial commit as diff against /dev/null\n"
  88 COMMON_DIFF_OPTIONS_HELP;
  89
  90 static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
  91 {
  92         if (!rev->diffopt.output_format) {
  93                 if (rev->dense_combined_merges)
  94                         rev->diffopt.output_format = DIFF_FORMAT_PATCH;
  95                 else
  96                         rev->diffopt.output_format = DIFF_FORMAT_RAW;
  97         }
  98 }
  99
 100 int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 101 {
 102         char line[1000];
 103         struct object *tree1, *tree2;
 104         static struct rev_info *opt = &log_tree_opt;
 105         struct setup_revision_opt s_r_opt;
 106         int read_stdin = 0;
 107
 108         if (argc == 2 && !strcmp(argv[1], "-h"))
 109                 usage(diff_tree_usage);
 110
 111         git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 112         init_revisions(opt, prefix);
 113         opt->abbrev = 0;
 114         opt->diff = 1;
 115         opt->disable_stdin = 1;
 116         memset(&s_r_opt, 0, sizeof(s_r_opt));
 117         s_r_opt.tweak = diff_tree_tweak_rev;
 118
 119         precompose_argv(argc, argv);
 120         argc = setup_revisions(argc, argv, opt, &s_r_opt);
 121
 122         while (--argc > 0) {
 123                 const char *arg = *++argv;
 124
 125                 if (!strcmp(arg, "--stdin")) {
 126                         read_stdin = 1;
 127                         continue;
 128                 }
 129                 usage(diff_tree_usage);
 130         }
 131
 132         /*
 133          * NOTE!  We expect "a..b" to expand to "^a b" but it is
 134          * perfectly valid for revision range parser to yield "b ^a",
 135          * which means the same thing. If we get the latter, i.e. the
 136          * second one is marked UNINTERESTING, we recover the original
 137          * order the user gave, i.e. "a..b", by swapping the trees.
 138          */
 139         switch (opt->pending.nr) {
 140         case 0:
 141                 if (!read_stdin)
 142                         usage(diff_tree_usage);
 143                 break;
 144         case 1:
 145                 tree1 = opt->pending.objects[0].item;
 146                 diff_tree_commit_oid(&tree1->oid);
 147                 break;
 148         case 2:
 149                 tree1 = opt->pending.objects[0].item;
 150                 tree2 = opt->pending.objects[1].item;
 151                 if (tree2->flags & UNINTERESTING) {
 152                         SWAP(tree2, tree1);
 153                 }
 154                 diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt);
 155                 log_tree_diff_flush(opt);
 156                 break;
 157         }
 158
 159         if (read_stdin) {
 160                 int saved_nrl = 0;
 161                 int saved_dcctc = 0;
 162
 163                 if (opt->diffopt.detect_rename)
 164                         opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
 165                                                DIFF_SETUP_USE_CACHE);
 166                 while (fgets(line, sizeof(line), stdin)) {
 167                         struct object_id oid;
 168
 169                         if (get_oid_hex(line, &oid)) {
 170                                 fputs(line, stdout);
 171                                 fflush(stdout);
 172                         }
 173                         else {
 174                                 diff_tree_stdin(line);
 175                                 if (saved_nrl < opt->diffopt.needed_rename_limit)
 176                                         saved_nrl = opt->diffopt.needed_rename_limit;
 177                                 if (opt->diffopt.degraded_cc_to_c)
 178                                         saved_dcctc = 1;
 179                         }
 180                 }
 181                 opt->diffopt.degraded_cc_to_c = saved_dcctc;
 182                 opt->diffopt.needed_rename_limit = saved_nrl;
 183         }
 184
 185         return diff_result_code(&opt->diffopt, 0);
 186 }