This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8322

shelve: split up dounshelve() in unshelvecmd() and _dounshelve()
ClosedPublic

Authored by martinvonz on Mar 23 2020, 6:27 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG47c1226463a1: shelve: split up dounshelve() in unshelvecmd() and _dounshelve()
Summary

I'd like to be able to override the new _dounshelve(), getting
access to the name of the shelve to unshelve. unshelvecmd() seems to
better match the existing createcmd(), listcmd() etc.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 23 2020, 6:27 PM
Alphare accepted this revision.Mar 25 2020, 1:43 PM
martinvonz added a commit: rHG47c1226463a1: shelve: split up dounshelve() in unshelvecmd() and _dounshelve().Mar 25 2020, 4:31 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG47c1226463a1: shelve: split up dounshelve() in unshelvecmd() and _dounshelve() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mmercurial/shelve.py (6 lines)

Diff 20878

mercurial/commands.py

The working directory is updated with the selected changes, and The working directory is updated with the selected changes, and
only the unselected changes remain shelved. only the unselected changes remain shelved.
Note: The whole shelve is applied to working directory first before Note: The whole shelve is applied to working directory first before
running interactively. So, this will bring up all the conflicts between running interactively. So, this will bring up all the conflicts between
working directory and the shelve, irrespective of which changes will be working directory and the shelve, irrespective of which changes will be
unshelved. unshelved.
""" """
with repo.wlock(): with repo.wlock():
return shelvemod.dounshelve(ui, repo, *shelved, **opts) return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
statemod.addunfinished( statemod.addunfinished(
b'unshelve', b'unshelve',
fname=b'shelvedstate', fname=b'shelvedstate',
continueflag=True, continueflag=True,
abortfunc=shelvemod.hgabortunshelve, abortfunc=shelvemod.hgabortunshelve,
continuefunc=shelvemod.hgcontinueunshelve, continuefunc=shelvemod.hgcontinueunshelve,

mercurial/shelve.py

shelvetouched = set(shelvectx.files()) shelvetouched = set(shelvectx.files())
intersection = wcdeleted.intersection(shelvetouched) intersection = wcdeleted.intersection(shelvetouched)
if intersection: if intersection:
m = _(b"shelved change touches missing files") m = _(b"shelved change touches missing files")
hint = _(b"run hg status to see which files are missing") hint = _(b"run hg status to see which files are missing")
raise error.Abort(m, hint=hint) raise error.Abort(m, hint=hint)
def dounshelve(ui, repo, *shelved, **opts): def unshelvecmd(ui, repo, *shelved, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
abortf = opts.get(b'abort') abortf = opts.get(b'abort')
continuef = opts.get(b'continue') continuef = opts.get(b'continue')
interactive = opts.get(b'interactive') interactive = opts.get(b'interactive')
if not abortf and not continuef: if not abortf and not continuef:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
shelved = list(shelved) shelved = list(shelved)
if opts.get(b"name"): if opts.get(b"name"):
basename = util.split(shelved[0][1])[1] basename = util.split(shelved[0][1])[1]
ui.status(_(b"unshelving change '%s'\n") % basename) ui.status(_(b"unshelving change '%s'\n") % basename)
else: else:
basename = shelved[0] basename = shelved[0]
if not shelvedfile(repo, basename, patchextension).exists(): if not shelvedfile(repo, basename, patchextension).exists():
raise error.Abort(_(b"shelved change '%s' not found") % basename) 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() repo = repo.unfiltered()
lock = tr = None lock = tr = None
try: try:
lock = repo.lock() lock = repo.lock()
tr = repo.transaction(b'unshelve', report=lambda x: None) tr = repo.transaction(b'unshelve', report=lambda x: None)
oldtiprev = len(repo) oldtiprev = len(repo)
pctx = repo[b'.'] pctx = repo[b'.']