Andrew's git - gitweb.git/blob

   1/*
   2 * "diff --no-index" support
   3 * Copyright (c) 2007 by Johannes Schindelin
   4 * Copyright (c) 2008 by Junio C Hamano
   5 */
   6
   7#include "cache.h"
   8#include "color.h"
   9#include "commit.h"
  10#include "blob.h"
  11#include "tag.h"
  12#include "diff.h"
  13#include "diffcore.h"
  14#include "revision.h"
  15#include "log-tree.h"
  16#include "builtin.h"
  17#include "string-list.h"
  18
  19static int read_directory(const char *path, struct string_list *list)
  20{
  21        DIR *dir;
  22        struct dirent *e;
  23
  24        if (!(dir = opendir(path)))
  25                return error("Could not open directory %s", path);
  26
  27        while ((e = readdir(dir)))
  28                if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
  29                        string_list_insert(list, e->d_name);
  30
  31        closedir(dir);
  32        return 0;
  33}
  34
  35static int get_mode(const char *path, int *mode)
  36{
  37        struct stat st;
  38
  39        if (!path || !strcmp(path, "/dev/null"))
  40                *mode = 0;
  41#ifdef _WIN32
  42        else if (!strcasecmp(path, "nul"))
  43                *mode = 0;
  44#endif
  45        else if (!strcmp(path, "-"))
  46                *mode = create_ce_mode(0666);
  47        else if (lstat(path, &st))
  48                return error("Could not access '%s'", path);
  49        else
  50                *mode = st.st_mode;
  51        return 0;
  52}
  53
  54static int queue_diff(struct diff_options *o,
  55                      const char *name1, const char *name2)
  56{
  57        int mode1 = 0, mode2 = 0;
  58
  59        if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
  60                return -1;
  61
  62        if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
  63                return error("file/directory conflict: %s, %s", name1, name2);
  64
  65        if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
  66                struct strbuf buffer1 = STRBUF_INIT;
  67                struct strbuf buffer2 = STRBUF_INIT;
  68                struct string_list p1 = STRING_LIST_INIT_DUP;
  69                struct string_list p2 = STRING_LIST_INIT_DUP;
  70                int i1, i2, ret = 0;
  71                size_t len1 = 0, len2 = 0;
  72
  73                if (name1 && read_directory(name1, &p1))
  74                        return -1;
  75                if (name2 && read_directory(name2, &p2)) {
  76                        string_list_clear(&p1, 0);
  77                        return -1;
  78                }
  79
  80                if (name1) {
  81                        strbuf_addstr(&buffer1, name1);
  82                        if (buffer1.len && buffer1.buf[buffer1.len - 1] != '/')
  83                                strbuf_addch(&buffer1, '/');
  84                        len1 = buffer1.len;
  85                }
  86
  87                if (name2) {
  88                        strbuf_addstr(&buffer2, name2);
  89                        if (buffer2.len && buffer2.buf[buffer2.len - 1] != '/')
  90                                strbuf_addch(&buffer2, '/');
  91                        len2 = buffer2.len;
  92                }
  93
  94                for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
  95                        const char *n1, *n2;
  96                        int comp;
  97
  98                        strbuf_setlen(&buffer1, len1);
  99                        strbuf_setlen(&buffer2, len2);
 100
 101                        if (i1 == p1.nr)
 102                                comp = 1;
 103                        else if (i2 == p2.nr)
 104                                comp = -1;
 105                        else
 106                                comp = strcmp(p1.items[i1].string, p2.items[i2].string);
 107
 108                        if (comp > 0)
 109                                n1 = NULL;
 110                        else {
 111                                strbuf_addstr(&buffer1, p1.items[i1++].string);
 112                                n1 = buffer1.buf;
 113                        }
 114
 115                        if (comp < 0)
 116                                n2 = NULL;
 117                        else {
 118                                strbuf_addstr(&buffer2, p2.items[i2++].string);
 119                                n2 = buffer2.buf;
 120                        }
 121
 122                        ret = queue_diff(o, n1, n2);
 123                }
 124                string_list_clear(&p1, 0);
 125                string_list_clear(&p2, 0);
 126                strbuf_release(&buffer1);
 127                strbuf_release(&buffer2);
 128
 129                return ret;
 130        } else {
 131                struct diff_filespec *d1, *d2;
 132
 133                if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
 134                        unsigned tmp;
 135                        const char *tmp_c;
 136                        tmp = mode1; mode1 = mode2; mode2 = tmp;
 137                        tmp_c = name1; name1 = name2; name2 = tmp_c;
 138                }
 139
 140                if (!name1)
 141                        name1 = "/dev/null";
 142                if (!name2)
 143                        name2 = "/dev/null";
 144                d1 = alloc_filespec(name1);
 145                d2 = alloc_filespec(name2);
 146                fill_filespec(d1, null_sha1, mode1);
 147                fill_filespec(d2, null_sha1, mode2);
 148
 149                diff_queue(&diff_queued_diff, d1, d2);
 150                return 0;
 151        }
 152}
 153
 154static int path_outside_repo(const char *path)
 155{
 156        const char *work_tree;
 157        size_t len;
 158
 159        if (!is_absolute_path(path))
 160                return 0;
 161        work_tree = get_git_work_tree();
 162        if (!work_tree)
 163                return 1;
 164        len = strlen(work_tree);
 165        if (strncmp(path, work_tree, len) ||
 166            (path[len] != '\0' && path[len] != '/'))
 167                return 1;
 168        return 0;
 169}
 170
 171void diff_no_index(struct rev_info *revs,
 172                   int argc, const char **argv,
 173                   int nongit, const char *prefix)
 174{
 175        int i;
 176        int no_index = 0;
 177        unsigned options = 0;
 178
 179        /* Were we asked to do --no-index explicitly? */
 180        for (i = 1; i < argc; i++) {
 181                if (!strcmp(argv[i], "--")) {
 182                        i++;
 183                        break;
 184                }
 185                if (!strcmp(argv[i], "--no-index"))
 186                        no_index = 1;
 187                if (argv[i][0] != '-')
 188                        break;
 189        }
 190
 191        if (!no_index && !nongit) {
 192                /*
 193                 * Inside a git repository, without --no-index.  Only
 194                 * when a path outside the repository is given,
 195                 * e.g. "git diff /var/tmp/[12]", or "git diff
 196                 * Makefile /var/tmp/Makefile", allow it to be used as
 197                 * a colourful "diff" replacement.
 198                 */
 199                if ((argc != i + 2) ||
 200                    (!path_outside_repo(argv[i]) &&
 201                     !path_outside_repo(argv[i+1])))
 202                        return;
 203        }
 204        if (argc != i + 2)
 205                usagef("git diff %s <path> <path>",
 206                       no_index ? "--no-index" : "[--no-index]");
 207
 208        diff_setup(&revs->diffopt);
 209        for (i = 1; i < argc - 2; ) {
 210                int j;
 211                if (!strcmp(argv[i], "--no-index"))
 212                        i++;
 213                else if (!strcmp(argv[i], "-q")) {
 214                        options |= DIFF_SILENT_ON_REMOVED;
 215                        i++;
 216                }
 217                else if (!strcmp(argv[i], "--"))
 218                        i++;
 219                else {
 220                        j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
 221                        if (!j)
 222                                die("invalid diff option/value: %s", argv[i]);
 223                        i += j;
 224                }
 225        }
 226
 227        /*
 228         * If the user asked for our exit code then don't start a
 229         * pager or we would end up reporting its exit code instead.
 230         */
 231        if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
 232                setup_pager();
 233
 234        if (prefix) {
 235                int len = strlen(prefix);
 236                const char *paths[3];
 237                memset(paths, 0, sizeof(paths));
 238
 239                for (i = 0; i < 2; i++) {
 240                        const char *p = argv[argc - 2 + i];
 241                        /*
 242                         * stdin should be spelled as '-'; if you have
 243                         * path that is '-', spell it as ./-.
 244                         */
 245                        p = (strcmp(p, "-")
 246                             ? xstrdup(prefix_filename(prefix, len, p))
 247                             : p);
 248                        paths[i] = p;
 249                }
 250                diff_tree_setup_paths(paths, &revs->diffopt);
 251        }
 252        else
 253                diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
 254        revs->diffopt.skip_stat_unmatch = 1;
 255        if (!revs->diffopt.output_format)
 256                revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 257
 258        DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
 259        DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
 260
 261        revs->max_count = -2;
 262        if (diff_setup_done(&revs->diffopt) < 0)
 263                die("diff_setup_done failed");
 264
 265        if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
 266                       revs->diffopt.pathspec.raw[1]))
 267                exit(1);
 268        diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
 269        diffcore_std(&revs->diffopt);
 270        diff_flush(&revs->diffopt);
 271
 272        /*
 273         * The return code for --no-index imitates diff(1):
 274         * 0 = no changes, 1 = changes, else error
 275         */
 276        exit(revs->diffopt.found_changes);
 277}