This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6402

dirstate: drop workaround for '.' matching root directory
ClosedPublic

Authored by martinvonz on May 17 2019, 1:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG448486e12c13: dirstate: drop workaround for '.' matching root directory
Summary

The check was added in 31abcae33b4f (dirstate: do not ignore current
directory '.' (issue 1078), 2008-04-05) to fix issue1078. Funnily
enough, comment #2 on that issue mentions using '' instead of '.' to
represent the root directory, just like my previous patch did.

test-hgignore.t fails with this patch without the previous patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (2 lines)

Diff 15174

mercurial/dirstate.py

now = end # trust our estimate that the end is near now now = end # trust our estimate that the end is near now
break break
self._map.write(st, now) self._map.write(st, now)
self._lastnormaltime = 0 self._lastnormaltime = 0
self._dirty = False self._dirty = False
def _dirignore(self, f): def _dirignore(self, f):
if f == '.':
return False
if self._ignore(f): if self._ignore(f):
return True return True
for p in util.finddirs(f): for p in util.finddirs(f):
if self._ignore(p): if self._ignore(p):
return True return True
return False return False
def _ignorefiles(self): def _ignorefiles(self):