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
   7static struct rev_info log_tree_opt;
   8
   9static int diff_tree_commit_sha1(const unsigned char *sha1)
  10{
  11        struct commit *commit = lookup_commit_reference(sha1);
  12        if (!commit)
  13                return -1;
  14        return log_tree_commit(&log_tree_opt, commit);
  15}
  16
  17/* Diff one or more commits. */
  18static int stdin_diff_commit(struct commit *commit, char *line, int len)
  19{
  20        unsigned char sha1[20];
  21        if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
  22                /* Graft the fake parents locally to the commit */
  23                int pos = 41;
  24                struct commit_list **pptr, *parents;
  25
  26                /* Free the real parent list */
  27                for (parents = commit->parents; parents; ) {
  28                        struct commit_list *tmp = parents->next;
  29                        free(parents);
  30                        parents = tmp;
  31                }
  32                commit->parents = NULL;
  33                pptr = &(commit->parents);
  34                while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
  35                        struct commit *parent = lookup_commit(sha1);
  36                        if (parent) {
  37                                pptr = &commit_list_insert(parent, pptr)->next;
  38                        }
  39                        pos += 41;
  40                }
  41        }
  42        return log_tree_commit(&log_tree_opt, commit);
  43}
  44
  45/* Diff two trees. */
  46static int stdin_diff_trees(struct tree *tree1, char *line, int len)
  47{
  48        unsigned char sha1[20];
  49        struct tree *tree2;
  50        if (len != 82 || !isspace(line[40]) || get_sha1_hex(line + 41, sha1))
  51                return error("Need exactly two trees, separated by a space");
  52        tree2 = lookup_tree(sha1);
  53        if (!tree2 || parse_tree(tree2))
  54                return -1;
  55        printf("%s %s\n", sha1_to_hex(tree1->object.sha1),
  56                          sha1_to_hex(tree2->object.sha1));
  57        diff_tree_sha1(tree1->object.sha1, tree2->object.sha1,
  58                       "", &log_tree_opt.diffopt);
  59        log_tree_diff_flush(&log_tree_opt);
  60        return 0;
  61}
  62
  63static int diff_tree_stdin(char *line)
  64{
  65        int len = strlen(line);
  66        unsigned char sha1[20];
  67        struct object *obj;
  68
  69        if (!len || line[len-1] != '\n')
  70                return -1;
  71        line[len-1] = 0;
  72        if (get_sha1_hex(line, sha1))
  73                return -1;
  74        obj = lookup_unknown_object(sha1);
  75        if (!obj || !obj->parsed)
  76                obj = parse_object(sha1);
  77        if (!obj)
  78                return -1;
  79        if (obj->type == OBJ_COMMIT)
  80                return stdin_diff_commit((struct commit *)obj, line, len);
  81        if (obj->type == OBJ_TREE)
  82                return stdin_diff_trees((struct tree *)obj, line, len);
  83        error("Object %s is a %s, not a commit or tree",
  84              sha1_to_hex(sha1), typename(obj->type));
  85        return -1;
  86}
  87
  88static const char diff_tree_usage[] =
  89"git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
  90"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
  91"  -r            diff recursively\n"
  92"  --root        include the initial commit as diff against /dev/null\n"
  93COMMON_DIFF_OPTIONS_HELP;
  94
  95static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
  96{
  97        if (!rev->diffopt.output_format) {
  98                if (rev->dense_combined_merges)
  99                        rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 100                else
 101                        rev->diffopt.output_format = DIFF_FORMAT_RAW;
 102        }
 103}
 104
 105int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 106{
 107        int nr_sha1;
 108        char line[1000];
 109        struct object *tree1, *tree2;
 110        static struct rev_info *opt = &log_tree_opt;
 111        struct setup_revision_opt s_r_opt;
 112        int read_stdin = 0;
 113
 114        init_revisions(opt, prefix);
 115        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 116        opt->abbrev = 0;
 117        opt->diff = 1;
 118        opt->disable_stdin = 1;
 119        memset(&s_r_opt, 0, sizeof(s_r_opt));
 120        s_r_opt.tweak = diff_tree_tweak_rev;
 121        argc = setup_revisions(argc, argv, opt, &s_r_opt);
 122
 123        while (--argc > 0) {
 124                const char *arg = *++argv;
 125
 126                if (!strcmp(arg, "--stdin")) {
 127                        read_stdin = 1;
 128                        continue;
 129                }
 130                usage(diff_tree_usage);
 131        }
 132
 133        /*
 134         * NOTE! We expect "a ^b" to be equal to "a..b", so we
 135         * reverse the order of the objects if the second one
 136         * is marked UNINTERESTING.
 137         */
 138        nr_sha1 = opt->pending.nr;
 139        switch (nr_sha1) {
 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_sha1(tree1->sha1);
 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                        struct object *tmp = tree2;
 153                        tree2 = tree1;
 154                        tree1 = tmp;
 155                }
 156                diff_tree_sha1(tree1->sha1,
 157                               tree2->sha1,
 158                               "", &opt->diffopt);
 159                log_tree_diff_flush(opt);
 160                break;
 161        }
 162
 163        if (read_stdin) {
 164                if (opt->diffopt.detect_rename)
 165                        opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
 166                                               DIFF_SETUP_USE_CACHE);
 167                while (fgets(line, sizeof(line), stdin)) {
 168                        unsigned char sha1[20];
 169
 170                        if (get_sha1_hex(line, sha1)) {
 171                                fputs(line, stdout);
 172                                fflush(stdout);
 173                        }
 174                        else
 175                                diff_tree_stdin(line);
 176                }
 177        }
 178
 179        return diff_result_code(&opt->diffopt, 0);
 180}