This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5928

dirstate: call and cache os.getcwd() in constructor
ClosedPublic

Authored by martinvonz on Feb 11 2019, 12:52 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe178b131906a: dirstate: call and cache os.getcwd() in constructor
Summary

I'm about to make scmutil.matchfiles() not pass the root and cwd paths
to match.exact(), since they no longer have any effect. That turned
out to have the surprising effect of making some tests
(test-rebase-scenario-global.t and test-removeemptydirs.t) crash when
the working directory was removed. The problem was that my patch
removed the call to repo.getcwd(), which caused the current working
directory to not be cached in the dirstate as early as it was
before. This patch fixes that by caching the current working directory
in the dirstate constructor.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (4 lines)

Diff 14016

mercurial/dirstate.py

self._filecache = {} self._filecache = {}
self._parentwriters = 0 self._parentwriters = 0
self._filename = 'dirstate' self._filename = 'dirstate'
self._pendingfilename = '%s.pending' % self._filename self._pendingfilename = '%s.pending' % self._filename
self._plchangecallbacks = {} self._plchangecallbacks = {}
self._origpl = None self._origpl = None
self._updatedfiles = set() self._updatedfiles = set()
self._mapcls = dirstatemap self._mapcls = dirstatemap
# Access and cache cwd early, so we don't access it for the first time
# after a working-copy update caused it to not exist (accessing it then
# raises an exception).
self._cwd
@contextlib.contextmanager @contextlib.contextmanager
def parentchange(self): def parentchange(self):
'''Context manager for handling dirstate parents. '''Context manager for handling dirstate parents.
If an exception occurs in the scope of the context manager, If an exception occurs in the scope of the context manager,
the incoherent dirstate won't be written when wlock is the incoherent dirstate won't be written when wlock is
released. released.