--- a/mercurial/upgrade.py Fri Jul 13 03:05:30 2018 +0200
+++ b/mercurial/upgrade.py Fri Dec 21 13:17:58 2018 +0100
@@ -742,7 +742,7 @@
return backuppath
-def upgraderepo(ui, repo, run=False, optimize=None):
+def upgraderepo(ui, repo, run=False, optimize=None, backup=True):
"""Upgrade a repository in place."""
if optimize is None:
optimize = []
@@ -899,6 +899,10 @@
with dstrepo.wlock(), dstrepo.lock():
backuppath = _upgraderepo(ui, repo, dstrepo, newreqs,
upgradeactions)
+ if not (backup or backuppath is None):
+ ui.write(_('removing old repository content%s\n') % backuppath)
+ repo.vfs.rmtree(backuppath, forcibly=True)
+ backuppath = None
finally:
ui.write(_('removing temporary repository %s\n') % tmppath)