Patchwork D8322: shelve: split up dounshelve() in unshelvecmd() and _dounshelve()

login
register
mail settings
Submitter phabricator
Date March 25, 2020, 8:33 p.m.
Message ID <cd3e140c06dd83028d9fcc1df8614743@localhost.localdomain>
Download mbox | patch
Permalink /patch/45892/
State Not Applicable
Headers show

Comments

phabricator - March 25, 2020, 8:33 p.m.
Closed by commit rHG47c1226463a1: shelve: split up dounshelve() in unshelvecmd() and _dounshelve() (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8322?vs=20865&id=20878

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8322/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8322

AFFECTED FILES
  mercurial/commands.py
  mercurial/shelve.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-devel

Patch

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:
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(