Mercurial > public > mercurial-scm > hg-stable
diff mercurial/context.py @ 38497:da2a7d8354b2
unlinkpath: make empty directory removal optional (issue5901) (issue5826)
There are known cases where performing operations such as rebase from a
directory that is newly created can fail or at least lead to being in a
directory handle that no longer exists.
This is even reproducible by just doing something as simple as:
cd foo; hg rm *
The behavior is different if you use `hg addremove`, the directory is not
removed until we attempt to go back to the node after committing it:
cd foo; rm *; hg addremove; hg ci -m'bye foo'; hg co .^; hg co tip
Differential Revision: https://phab.mercurial-scm.org/D3859
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 28 Jun 2018 18:07:22 -0700 |
| parents | aaed058a0390 |
| children | 4455e5d4d59c |
line wrap: on
line diff
--- a/mercurial/context.py Thu Jun 28 21:24:47 2018 +0530 +++ b/mercurial/context.py Thu Jun 28 18:07:22 2018 -0700 @@ -1707,7 +1707,9 @@ def remove(self, ignoremissing=False): """wraps unlink for a repo's working directory""" - self._repo.wvfs.unlinkpath(self._path, ignoremissing=ignoremissing) + rmdir = self._repo.ui.configbool('experimental', 'removeemptydirs') + self._repo.wvfs.unlinkpath(self._path, ignoremissing=ignoremissing, + rmdir=rmdir) def write(self, data, flags, backgroundclose=False, **kwargs): """wraps repo.wwrite"""