Mercurial > hg > hg-git
changeset 872:c1c2af8aecb3
gitdirstate: fix whitespace
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 03 Apr 2015 10:25:18 -0700 |
parents | 93689e8f27ac |
children | da01212cd53a |
files | hggit/gitdirstate.py |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/gitdirstate.py +++ b/hggit/gitdirstate.py @@ -92,7 +92,7 @@ if name == 'ignore' or name.startswith('ignore.'): files.append(util.expandpath(path)) patterns = [] - # Only use .gitignore if there's no .hgignore + # Only use .gitignore if there's no .hgignore try: fp = open(files[0]) fp.close() @@ -109,10 +109,10 @@ self._ui.warn("%s: %s\n" % (fn, warning)) patterns.extend(pats) return ignore.ignore(self._root, files, self._ui.warn, extrapatterns=patterns) - + def _finddotgitignores(self): """A copy of dirstate.walk. This is called from the new _ignore method, - which is called by dirstate.walk, which would cause infinite recursion, + which is called by dirstate.walk, which would cause infinite recursion, except _finddotgitignores calls the superclass _ignore directly.""" match = matchmod.match(self._root, self.getcwd(), ['relglob:.gitignore']) #TODO: need subrepos?