diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -7585,7 +7585,7 @@ unshelved. """ with repo.wlock(): - return shelvemod.dounshelve(ui, repo, *shelved, **opts) + return shelvemod.unshelvecmd(ui, repo, *shelved, **opts) statemod.addunfinished( diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -1074,7 +1074,7 @@ raise error.Abort(m, hint=hint) -def dounshelve(ui, repo, *shelved, **opts): +def unshelvecmd(ui, repo, *shelved, **opts): opts = pycompat.byteskwargs(opts) abortf = opts.get(b'abort') continuef = opts.get(b'continue') @@ -1121,6 +1121,10 @@ if not shelvedfile(repo, basename, patchextension).exists(): raise error.Abort(_(b"shelved change '%s' not found") % basename) + return _dounshelve(ui, repo, basename, opts) + + +def _dounshelve(ui, repo, basename, opts): repo = repo.unfiltered() lock = tr = None try: