Andrew's git - gitweb.git/blob - builtin/diff-tree.c

   1#include "cache.h"
   2#include "diff.h"
   3#include "commit.h"
   4#include "log-tree.h"
   5#include "builtin.h"
   6#include "submodule.h"
   7
   8static struct rev_info log_tree_opt;
   9
  10static int diff_tree_commit_sha1(const unsigned char *sha1)
  11{
  12        struct commit *commit = lookup_commit_reference(sha1);
  13        if (!commit)
  14                return -1;
  15        return log_tree_commit(&log_tree_opt, commit);
  16}
  17
  18/* Diff one or more commits. */
  19static int stdin_diff_commit(struct commit *commit, char *line, int len)
  20{
  21        unsigned char sha1[20];
  22        if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
  23                /* Graft the fake parents locally to the commit */
  24                int pos = 41;
  25                struct commit_list **pptr;
  26
  27                /* Free the real parent list */
  28                free_commit_list(commit->parents);
  29                commit->parents = NULL;
  30                pptr = &(commit->parents);
  31                while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
  32                        struct commit *parent = lookup_commit(sha1);
  33                        if (parent) {
  34                                pptr = &commit_list_insert(parent, pptr)->next;
  35                        }
  36                        pos += 41;
  37                }
  38        }
  39        return log_tree_commit(&log_tree_opt, commit);
  40}
  41
  42/* Diff two trees. */
  43static int stdin_diff_trees(struct tree *tree1, char *line, int len)
  44{
  45        unsigned char sha1[20];
  46        struct tree *tree2;
  47        if (len != 82 || !isspace(line[40]) || get_sha1_hex(line + 41, sha1))
  48                return error("Need exactly two trees, separated by a space");
  49        tree2 = lookup_tree(sha1);
  50        if (!tree2 || parse_tree(tree2))
  51                return -1;
  52        printf("%s %s\n", sha1_to_hex(tree1->object.sha1),
  53                          sha1_to_hex(tree2->object.sha1));
  54        diff_tree_sha1(tree1->object.sha1, tree2->object.sha1,
  55                       "", &log_tree_opt.diffopt);
  56        log_tree_diff_flush(&log_tree_opt);
  57        return 0;
  58}
  59
  60static int diff_tree_stdin(char *line)
  61{
  62        int len = strlen(line);
  63        unsigned char sha1[20];
  64        struct object *obj;
  65
  66        if (!len || line[len-1] != '\n')
  67                return -1;
  68        line[len-1] = 0;
  69        if (get_sha1_hex(line, sha1))
  70                return -1;
  71        obj = parse_object(sha1);
  72        if (!obj)
  73                return -1;
  74        if (obj->type == OBJ_COMMIT)
  75                return stdin_diff_commit((struct commit *)obj, line, len);
  76        if (obj->type == OBJ_TREE)
  77                return stdin_diff_trees((struct tree *)obj, line, len);
  78        error("Object %s is a %s, not a commit or tree",
  79              sha1_to_hex(sha1), typename(obj->type));
  80        return -1;
  81}
  82
  83static 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"
  88COMMON_DIFF_OPTIONS_HELP;
  89
  90static 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
 100int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 101{
 102        int nr_sha1;
 103        char line[1000];
 104        struct object *tree1, *tree2;
 105        static struct rev_info *opt = &log_tree_opt;
 106        struct setup_revision_opt s_r_opt;
 107        int read_stdin = 0;
 108
 109        init_revisions(opt, prefix);
 110        gitmodules_config();
 111        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 112        opt->abbrev = 0;
 113        opt->diff = 1;
 114        opt->disable_stdin = 1;
 115        memset(&s_r_opt, 0, sizeof(s_r_opt));
 116        s_r_opt.tweak = diff_tree_tweak_rev;
 117        argc = setup_revisions(argc, argv, opt, &s_r_opt);
 118
 119        while (--argc > 0) {
 120                const char *arg = *++argv;
 121
 122                if (!strcmp(arg, "--stdin")) {
 123                        read_stdin = 1;
 124                        continue;
 125                }
 126                usage(diff_tree_usage);
 127        }
 128
 129        /*
 130         * NOTE! We expect "a ^b" to be equal to "a..b", so we
 131         * reverse the order of the objects if the second one
 132         * is marked UNINTERESTING.
 133         */
 134        nr_sha1 = opt->pending.nr;
 135        switch (nr_sha1) {
 136        case 0:
 137                if (!read_stdin)
 138                        usage(diff_tree_usage);
 139                break;
 140        case 1:
 141                tree1 = opt->pending.objects[0].item;
 142                diff_tree_commit_sha1(tree1->sha1);
 143                break;
 144        case 2:
 145                tree1 = opt->pending.objects[0].item;
 146                tree2 = opt->pending.objects[1].item;
 147                if (tree2->flags & UNINTERESTING) {
 148                        struct object *tmp = tree2;
 149                        tree2 = tree1;
 150                        tree1 = tmp;
 151                }
 152                diff_tree_sha1(tree1->sha1,
 153                               tree2->sha1,
 154                               "", &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                        unsigned char sha1[20];
 168
 169                        if (get_sha1_hex(line, sha1)) {
 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}