Andrew's git - gitweb.git/blob

   1#include "cache.h"
   2#include "diff.h"
   3#include "commit.h"
   4
   5static int show_root_diff = 0;
   6static int verbose_header = 0;
   7static int ignore_merges = 1;
   8static int read_stdin = 0;
   9
  10static const char *header = NULL;
  11static const char *header_prefix = "";
  12static enum cmit_fmt commit_format = CMIT_FMT_RAW;
  13
  14static struct diff_options diff_options;
  15
  16static void call_diff_setup_done(void)
  17{
  18        diff_setup_done(&diff_options);
  19}
  20
  21static int call_diff_flush(void)
  22{
  23        diffcore_std(&diff_options);
  24        if (diff_queue_is_empty()) {
  25                int saved_fmt = diff_options.output_format;
  26                diff_options.output_format = DIFF_FORMAT_NO_OUTPUT;
  27                diff_flush(&diff_options);
  28                diff_options.output_format = saved_fmt;
  29                return 0;
  30        }
  31        if (header) {
  32                printf("%s%c", header, diff_options.line_termination);
  33                header = NULL;
  34        }
  35        diff_flush(&diff_options);
  36        return 1;
  37}
  38
  39static int diff_tree_sha1_top(const unsigned char *old,
  40                              const unsigned char *new, const char *base)
  41{
  42        int ret;
  43
  44        call_diff_setup_done();
  45        ret = diff_tree_sha1(old, new, base, &diff_options);
  46        call_diff_flush();
  47        return ret;
  48}
  49
  50static int diff_root_tree(const unsigned char *new, const char *base)
  51{
  52        int retval;
  53        void *tree;
  54        struct tree_desc empty, real;
  55
  56        call_diff_setup_done();
  57        tree = read_object_with_reference(new, "tree", &real.size, NULL);
  58        if (!tree)
  59                die("unable to read root tree (%s)", sha1_to_hex(new));
  60        real.buf = tree;
  61
  62        empty.buf = "";
  63        empty.size = 0;
  64        retval = diff_tree(&empty, &real, base, &diff_options);
  65        free(tree);
  66        call_diff_flush();
  67        return retval;
  68}
  69
  70static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
  71{
  72        static char this_header[16384];
  73        int offset;
  74
  75        if (!verbose_header)
  76                return commit;
  77
  78        offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
  79        offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
  80        return this_header;
  81}
  82
  83static int diff_tree_commit(const unsigned char *commit, const char *name)
  84{
  85        unsigned long size, offset;
  86        char *buf = read_object_with_reference(commit, "commit", &size, NULL);
  87
  88        if (!buf)
  89                return -1;
  90
  91        if (!name) {
  92                static char commit_name[60];
  93                strcpy(commit_name, sha1_to_hex(commit));
  94                name = commit_name;
  95        }
  96
  97        /* Root commit? */
  98        if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
  99                header = generate_header(name, "root", buf, size);
 100                diff_root_tree(commit, "");
 101        }
 102
 103        /* More than one parent? */
 104        if (ignore_merges) {
 105                if (!memcmp(buf + 46 + 48, "parent ", 7))
 106                        return 0;
 107        }
 108
 109        offset = 46;
 110        while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
 111                unsigned char parent[20];
 112                if (get_sha1_hex(buf + offset + 7, parent))
 113                        return -1;
 114                header = generate_header(name, sha1_to_hex(parent), buf, size);
 115                diff_tree_sha1_top(parent, commit, "");
 116                if (!header && verbose_header) {
 117                        header_prefix = "\ndiff-tree ";
 118                        /*
 119                         * Don't print multiple merge entries if we
 120                         * don't print the diffs.
 121                         */
 122                }
 123                offset += 48;
 124        }
 125        free(buf);
 126        return 0;
 127}
 128
 129static int diff_tree_stdin(char *line)
 130{
 131        int len = strlen(line);
 132        unsigned char commit[20], parent[20];
 133        static char this_header[1000];
 134
 135        if (!len || line[len-1] != '\n')
 136                return -1;
 137        line[len-1] = 0;
 138        if (get_sha1_hex(line, commit))
 139                return -1;
 140        if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
 141                line[40] = 0;
 142                line[81] = 0;
 143                sprintf(this_header, "%s (from %s)\n", line, line+41);
 144                header = this_header;
 145                return diff_tree_sha1_top(parent, commit, "");
 146        }
 147        line[40] = 0;
 148        return diff_tree_commit(commit, line);
 149}
 150
 151static const char diff_tree_usage[] =
 152"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
 153"[<common diff options>] <tree-ish> <tree-ish>"
 154COMMON_DIFF_OPTIONS_HELP;
 155
 156int main(int argc, const char **argv)
 157{
 158        int nr_sha1;
 159        char line[1000];
 160        unsigned char sha1[2][20];
 161        const char *prefix = setup_git_directory();
 162
 163        git_config(git_default_config);
 164        nr_sha1 = 0;
 165        diff_setup(&diff_options);
 166
 167        for (;;) {
 168                int diff_opt_cnt;
 169                const char *arg;
 170
 171                argv++;
 172                argc--;
 173                arg = *argv;
 174                if (!arg)
 175                        break;
 176
 177                if (*arg != '-') {
 178                        if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
 179                                nr_sha1++;
 180                                continue;
 181                        }
 182                        break;
 183                }
 184
 185                diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc);
 186                if (diff_opt_cnt < 0)
 187                        usage(diff_tree_usage);
 188                else if (diff_opt_cnt) {
 189                        argv += diff_opt_cnt - 1;
 190                        argc -= diff_opt_cnt - 1;
 191                        continue;
 192                }
 193
 194
 195                if (!strcmp(arg, "--")) {
 196                        argv++;
 197                        argc--;
 198                        break;
 199                }
 200                if (!strcmp(arg, "-r")) {
 201                        diff_options.recursive = 1;
 202                        continue;
 203                }
 204                if (!strcmp(arg, "-t")) {
 205                        diff_options.recursive = 1;
 206                        diff_options.tree_in_recursive = 1;
 207                        continue;
 208                }
 209                if (!strcmp(arg, "-m")) {
 210                        ignore_merges = 0;
 211                        continue;
 212                }
 213                if (!strcmp(arg, "-v")) {
 214                        verbose_header = 1;
 215                        header_prefix = "diff-tree ";
 216                        continue;
 217                }
 218                if (!strncmp(arg, "--pretty", 8)) {
 219                        verbose_header = 1;
 220                        header_prefix = "diff-tree ";
 221                        commit_format = get_commit_format(arg+8);
 222                        continue;
 223                }
 224                if (!strcmp(arg, "--stdin")) {
 225                        read_stdin = 1;
 226                        continue;
 227                }
 228                if (!strcmp(arg, "--root")) {
 229                        show_root_diff = 1;
 230                        continue;
 231                }
 232                usage(diff_tree_usage);
 233        }
 234        if (diff_options.output_format == DIFF_FORMAT_PATCH)
 235                diff_options.recursive = 1;
 236
 237        diff_tree_setup_paths(get_pathspec(prefix, argv));
 238
 239        switch (nr_sha1) {
 240        case 0:
 241                if (!read_stdin)
 242                        usage(diff_tree_usage);
 243                break;
 244        case 1:
 245                diff_tree_commit(sha1[0], NULL);
 246                break;
 247        case 2:
 248                diff_tree_sha1_top(sha1[0], sha1[1], "");
 249                break;
 250        }
 251
 252        if (!read_stdin)
 253                return 0;
 254
 255        if (diff_options.detect_rename)
 256                diff_options.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
 257                                       DIFF_SETUP_USE_CACHE);
 258        while (fgets(line, sizeof(line), stdin))
 259                diff_tree_stdin(line);
 260
 261        return 0;
 262}