git.oblomov.eu Git - git/blob - diff-lib.c

   1 /*
   2  * Copyright (C) 2005 Junio C Hamano
   3  */
   4 #include "cache.h"
   5 #include "quote.h"
   6 #include "commit.h"
   7 #include "diff.h"
   8 #include "diffcore.h"
   9 #include "revision.h"
  10 #include "cache-tree.h"
  11 #include "unpack-trees.h"
  12 #include "refs.h"
  13 #include "submodule.h"
  14
  15 /*
  16  * diff-files
  17  */
  18
  19 /*
  20  * Has the work tree entity been removed?
  21  *
  22  * Return 1 if it was removed from the work tree, 0 if an entity to be
  23  * compared with the cache entry ce still exists (the latter includes
  24  * the case where a directory that is not a submodule repository
  25  * exists for ce that is a submodule -- it is a submodule that is not
  26  * checked out).  Return negative for an error.
  27  */
  28 static int check_removed(const struct cache_entry *ce, struct stat *st)
  29 {
  30         if (lstat(ce->name, st) < 0) {
  31                 if (errno != ENOENT && errno != ENOTDIR)
  32                         return -1;
  33                 return 1;
  34         }
  35         if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
  36                 return 1;
  37         if (S_ISDIR(st->st_mode)) {
  38                 unsigned char sub[20];
  39
  40                 /*
  41                  * If ce is already a gitlink, we can have a plain
  42                  * directory (i.e. the submodule is not checked out),
  43                  * or a checked out submodule.  Either case this is not
  44                  * a case where something was removed from the work tree,
  45                  * so we will return 0.
  46                  *
  47                  * Otherwise, if the directory is not a submodule
  48                  * repository, that means ce which was a blob turned into
  49                  * a directory --- the blob was removed!
  50                  */
  51                 if (!S_ISGITLINK(ce->ce_mode) &&
  52                     resolve_gitlink_ref(ce->name, "HEAD", sub))
  53                         return 1;
  54         }
  55         return 0;
  56 }
  57
  58 /*
  59  * Has a file changed or has a submodule new commits or a dirty work tree?
  60  *
  61  * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
  62  * option is set, the caller does not only want to know if a submodule is
  63  * modified at all but wants to know all the conditions that are met (new
  64  * commits, untracked content and/or modified content).
  65  */
  66 static int match_stat_with_submodule(struct diff_options *diffopt,
  67                                      const struct cache_entry *ce,
  68                                      struct stat *st, unsigned ce_option,
  69                                      unsigned *dirty_submodule)
  70 {
  71         int changed = ce_match_stat(ce, st, ce_option);
  72         if (S_ISGITLINK(ce->ce_mode)) {
  73                 unsigned orig_flags = diffopt->flags;
  74                 if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
  75                         set_diffopt_flags_from_submodule_config(diffopt, ce->name);
  76                 if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
  77                         changed = 0;
  78                 else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
  79                     && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
  80                         *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
  81                 diffopt->flags = orig_flags;
  82         }
  83         return changed;
  84 }
  85
  86 int run_diff_files(struct rev_info *revs, unsigned int option)
  87 {
  88         int entries, i;
  89         int diff_unmerged_stage = revs->max_count;
  90         unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
  91                               ? CE_MATCH_RACY_IS_DIRTY : 0);
  92
  93         if (option & DIFF_SILENT_ON_REMOVED)
  94                 handle_deprecated_show_diff_q(&revs->diffopt);
  95
  96         diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
  97
  98         if (diff_unmerged_stage < 0)
  99                 diff_unmerged_stage = 2;
 100         entries = active_nr;
 101         for (i = 0; i < entries; i++) {
 102                 unsigned int oldmode, newmode;
 103                 struct cache_entry *ce = active_cache[i];
 104                 int changed;
 105                 unsigned dirty_submodule = 0;
 106
 107                 if (diff_can_quit_early(&revs->diffopt))
 108                         break;
 109
 110                 if (!ce_path_match(ce, &revs->prune_data))
 111                         continue;
 112
 113                 if (ce_stage(ce)) {
 114                         struct combine_diff_path *dpath;
 115                         struct diff_filepair *pair;
 116                         unsigned int wt_mode = 0;
 117                         int num_compare_stages = 0;
 118                         size_t path_len;
 119                         struct stat st;
 120
 121                         path_len = ce_namelen(ce);
 122
 123                         dpath = xmalloc(combine_diff_path_size(5, path_len));
 124                         dpath->path = (char *) &(dpath->parent[5]);
 125
 126                         dpath->next = NULL;
 127                         dpath->len = path_len;
 128                         memcpy(dpath->path, ce->name, path_len);
 129                         dpath->path[path_len] = '\0';
 130                         hashclr(dpath->sha1);
 131                         memset(&(dpath->parent[0]), 0,
 132                                sizeof(struct combine_diff_parent)*5);
 133
 134                         changed = check_removed(ce, &st);
 135                         if (!changed)
 136                                 wt_mode = ce_mode_from_stat(ce, st.st_mode);
 137                         else {
 138                                 if (changed < 0) {
 139                                         perror(ce->name);
 140                                         continue;
 141                                 }
 142                                 wt_mode = 0;
 143                         }
 144                         dpath->mode = wt_mode;
 145
 146                         while (i < entries) {
 147                                 struct cache_entry *nce = active_cache[i];
 148                                 int stage;
 149
 150                                 if (strcmp(ce->name, nce->name))
 151                                         break;
 152
 153                                 /* Stage #2 (ours) is the first parent,
 154                                  * stage #3 (theirs) is the second.
 155                                  */
 156                                 stage = ce_stage(nce);
 157                                 if (2 <= stage) {
 158                                         int mode = nce->ce_mode;
 159                                         num_compare_stages++;
 160                                         hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
 161                                         dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
 162                                         dpath->parent[stage-2].status =
 163                                                 DIFF_STATUS_MODIFIED;
 164                                 }
 165
 166                                 /* diff against the proper unmerged stage */
 167                                 if (stage == diff_unmerged_stage)
 168                                         ce = nce;
 169                                 i++;
 170                         }
 171                         /*
 172                          * Compensate for loop update
 173                          */
 174                         i--;
 175
 176                         if (revs->combine_merges && num_compare_stages == 2) {
 177                                 show_combined_diff(dpath, 2,
 178                                                    revs->dense_combined_merges,
 179                                                    revs);
 180                                 free(dpath);
 181                                 continue;
 182                         }
 183                         free(dpath);
 184                         dpath = NULL;
 185
 186                         /*
 187                          * Show the diff for the 'ce' if we found the one
 188                          * from the desired stage.
 189                          */
 190                         pair = diff_unmerge(&revs->diffopt, ce->name);
 191                         if (wt_mode)
 192                                 pair->two->mode = wt_mode;
 193                         if (ce_stage(ce) != diff_unmerged_stage)
 194                                 continue;
 195                 }
 196
 197                 if (ce_uptodate(ce) || ce_skip_worktree(ce))
 198                         continue;
 199
 200                 /* If CE_VALID is set, don't look at workdir for file removal */
 201                 if (ce->ce_flags & CE_VALID) {
 202                         changed = 0;
 203                         newmode = ce->ce_mode;
 204                 } else {
 205                         struct stat st;
 206
 207                         changed = check_removed(ce, &st);
 208                         if (changed) {
 209                                 if (changed < 0) {
 210                                         perror(ce->name);
 211                                         continue;
 212                                 }
 213                                 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
 214                                                ce->sha1, !is_null_sha1(ce->sha1),
 215                                                ce->name, 0);
 216                                 continue;
 217                         }
 218
 219                         changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
 220                                                             ce_option, &dirty_submodule);
 221                         newmode = ce_mode_from_stat(ce, st.st_mode);
 222                 }
 223
 224                 if (!changed && !dirty_submodule) {
 225                         ce_mark_uptodate(ce);
 226                         if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
 227                                 continue;
 228                 }
 229                 oldmode = ce->ce_mode;
 230                 diff_change(&revs->diffopt, oldmode, newmode,
 231                             ce->sha1, (changed ? null_sha1 : ce->sha1),
 232                             !is_null_sha1(ce->sha1), (changed ? 0 : !is_null_sha1(ce->sha1)),
 233                             ce->name, 0, dirty_submodule);
 234
 235         }
 236         diffcore_std(&revs->diffopt);
 237         diff_flush(&revs->diffopt);
 238         return 0;
 239 }
 240
 241 /*
 242  * diff-index
 243  */
 244
 245 /* A file entry went away or appeared */
 246 static void diff_index_show_file(struct rev_info *revs,
 247                                  const char *prefix,
 248                                  const struct cache_entry *ce,
 249                                  const unsigned char *sha1, int sha1_valid,
 250                                  unsigned int mode,
 251                                  unsigned dirty_submodule)
 252 {
 253         diff_addremove(&revs->diffopt, prefix[0], mode,
 254                        sha1, sha1_valid, ce->name, dirty_submodule);
 255 }
 256
 257 static int get_stat_data(const struct cache_entry *ce,
 258                          const unsigned char **sha1p,
 259                          unsigned int *modep,
 260                          int cached, int match_missing,
 261                          unsigned *dirty_submodule, struct diff_options *diffopt)
 262 {
 263         const unsigned char *sha1 = ce->sha1;
 264         unsigned int mode = ce->ce_mode;
 265
 266         if (!cached && !ce_uptodate(ce)) {
 267                 int changed;
 268                 struct stat st;
 269                 changed = check_removed(ce, &st);
 270                 if (changed < 0)
 271                         return -1;
 272                 else if (changed) {
 273                         if (match_missing) {
 274                                 *sha1p = sha1;
 275                                 *modep = mode;
 276                                 return 0;
 277                         }
 278                         return -1;
 279                 }
 280                 changed = match_stat_with_submodule(diffopt, ce, &st,
 281                                                     0, dirty_submodule);
 282                 if (changed) {
 283                         mode = ce_mode_from_stat(ce, st.st_mode);
 284                         sha1 = null_sha1;
 285                 }
 286         }
 287
 288         *sha1p = sha1;
 289         *modep = mode;
 290         return 0;
 291 }
 292
 293 static void show_new_file(struct rev_info *revs,
 294                           const struct cache_entry *new,
 295                           int cached, int match_missing)
 296 {
 297         const unsigned char *sha1;
 298         unsigned int mode;
 299         unsigned dirty_submodule = 0;
 300
 301         /*
 302          * New file in the index: it might actually be different in
 303          * the working tree.
 304          */
 305         if (get_stat_data(new, &sha1, &mode, cached, match_missing,
 306             &dirty_submodule, &revs->diffopt) < 0)
 307                 return;
 308
 309         diff_index_show_file(revs, "+", new, sha1, !is_null_sha1(sha1), mode, dirty_submodule);
 310 }
 311
 312 static int show_modified(struct rev_info *revs,
 313                          const struct cache_entry *old,
 314                          const struct cache_entry *new,
 315                          int report_missing,
 316                          int cached, int match_missing)
 317 {
 318         unsigned int mode, oldmode;
 319         const unsigned char *sha1;
 320         unsigned dirty_submodule = 0;
 321
 322         if (get_stat_data(new, &sha1, &mode, cached, match_missing,
 323                           &dirty_submodule, &revs->diffopt) < 0) {
 324                 if (report_missing)
 325                         diff_index_show_file(revs, "-", old,
 326                                              old->sha1, 1, old->ce_mode, 0);
 327                 return -1;
 328         }
 329
 330         if (revs->combine_merges && !cached &&
 331             (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
 332                 struct combine_diff_path *p;
 333                 int pathlen = ce_namelen(new);
 334
 335                 p = xmalloc(combine_diff_path_size(2, pathlen));
 336                 p->path = (char *) &p->parent[2];
 337                 p->next = NULL;
 338                 p->len = pathlen;
 339                 memcpy(p->path, new->name, pathlen);
 340                 p->path[pathlen] = 0;
 341                 p->mode = mode;
 342                 hashclr(p->sha1);
 343                 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
 344                 p->parent[0].status = DIFF_STATUS_MODIFIED;
 345                 p->parent[0].mode = new->ce_mode;
 346                 hashcpy(p->parent[0].sha1, new->sha1);
 347                 p->parent[1].status = DIFF_STATUS_MODIFIED;
 348                 p->parent[1].mode = old->ce_mode;
 349                 hashcpy(p->parent[1].sha1, old->sha1);
 350                 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
 351                 free(p);
 352                 return 0;
 353         }
 354
 355         oldmode = old->ce_mode;
 356         if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule &&
 357             !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
 358                 return 0;
 359
 360         diff_change(&revs->diffopt, oldmode, mode,
 361                     old->sha1, sha1, 1, !is_null_sha1(sha1),
 362                     old->name, 0, dirty_submodule);
 363         return 0;
 364 }
 365
 366 /*
 367  * This gets a mix of an existing index and a tree, one pathname entry
 368  * at a time. The index entry may be a single stage-0 one, but it could
 369  * also be multiple unmerged entries (in which case idx_pos/idx_nr will
 370  * give you the position and number of entries in the index).
 371  */
 372 static void do_oneway_diff(struct unpack_trees_options *o,
 373                            const struct cache_entry *idx,
 374                            const struct cache_entry *tree)
 375 {
 376         struct rev_info *revs = o->unpack_data;
 377         int match_missing, cached;
 378
 379         /* if the entry is not checked out, don't examine work tree */
 380         cached = o->index_only ||
 381                 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
 382         /*
 383          * Backward compatibility wart - "diff-index -m" does
 384          * not mean "do not ignore merges", but "match_missing".
 385          *
 386          * But with the revision flag parsing, that's found in
 387          * "!revs->ignore_merges".
 388          */
 389         match_missing = !revs->ignore_merges;
 390
 391         if (cached && idx && ce_stage(idx)) {
 392                 struct diff_filepair *pair;
 393                 pair = diff_unmerge(&revs->diffopt, idx->name);
 394                 if (tree)
 395                         fill_filespec(pair->one, tree->sha1, 1, tree->ce_mode);
 396                 return;
 397         }
 398
 399         /*
 400          * Something added to the tree?
 401          */
 402         if (!tree) {
 403                 show_new_file(revs, idx, cached, match_missing);
 404                 return;
 405         }
 406
 407         /*
 408          * Something removed from the tree?
 409          */
 410         if (!idx) {
 411                 diff_index_show_file(revs, "-", tree, tree->sha1, 1, tree->ce_mode, 0);
 412                 return;
 413         }
 414
 415         /* Show difference between old and new */
 416         show_modified(revs, tree, idx, 1, cached, match_missing);
 417 }
 418
 419 /*
 420  * The unpack_trees() interface is designed for merging, so
 421  * the different source entries are designed primarily for
 422  * the source trees, with the old index being really mainly
 423  * used for being replaced by the result.
 424  *
 425  * For diffing, the index is more important, and we only have a
 426  * single tree.
 427  *
 428  * We're supposed to advance o->pos to skip what we have already processed.
 429  *
 430  * This wrapper makes it all more readable, and takes care of all
 431  * the fairly complex unpack_trees() semantic requirements, including
 432  * the skipping, the path matching, the type conflict cases etc.
 433  */
 434 static int oneway_diff(const struct cache_entry * const *src,
 435                        struct unpack_trees_options *o)
 436 {
 437         const struct cache_entry *idx = src[0];
 438         const struct cache_entry *tree = src[1];
 439         struct rev_info *revs = o->unpack_data;
 440
 441         /*
 442          * Unpack-trees generates a DF/conflict entry if
 443          * there was a directory in the index and a tree
 444          * in the tree. From a diff standpoint, that's a
 445          * delete of the tree and a create of the file.
 446          */
 447         if (tree == o->df_conflict_entry)
 448                 tree = NULL;
 449
 450         if (ce_path_match(idx ? idx : tree, &revs->prune_data)) {
 451                 do_oneway_diff(o, idx, tree);
 452                 if (diff_can_quit_early(&revs->diffopt)) {
 453                         o->exiting_early = 1;
 454                         return -1;
 455                 }
 456         }
 457
 458         return 0;
 459 }
 460
 461 static int diff_cache(struct rev_info *revs,
 462                       const unsigned char *tree_sha1,
 463                       const char *tree_name,
 464                       int cached)
 465 {
 466         struct tree *tree;
 467         struct tree_desc t;
 468         struct unpack_trees_options opts;
 469
 470         tree = parse_tree_indirect(tree_sha1);
 471         if (!tree)
 472                 return error("bad tree object %s",
 473                              tree_name ? tree_name : sha1_to_hex(tree_sha1));
 474         memset(&opts, 0, sizeof(opts));
 475         opts.head_idx = 1;
 476         opts.index_only = cached;
 477         opts.diff_index_cached = (cached &&
 478                                   !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
 479         opts.merge = 1;
 480         opts.fn = oneway_diff;
 481         opts.unpack_data = revs;
 482         opts.src_index = &the_index;
 483         opts.dst_index = NULL;
 484         opts.pathspec = &revs->diffopt.pathspec;
 485         opts.pathspec->recursive = 1;
 486
 487         init_tree_desc(&t, tree->buffer, tree->size);
 488         return unpack_trees(1, &t, &opts);
 489 }
 490
 491 int run_diff_index(struct rev_info *revs, int cached)
 492 {
 493         struct object_array_entry *ent;
 494
 495         ent = revs->pending.objects;
 496         if (diff_cache(revs, ent->item->sha1, ent->name, cached))
 497                 exit(128);
 498
 499         diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
 500         diffcore_fix_diff_index(&revs->diffopt);
 501         diffcore_std(&revs->diffopt);
 502         diff_flush(&revs->diffopt);
 503         return 0;
 504 }
 505
 506 int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
 507 {
 508         struct rev_info revs;
 509
 510         init_revisions(&revs, NULL);
 511         copy_pathspec(&revs.prune_data, &opt->pathspec);
 512         revs.diffopt = *opt;
 513
 514         if (diff_cache(&revs, tree_sha1, NULL, 1))
 515                 exit(128);
 516         return 0;
 517 }
 518
 519 int index_differs_from(const char *def, int diff_flags)
 520 {
 521         struct rev_info rev;
 522         struct setup_revision_opt opt;
 523
 524         init_revisions(&rev, NULL);
 525         memset(&opt, 0, sizeof(opt));
 526         opt.def = def;
 527         setup_revisions(0, NULL, &rev, &opt);
 528         DIFF_OPT_SET(&rev.diffopt, QUICK);
 529         DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
 530         rev.diffopt.flags |= diff_flags;
 531         run_diff_index(&rev, 1);
 532         if (rev.pending.alloc)
 533                 free(rev.pending.objects);
 534         return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
 535 }