Mercurial > public > mercurial-scm > hg-stable
diff mercurial/vfs.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 | aac4be30e250 |
| children | 3dd34b401bc2 |
line wrap: on
line diff
--- a/mercurial/vfs.py Thu Jun 28 21:24:47 2018 +0530 +++ b/mercurial/vfs.py Thu Jun 28 18:07:22 2018 -0700 @@ -246,8 +246,9 @@ """Attempt to remove a file, ignoring missing file errors.""" util.tryunlink(self.join(path)) - def unlinkpath(self, path=None, ignoremissing=False): - return util.unlinkpath(self.join(path), ignoremissing=ignoremissing) + def unlinkpath(self, path=None, ignoremissing=False, rmdir=True): + return util.unlinkpath(self.join(path), ignoremissing=ignoremissing, + rmdir=rmdir) def utime(self, path=None, t=None): return os.utime(self.join(path), t)