# HG changeset patch # User Siddharth Agarwal # Date 1428081918 25200 # Node ID c1c2af8aecb30188cec7deb4a4f96a953b2a96fb # Parent 93689e8f27ac657feed5332b71e66210c3a81cbf gitdirstate: fix whitespace diff --git a/hggit/gitdirstate.py b/hggit/gitdirstate.py --- 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?