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#include "dir.h"
  19
  20static int read_directory_contents(const char *path, struct string_list *list)
  21{
  22        DIR *dir;
  23        struct dirent *e;
  24
  25        if (!(dir = opendir(path)))
  26                return error("Could not open directory %s", path);
  27
  28        while ((e = readdir(dir)))
  29                if (!is_dot_or_dotdot(e->d_name))
  30                        string_list_insert(list, e->d_name);
  31
  32        closedir(dir);
  33        return 0;
  34}
  35
  36/*
  37 * This should be "(standard input)" or something, but it will
  38 * probably expose many more breakages in the way no-index code
  39 * is bolted onto the diff callchain.
  40 */
  41static const char file_from_standard_input[] = "-";
  42
  43static int get_mode(const char *path, int *mode)
  44{
  45        struct stat st;
  46
  47        if (!path || !strcmp(path, "/dev/null"))
  48                *mode = 0;
  49#ifdef GIT_WINDOWS_NATIVE
  50        else if (!strcasecmp(path, "nul"))
  51                *mode = 0;
  52#endif
  53        else if (path == file_from_standard_input)
  54                *mode = create_ce_mode(0666);
  55        else if (lstat(path, &st))
  56                return error("Could not access '%s'", path);
  57        else
  58                *mode = st.st_mode;
  59        return 0;
  60}
  61
  62static int populate_from_stdin(struct diff_filespec *s)
  63{
  64        struct strbuf buf = STRBUF_INIT;
  65        size_t size = 0;
  66
  67        if (strbuf_read(&buf, 0, 0) < 0)
  68                return error("error while reading from stdin %s",
  69                                     strerror(errno));
  70
  71        s->should_munmap = 0;
  72        s->data = strbuf_detach(&buf, &size);
  73        s->size = size;
  74        s->should_free = 1;
  75        s->is_stdin = 1;
  76        return 0;
  77}
  78
  79static struct diff_filespec *noindex_filespec(const char *name, int mode)
  80{
  81        struct diff_filespec *s;
  82
  83        if (!name)
  84                name = "/dev/null";
  85        s = alloc_filespec(name);
  86        fill_filespec(s, null_sha1, 0, mode);
  87        if (name == file_from_standard_input)
  88                populate_from_stdin(s);
  89        return s;
  90}
  91
  92static int queue_diff(struct diff_options *o,
  93                      const char *name1, const char *name2)
  94{
  95        int mode1 = 0, mode2 = 0;
  96
  97        if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
  98                return -1;
  99
 100        if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
 101                return error("file/directory conflict: %s, %s", name1, name2);
 102
 103        if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
 104                struct strbuf buffer1 = STRBUF_INIT;
 105                struct strbuf buffer2 = STRBUF_INIT;
 106                struct string_list p1 = STRING_LIST_INIT_DUP;
 107                struct string_list p2 = STRING_LIST_INIT_DUP;
 108                int i1, i2, ret = 0;
 109                size_t len1 = 0, len2 = 0;
 110
 111                if (name1 && read_directory_contents(name1, &p1))
 112                        return -1;
 113                if (name2 && read_directory_contents(name2, &p2)) {
 114                        string_list_clear(&p1, 0);
 115                        return -1;
 116                }
 117
 118                if (name1) {
 119                        strbuf_addstr(&buffer1, name1);
 120                        if (buffer1.len && buffer1.buf[buffer1.len - 1] != '/')
 121                                strbuf_addch(&buffer1, '/');
 122                        len1 = buffer1.len;
 123                }
 124
 125                if (name2) {
 126                        strbuf_addstr(&buffer2, name2);
 127                        if (buffer2.len && buffer2.buf[buffer2.len - 1] != '/')
 128                                strbuf_addch(&buffer2, '/');
 129                        len2 = buffer2.len;
 130                }
 131
 132                for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
 133                        const char *n1, *n2;
 134                        int comp;
 135
 136                        strbuf_setlen(&buffer1, len1);
 137                        strbuf_setlen(&buffer2, len2);
 138
 139                        if (i1 == p1.nr)
 140                                comp = 1;
 141                        else if (i2 == p2.nr)
 142                                comp = -1;
 143                        else
 144                                comp = strcmp(p1.items[i1].string, p2.items[i2].string);
 145
 146                        if (comp > 0)
 147                                n1 = NULL;
 148                        else {
 149                                strbuf_addstr(&buffer1, p1.items[i1++].string);
 150                                n1 = buffer1.buf;
 151                        }
 152
 153                        if (comp < 0)
 154                                n2 = NULL;
 155                        else {
 156                                strbuf_addstr(&buffer2, p2.items[i2++].string);
 157                                n2 = buffer2.buf;
 158                        }
 159
 160                        ret = queue_diff(o, n1, n2);
 161                }
 162                string_list_clear(&p1, 0);
 163                string_list_clear(&p2, 0);
 164                strbuf_release(&buffer1);
 165                strbuf_release(&buffer2);
 166
 167                return ret;
 168        } else {
 169                struct diff_filespec *d1, *d2;
 170
 171                if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
 172                        unsigned tmp;
 173                        const char *tmp_c;
 174                        tmp = mode1; mode1 = mode2; mode2 = tmp;
 175                        tmp_c = name1; name1 = name2; name2 = tmp_c;
 176                }
 177
 178                d1 = noindex_filespec(name1, mode1);
 179                d2 = noindex_filespec(name2, mode2);
 180                diff_queue(&diff_queued_diff, d1, d2);
 181                return 0;
 182        }
 183}
 184
 185void diff_no_index(struct rev_info *revs,
 186                   int argc, const char **argv,
 187                   const char *prefix)
 188{
 189        int i, prefixlen;
 190        const char *paths[2];
 191
 192        diff_setup(&revs->diffopt);
 193        for (i = 1; i < argc - 2; ) {
 194                int j;
 195                if (!strcmp(argv[i], "--no-index"))
 196                        i++;
 197                else if (!strcmp(argv[i], "--"))
 198                        i++;
 199                else {
 200                        j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
 201                        if (j <= 0)
 202                                die("invalid diff option/value: %s", argv[i]);
 203                        i += j;
 204                }
 205        }
 206
 207        prefixlen = prefix ? strlen(prefix) : 0;
 208        for (i = 0; i < 2; i++) {
 209                const char *p = argv[argc - 2 + i];
 210                if (!strcmp(p, "-"))
 211                        /*
 212                         * stdin should be spelled as "-"; if you have
 213                         * path that is "-", spell it as "./-".
 214                         */
 215                        p = file_from_standard_input;
 216                else if (prefixlen)
 217                        p = xstrdup(prefix_filename(prefix, prefixlen, p));
 218                paths[i] = p;
 219        }
 220        revs->diffopt.skip_stat_unmatch = 1;
 221        if (!revs->diffopt.output_format)
 222                revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 223
 224        DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
 225
 226        revs->max_count = -2;
 227        diff_setup_done(&revs->diffopt);
 228
 229        setup_diff_pager(&revs->diffopt);
 230        DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
 231
 232        if (queue_diff(&revs->diffopt, paths[0], paths[1]))
 233                exit(1);
 234        diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
 235        diffcore_std(&revs->diffopt);
 236        diff_flush(&revs->diffopt);
 237
 238        /*
 239         * The return code for --no-index imitates diff(1):
 240         * 0 = no changes, 1 = changes, else error
 241         */
 242        exit(diff_result_code(&revs->diffopt, 0));
 243}