# HG changeset patch # User Patrick Mezard # Date 2008-04-05 16:15:04 # Node ID 31abcae33b4f22cea9d0db5fdfa5f3f11370dd06 # Parent 6ed371423d3482f321edc5be338893613109dda1 dirstate: do not ignore current directory '.' (issue 1078) diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -407,6 +407,8 @@ class dirstate(object): return False def _dirignore(self, f): + if f == '.': + return False if self._ignore(f): return True for c in strutil.findall(f, '/'): diff --git a/tests/test-hgignore b/tests/test-hgignore --- a/tests/test-hgignore +++ b/tests/test-hgignore @@ -40,6 +40,10 @@ echo "--" ; hg status 2>&1 | sed -e 's/a echo ".*\.o" > .hgignore echo "--" ; hg status +# Check it does not ignore the current directory '.' +echo "^\." > .hgignore +echo "--" ; hg status + echo "glob:**.o" > .hgignore echo "--" ; hg status diff --git a/tests/test-hgignore.out b/tests/test-hgignore.out --- a/tests/test-hgignore.out +++ b/tests/test-hgignore.out @@ -15,6 +15,12 @@ A dir/b.o ? syntax -- A dir/b.o +? a.c +? a.o +? dir/c.o +? syntax +-- +A dir/b.o ? .hgignore ? a.c ? syntax