builtin/diff-tree.c

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