Merge branch 'master' into jc/cache-tree
[git.git] / update-index.c
1 /*
2  * GIT - The information manager from hell
3  *
4  * Copyright (C) Linus Torvalds, 2005
5  */
6 #include "cache.h"
7 #include "strbuf.h"
8 #include "quote.h"
9 #include "cache-tree.h"
10 #include "tree-walk.h"
11
12 /*
13  * Default to not allowing changes to the list of files. The
14  * tool doesn't actually care, but this makes it harder to add
15  * files to the revision control by mistake by doing something
16  * like "git-update-index *" and suddenly having all the object
17  * files be revision controlled.
18  */
19 static int allow_add;
20 static int allow_remove;
21 static int allow_replace;
22 static int allow_unmerged; /* --refresh needing merge is not error */
23 static int not_new; /* --refresh not having working tree files is not error */
24 static int quiet; /* --refresh needing update is not error */
25 static int info_only;
26 static int force_remove;
27 static int verbose;
28 static int mark_valid_only = 0;
29 #define MARK_VALID 1
30 #define UNMARK_VALID 2
31
32
33 /* Three functions to allow overloaded pointer return; see linux/err.h */
34 static inline void *ERR_PTR(long error)
35 {
36         return (void *) error;
37 }
38
39 static inline long PTR_ERR(const void *ptr)
40 {
41         return (long) ptr;
42 }
43
44 static inline long IS_ERR(const void *ptr)
45 {
46         return (unsigned long)ptr > (unsigned long)-1000L;
47 }
48
49 static void report(const char *fmt, ...)
50 {
51         va_list vp;
52
53         if (!verbose)
54                 return;
55
56         va_start(vp, fmt);
57         vprintf(fmt, vp);
58         putchar('\n');
59         va_end(vp);
60 }
61
62 static int mark_valid(const char *path)
63 {
64         int namelen = strlen(path);
65         int pos = cache_name_pos(path, namelen);
66         if (0 <= pos) {
67                 switch (mark_valid_only) {
68                 case MARK_VALID:
69                         active_cache[pos]->ce_flags |= htons(CE_VALID);
70                         break;
71                 case UNMARK_VALID:
72                         active_cache[pos]->ce_flags &= ~htons(CE_VALID);
73                         break;
74                 }
75                 cache_tree_invalidate_path(active_cache_tree, path);
76                 active_cache_changed = 1;
77                 return 0;
78         }
79         return -1;
80 }
81
82 static int add_file_to_cache(const char *path)
83 {
84         int size, namelen, option, status;
85         struct cache_entry *ce;
86         struct stat st;
87
88         status = lstat(path, &st);
89
90         /* We probably want to do this in remove_file_from_cache() and
91          * add_cache_entry() instead...
92          */
93         cache_tree_invalidate_path(active_cache_tree, path);
94
95         if (status < 0 || S_ISDIR(st.st_mode)) {
96                 /* When we used to have "path" and now we want to add
97                  * "path/file", we need a way to remove "path" before
98                  * being able to add "path/file".  However,
99                  * "git-update-index --remove path" would not work.
100                  * --force-remove can be used but this is more user
101                  * friendly, especially since we can do the opposite
102                  * case just fine without --force-remove.
103                  */
104                 if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
105                         if (allow_remove) {
106                                 if (remove_file_from_cache(path))
107                                         return error("%s: cannot remove from the index",
108                                                      path);
109                                 else
110                                         return 0;
111                         } else if (status < 0) {
112                                 return error("%s: does not exist and --remove not passed",
113                                              path);
114                         }
115                 }
116                 if (0 == status)
117                         return error("%s: is a directory - add files inside instead",
118                                      path);
119                 else
120                         return error("lstat(\"%s\"): %s", path,
121                                      strerror(errno));
122         }
123
124         namelen = strlen(path);
125         size = cache_entry_size(namelen);
126         ce = xcalloc(1, size);
127         memcpy(ce->name, path, namelen);
128         ce->ce_flags = htons(namelen);
129         fill_stat_cache_info(ce, &st);
130
131         ce->ce_mode = create_ce_mode(st.st_mode);
132         if (!trust_executable_bit) {
133                 /* If there is an existing entry, pick the mode bits
134                  * from it.
135                  */
136                 int pos = cache_name_pos(path, namelen);
137                 if (0 <= pos)
138                         ce->ce_mode = active_cache[pos]->ce_mode;
139         }
140
141         if (index_path(ce->sha1, path, &st, !info_only))
142                 return -1;
143         option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
144         option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
145         if (add_cache_entry(ce, option))
146                 return error("%s: cannot add to the index - missing --add option?",
147                              path);
148         return 0;
149 }
150
151 /*
152  * "refresh" does not calculate a new sha1 file or bring the
153  * cache up-to-date for mode/content changes. But what it
154  * _does_ do is to "re-match" the stat information of a file
155  * with the cache, so that you can refresh the cache for a
156  * file that hasn't been changed but where the stat entry is
157  * out of date.
158  *
159  * For example, you'd want to do this after doing a "git-read-tree",
160  * to link up the stat cache details with the proper files.
161  */
162 static struct cache_entry *refresh_entry(struct cache_entry *ce, int really)
163 {
164         struct stat st;
165         struct cache_entry *updated;
166         int changed, size;
167
168         if (lstat(ce->name, &st) < 0)
169                 return ERR_PTR(-errno);
170
171         changed = ce_match_stat(ce, &st, really);
172         if (!changed) {
173                 if (really && assume_unchanged &&
174                     !(ce->ce_flags & htons(CE_VALID)))
175                         ; /* mark this one VALID again */
176                 else
177                         return NULL;
178         }
179
180         if (ce_modified(ce, &st, really))
181                 return ERR_PTR(-EINVAL);
182
183         size = ce_size(ce);
184         updated = xmalloc(size);
185         memcpy(updated, ce, size);
186         fill_stat_cache_info(updated, &st);
187
188         /* In this case, if really is not set, we should leave
189          * CE_VALID bit alone.  Otherwise, paths marked with
190          * --no-assume-unchanged (i.e. things to be edited) will
191          * reacquire CE_VALID bit automatically, which is not
192          * really what we want.
193          */
194         if (!really && assume_unchanged && !(ce->ce_flags & htons(CE_VALID)))
195                 updated->ce_flags &= ~htons(CE_VALID);
196
197         return updated;
198 }
199
200 static int refresh_cache(int really)
201 {
202         int i;
203         int has_errors = 0;
204
205         for (i = 0; i < active_nr; i++) {
206                 struct cache_entry *ce, *new;
207                 ce = active_cache[i];
208                 if (ce_stage(ce)) {
209                         while ((i < active_nr) &&
210                                ! strcmp(active_cache[i]->name, ce->name))
211                                 i++;
212                         i--;
213                         if (allow_unmerged)
214                                 continue;
215                         printf("%s: needs merge\n", ce->name);
216                         has_errors = 1;
217                         continue;
218                 }
219
220                 new = refresh_entry(ce, really);
221                 if (!new)
222                         continue;
223                 if (IS_ERR(new)) {
224                         if (not_new && PTR_ERR(new) == -ENOENT)
225                                 continue;
226                         if (really && PTR_ERR(new) == -EINVAL) {
227                                 /* If we are doing --really-refresh that
228                                  * means the index is not valid anymore.
229                                  */
230                                 ce->ce_flags &= ~htons(CE_VALID);
231                                 active_cache_changed = 1;
232                         }
233                         if (quiet)
234                                 continue;
235                         printf("%s: needs update\n", ce->name);
236                         has_errors = 1;
237                         continue;
238                 }
239                 active_cache_changed = 1;
240                 /* You can NOT just free active_cache[i] here, since it
241                  * might not be necessarily malloc()ed but can also come
242                  * from mmap(). */
243                 active_cache[i] = new;
244         }
245         return has_errors;
246 }
247
248 /*
249  * We fundamentally don't like some paths: we don't want
250  * dot or dot-dot anywhere, and for obvious reasons don't
251  * want to recurse into ".git" either.
252  *
253  * Also, we don't want double slashes or slashes at the
254  * end that can make pathnames ambiguous.
255  */
256 static int verify_dotfile(const char *rest)
257 {
258         /*
259          * The first character was '.', but that
260          * has already been discarded, we now test
261          * the rest.
262          */
263         switch (*rest) {
264         /* "." is not allowed */
265         case '\0': case '/':
266                 return 0;
267
268         /*
269          * ".git" followed by  NUL or slash is bad. This
270          * shares the path end test with the ".." case.
271          */
272         case 'g':
273                 if (rest[1] != 'i')
274                         break;
275                 if (rest[2] != 't')
276                         break;
277                 rest += 2;
278         /* fallthrough */
279         case '.':
280                 if (rest[1] == '\0' || rest[1] == '/')
281                         return 0;
282         }
283         return 1;
284 }
285
286 static int verify_path(const char *path)
287 {
288         char c;
289
290         goto inside;
291         for (;;) {
292                 if (!c)
293                         return 1;
294                 if (c == '/') {
295 inside:
296                         c = *path++;
297                         switch (c) {
298                         default:
299                                 continue;
300                         case '/': case '\0':
301                                 break;
302                         case '.':
303                                 if (verify_dotfile(path))
304                                         continue;
305                         }
306                         return 0;
307                 }
308                 c = *path++;
309         }
310 }
311
312 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
313                          const char *path, int stage)
314 {
315         int size, len, option;
316         struct cache_entry *ce;
317
318         if (!verify_path(path))
319                 return -1;
320
321         len = strlen(path);
322         size = cache_entry_size(len);
323         ce = xcalloc(1, size);
324
325         memcpy(ce->sha1, sha1, 20);
326         memcpy(ce->name, path, len);
327         ce->ce_flags = create_ce_flags(len, stage);
328         ce->ce_mode = create_ce_mode(mode);
329         if (assume_unchanged)
330                 ce->ce_flags |= htons(CE_VALID);
331         option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
332         option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
333         if (add_cache_entry(ce, option))
334                 return error("%s: cannot add to the index - missing --add option?",
335                              path);
336         report("add '%s'", path);
337         cache_tree_invalidate_path(active_cache_tree, path);
338         return 0;
339 }
340
341 static void chmod_path(int flip, const char *path)
342 {
343         int pos;
344         struct cache_entry *ce;
345         unsigned int mode;
346
347         pos = cache_name_pos(path, strlen(path));
348         if (pos < 0)
349                 goto fail;
350         ce = active_cache[pos];
351         mode = ntohl(ce->ce_mode);
352         if (!S_ISREG(mode))
353                 goto fail;
354         switch (flip) {
355         case '+':
356                 ce->ce_mode |= htonl(0111); break;
357         case '-':
358                 ce->ce_mode &= htonl(~0111); break;
359         default:
360                 goto fail;
361         }
362         cache_tree_invalidate_path(active_cache_tree, path);
363         active_cache_changed = 1;
364         report("chmod %cx '%s'", flip, path);
365         return;
366  fail:
367         die("git-update-index: cannot chmod %cx '%s'", flip, path);
368 }
369
370 static struct cache_file cache_file;
371
372 static void update_one(const char *path, const char *prefix, int prefix_length)
373 {
374         const char *p = prefix_path(prefix, prefix_length, path);
375         if (!verify_path(p)) {
376                 fprintf(stderr, "Ignoring path %s\n", path);
377                 return;
378         }
379         if (mark_valid_only) {
380                 if (mark_valid(p))
381                         die("Unable to mark file %s", path);
382                 return;
383         }
384         cache_tree_invalidate_path(active_cache_tree, path);
385
386         if (force_remove) {
387                 if (remove_file_from_cache(p))
388                         die("git-update-index: unable to remove %s", path);
389                 report("remove '%s'", path);
390                 return;
391         }
392         if (add_file_to_cache(p))
393                 die("Unable to process file %s", path);
394         report("add '%s'", path);
395 }
396
397 static void read_index_info(int line_termination)
398 {
399         struct strbuf buf;
400         strbuf_init(&buf);
401         while (1) {
402                 char *ptr, *tab;
403                 char *path_name;
404                 unsigned char sha1[20];
405                 unsigned int mode;
406                 int stage;
407
408                 /* This reads lines formatted in one of three formats:
409                  *
410                  * (1) mode         SP sha1          TAB path
411                  * The first format is what "git-apply --index-info"
412                  * reports, and used to reconstruct a partial tree
413                  * that is used for phony merge base tree when falling
414                  * back on 3-way merge.
415                  *
416                  * (2) mode SP type SP sha1          TAB path
417                  * The second format is to stuff git-ls-tree output
418                  * into the index file.
419                  * 
420                  * (3) mode         SP sha1 SP stage TAB path
421                  * This format is to put higher order stages into the
422                  * index file and matches git-ls-files --stage output.
423                  */
424                 read_line(&buf, stdin, line_termination);
425                 if (buf.eof)
426                         break;
427
428                 mode = strtoul(buf.buf, &ptr, 8);
429                 if (ptr == buf.buf || *ptr != ' ')
430                         goto bad_line;
431
432                 tab = strchr(ptr, '\t');
433                 if (!tab || tab - ptr < 41)
434                         goto bad_line;
435
436                 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
437                         stage = tab[-1] - '0';
438                         ptr = tab + 1; /* point at the head of path */
439                         tab = tab - 2; /* point at tail of sha1 */
440                 }
441                 else {
442                         stage = 0;
443                         ptr = tab + 1; /* point at the head of path */
444                 }
445
446                 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
447                         goto bad_line;
448
449                 if (line_termination && ptr[0] == '"')
450                         path_name = unquote_c_style(ptr, NULL);
451                 else
452                         path_name = ptr;
453
454                 if (!verify_path(path_name)) {
455                         fprintf(stderr, "Ignoring path %s\n", path_name);
456                         if (path_name != ptr)
457                                 free(path_name);
458                         continue;
459                 }
460                 cache_tree_invalidate_path(active_cache_tree, path_name);
461
462                 if (!mode) {
463                         /* mode == 0 means there is no such path -- remove */
464                         if (remove_file_from_cache(path_name))
465                                 die("git-update-index: unable to remove %s",
466                                     ptr);
467                 }
468                 else {
469                         /* mode ' ' sha1 '\t' name
470                          * ptr[-1] points at tab,
471                          * ptr[-41] is at the beginning of sha1
472                          */
473                         ptr[-42] = ptr[-1] = 0;
474                         if (add_cacheinfo(mode, sha1, path_name, stage))
475                                 die("git-update-index: unable to update %s",
476                                     path_name);
477                 }
478                 if (path_name != ptr)
479                         free(path_name);
480                 continue;
481
482         bad_line:
483                 die("malformed index info %s", buf.buf);
484         }
485 }
486
487 static const char update_index_usage[] =
488 "git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
489
490 static unsigned char head_sha1[20];
491 static unsigned char merge_head_sha1[20];
492
493 static struct cache_entry *read_one_ent(const char *which,
494                                         unsigned char *ent, const char *path,
495                                         int namelen, int stage)
496 {
497         unsigned mode;
498         unsigned char sha1[20];
499         int size;
500         struct cache_entry *ce;
501
502         if (get_tree_entry(ent, path, sha1, &mode)) {
503                 error("%s: not in %s branch.", path, which);
504                 return NULL;
505         }
506         if (mode == S_IFDIR) {
507                 error("%s: not a blob in %s branch.", path, which);
508                 return NULL;
509         }
510         size = cache_entry_size(namelen);
511         ce = xcalloc(1, size);
512
513         memcpy(ce->sha1, sha1, 20);
514         memcpy(ce->name, path, namelen);
515         ce->ce_flags = create_ce_flags(namelen, stage);
516         ce->ce_mode = create_ce_mode(mode);
517         return ce;
518 }
519
520 static int unresolve_one(const char *path)
521 {
522         int namelen = strlen(path);
523         int pos;
524         int ret = 0;
525         struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
526
527         /* See if there is such entry in the index. */
528         pos = cache_name_pos(path, namelen);
529         if (pos < 0) {
530                 /* If there isn't, either it is unmerged, or
531                  * resolved as "removed" by mistake.  We do not
532                  * want to do anything in the former case.
533                  */
534                 pos = -pos-1;
535                 if (pos < active_nr) {
536                         struct cache_entry *ce = active_cache[pos];
537                         if (ce_namelen(ce) == namelen &&
538                             !memcmp(ce->name, path, namelen)) {
539                                 fprintf(stderr,
540                                         "%s: skipping still unmerged path.\n",
541                                         path);
542                                 goto free_return;
543                         }
544                 }
545         }
546
547         /* Grab blobs from given path from HEAD and MERGE_HEAD,
548          * stuff HEAD version in stage #2,
549          * stuff MERGE_HEAD version in stage #3.
550          */
551         ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
552         ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
553
554         if (!ce_2 || !ce_3) {
555                 ret = -1;
556                 goto free_return;
557         }
558         if (!memcmp(ce_2->sha1, ce_3->sha1, 20) &&
559             ce_2->ce_mode == ce_3->ce_mode) {
560                 fprintf(stderr, "%s: identical in both, skipping.\n",
561                         path);
562                 goto free_return;
563         }
564
565         remove_file_from_cache(path);
566         if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
567                 error("%s: cannot add our version to the index.", path);
568                 ret = -1;
569                 goto free_return;
570         }
571         if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
572                 return 0;
573         error("%s: cannot add their version to the index.", path);
574         ret = -1;
575  free_return:
576         free(ce_2);
577         free(ce_3);
578         return ret;
579 }
580
581 static void read_head_pointers(void)
582 {
583         if (read_ref(git_path("HEAD"), head_sha1))
584                 die("No HEAD -- no initial commit yet?\n");
585         if (read_ref(git_path("MERGE_HEAD"), merge_head_sha1)) {
586                 fprintf(stderr, "Not in the middle of a merge.\n");
587                 exit(0);
588         }
589 }
590
591 static int do_unresolve(int ac, const char **av)
592 {
593         int i;
594         int err = 0;
595
596         /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
597          * are not doing a merge, so exit with success status.
598          */
599         read_head_pointers();
600
601         for (i = 1; i < ac; i++) {
602                 const char *arg = av[i];
603                 err |= unresolve_one(arg);
604         }
605         return err;
606 }
607
608 int main(int argc, const char **argv)
609 {
610         int i, newfd, entries, has_errors = 0, line_termination = '\n';
611         int allow_options = 1;
612         int read_from_stdin = 0;
613         const char *prefix = setup_git_directory();
614         int prefix_length = prefix ? strlen(prefix) : 0;
615         char set_executable_bit = 0;
616
617         git_config(git_default_config);
618
619         newfd = hold_index_file_for_update(&cache_file, get_index_file());
620         if (newfd < 0)
621                 die("unable to create new cachefile");
622
623         entries = read_cache();
624         if (entries < 0)
625                 die("cache corrupted");
626
627         for (i = 1 ; i < argc; i++) {
628                 const char *path = argv[i];
629
630                 if (allow_options && *path == '-') {
631                         if (!strcmp(path, "--")) {
632                                 allow_options = 0;
633                                 continue;
634                         }
635                         if (!strcmp(path, "-q")) {
636                                 quiet = 1;
637                                 continue;
638                         }
639                         if (!strcmp(path, "--add")) {
640                                 allow_add = 1;
641                                 continue;
642                         }
643                         if (!strcmp(path, "--replace")) {
644                                 allow_replace = 1;
645                                 continue;
646                         }
647                         if (!strcmp(path, "--remove")) {
648                                 allow_remove = 1;
649                                 continue;
650                         }
651                         if (!strcmp(path, "--unmerged")) {
652                                 allow_unmerged = 1;
653                                 continue;
654                         }
655                         if (!strcmp(path, "--refresh")) {
656                                 has_errors |= refresh_cache(0);
657                                 continue;
658                         }
659                         if (!strcmp(path, "--really-refresh")) {
660                                 has_errors |= refresh_cache(1);
661                                 continue;
662                         }
663                         if (!strcmp(path, "--cacheinfo")) {
664                                 unsigned char sha1[20];
665                                 unsigned int mode;
666
667                                 if (i+3 >= argc)
668                                         die("git-update-index: --cacheinfo <mode> <sha1> <path>");
669
670                                 if ((sscanf(argv[i+1], "%o", &mode) != 1) ||
671                                     get_sha1_hex(argv[i+2], sha1) ||
672                                     add_cacheinfo(mode, sha1, argv[i+3], 0))
673                                         die("git-update-index: --cacheinfo"
674                                             " cannot add %s", argv[i+3]);
675                                 i += 3;
676                                 continue;
677                         }
678                         if (!strcmp(path, "--chmod=-x") ||
679                             !strcmp(path, "--chmod=+x")) {
680                                 if (argc <= i+1)
681                                         die("git-update-index: %s <path>", path);
682                                 set_executable_bit = path[8];
683                                 continue;
684                         }
685                         if (!strcmp(path, "--assume-unchanged")) {
686                                 mark_valid_only = MARK_VALID;
687                                 continue;
688                         }
689                         if (!strcmp(path, "--no-assume-unchanged")) {
690                                 mark_valid_only = UNMARK_VALID;
691                                 continue;
692                         }
693                         if (!strcmp(path, "--info-only")) {
694                                 info_only = 1;
695                                 continue;
696                         }
697                         if (!strcmp(path, "--force-remove")) {
698                                 force_remove = 1;
699                                 continue;
700                         }
701                         if (!strcmp(path, "-z")) {
702                                 line_termination = 0;
703                                 continue;
704                         }
705                         if (!strcmp(path, "--stdin")) {
706                                 if (i != argc - 1)
707                                         die("--stdin must be at the end");
708                                 read_from_stdin = 1;
709                                 break;
710                         }
711                         if (!strcmp(path, "--index-info")) {
712                                 if (i != argc - 1)
713                                         die("--index-info must be at the end");
714                                 allow_add = allow_replace = allow_remove = 1;
715                                 read_index_info(line_termination);
716                                 break;
717                         }
718                         if (!strcmp(path, "--unresolve")) {
719                                 has_errors = do_unresolve(argc - i, argv + i);
720                                 if (has_errors)
721                                         active_cache_changed = 0;
722                                 goto finish;
723                         }
724                         if (!strcmp(path, "--ignore-missing")) {
725                                 not_new = 1;
726                                 continue;
727                         }
728                         if (!strcmp(path, "--verbose")) {
729                                 verbose = 1;
730                                 continue;
731                         }
732                         if (!strcmp(path, "-h") || !strcmp(path, "--help"))
733                                 usage(update_index_usage);
734                         die("unknown option %s", path);
735                 }
736                 update_one(path, prefix, prefix_length);
737                 if (set_executable_bit)
738                         chmod_path(set_executable_bit, path);
739         }
740         if (read_from_stdin) {
741                 struct strbuf buf;
742                 strbuf_init(&buf);
743                 while (1) {
744                         char *path_name;
745                         read_line(&buf, stdin, line_termination);
746                         if (buf.eof)
747                                 break;
748                         if (line_termination && buf.buf[0] == '"')
749                                 path_name = unquote_c_style(buf.buf, NULL);
750                         else
751                                 path_name = buf.buf;
752                         update_one(path_name, prefix, prefix_length);
753                         if (set_executable_bit) {
754                                 const char *p = prefix_path(prefix, prefix_length, path_name);
755                                 chmod_path(set_executable_bit, p);
756                         }
757                         if (path_name != buf.buf)
758                                 free(path_name);
759                 }
760         }
761
762  finish:
763         if (active_cache_changed) {
764                 if (write_cache(newfd, active_cache, active_nr) ||
765                     commit_index_file(&cache_file))
766                         die("Unable to write new cachefile");
767         }
768
769         return has_errors ? 1 : 0;
770 }