thodg/libgit2/src/ignore.h

• Show log

  Commit

• Hash : f554611a
  Author :
  Date : 2014-05-06T12:41:26
  

  Improve checks for ignore containment
  
  The diff code was using an "ignored_prefix" directory to track if
  a parent directory was ignored that contained untracked files
  alongside tracked files. Unfortunately, when negative ignore rules
  were used for directories inside ignored parents, the wrong rules
  were applied to untracked files inside the negatively ignored
  child directories.
  
  This commit moves the logic for ignore containment into the workdir
  iterator (which is a better place for it), so the ignored-ness of
  a directory is contained in the frame stack during traversal.  This
  allows a child directory to override with a negative ignore and yet
  still restore the ignored state of the parent when we traverse out
  of the child.
  
  Along with this, there are some problems with "directory only"
  ignore rules on container directories.  Given "a/*" and "!a/b/c/"
  (where the second rule is a directory rule but the first rule is
  just a generic prefix rule), then the directory only constraint
  was having "a/b/c/d/file" match the first rule and not the second.
  This was fixed by having ignore directory-only rules test a rule
  against the prefix of a file with LEADINGDIR enabled.
  
  Lastly, spot checks for ignores using `git_ignore_path_is_ignored`
  were tested from the top directory down to the bottom to deal with
  the containment problem, but this is wrong. We have to test bottom
  to top so that negative subdirectory rules will be checked before
  parent ignore rules.
  
  This does change the behavior of some existing tests, but it seems
  only to bring us more in line with core Git, so I think those
  changes are acceptable.
  

Download

• src/ignore.h

• /*
   * Copyright (C) the libgit2 contributors. All rights reserved.
   *
   * This file is part of libgit2, distributed under the GNU GPL v2 with
   * a Linking Exception. For full terms see the included COPYING file.
   */
  #ifndef INCLUDE_ignore_h__
  #define INCLUDE_ignore_h__
  
  #include "repository.h"
  #include "vector.h"
  #include "attr_file.h"
  
  #define GIT_IGNORE_FILE			".gitignore"
  #define GIT_IGNORE_FILE_INREPO	"info/exclude"
  #define GIT_IGNORE_FILE_XDG		"ignore"
  
  /* The git_ignores structure maintains three sets of ignores:
   * - internal ignores
   * - per directory ignores
   * - global ignores (at lower priority than the others)
   * As you traverse from one directory to another, you can push and pop
   * directories onto git_ignores list efficiently.
   */
  typedef struct {
  	git_repository *repo;
  	git_buf dir; /* current directory reflected in ign_path */
  	git_attr_file *ign_internal;
  	git_vector ign_path;
  	git_vector ign_global;
  	size_t dir_root; /* offset in dir to repo root */
  	int ignore_case;
  	int depth;
  } git_ignores;
  
  extern int git_ignore__for_path(
  	git_repository *repo, const char *path, git_ignores *ign);
  
  extern int git_ignore__push_dir(git_ignores *ign, const char *dir);
  
  extern int git_ignore__pop_dir(git_ignores *ign);
  
  extern void git_ignore__free(git_ignores *ign);
  
  enum {
  	GIT_IGNORE_UNCHECKED = -2,
  	GIT_IGNORE_NOTFOUND = -1,
  	GIT_IGNORE_FALSE = 0,
  	GIT_IGNORE_TRUE = 1,
  };
  
  extern int git_ignore__lookup(int *out, git_ignores *ign, const char *path);
  
  /* command line Git sometimes generates an error message if given a
   * pathspec that contains an exact match to an ignored file (provided
   * --force isn't also given).  This makes it easy to check it that has
   * happened.  Returns GIT_EINVALIDSPEC if the pathspec contains ignored
   * exact matches (that are not already present in the index).
   */
  extern int git_ignore__check_pathspec_for_exact_ignores(
  	git_repository *repo, git_vector *pathspec, bool no_fnmatch);
  
  #endif
  

Download