This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6605

unshelve: rename _dounshelve() to dounshelve()
ClosedPublic

Authored by navaneeth.suresh on Jul 4 2019, 1:47 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG70f1a84d0794: unshelve: rename _dounshelve() to dounshelve()
Summary

This is a follow-up patch to 3de4f17f4824.

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

pulkit accepted this revision.Jul 5 2019, 5:59 PM
This revision is now accepted and ready to land.Jul 5 2019, 5:59 PM
navaneeth.suresh added a commit: rHG70f1a84d0794: unshelve: rename _dounshelve() to dounshelve().Jul 7 2019, 9:14 AM
Closed by commit rHG70f1a84d0794: unshelve: rename _dounshelve() to dounshelve() (authored by navaneeth.suresh). · 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 (2 lines)

Diff 15784

mercurial/commands.py

.. container:: verbose .. container:: verbose
Timestamp in seconds is used to decide order of backups. More Timestamp in seconds is used to decide order of backups. More
than ``maxbackups`` backups are kept, if same timestamp than ``maxbackups`` backups are kept, if same timestamp
prevents from deciding exact order of them, for safety. prevents from deciding exact order of them, for safety.
""" """
with repo.wlock(): with repo.wlock():
return shelvemod._dounshelve(ui, repo, *shelved, **opts) return shelvemod.dounshelve(ui, repo, *shelved, **opts)
@command('update|up|checkout|co', @command('update|up|checkout|co',
[('C', 'clean', None, _('discard uncommitted changes (no backup)')), [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
('c', 'check', None, _('require clean working directory')), ('c', 'check', None, _('require clean working directory')),
('m', 'merge', None, _('merge uncommitted changes')), ('m', 'merge', None, _('merge uncommitted changes')),
('d', 'date', '', _('tipmost revision matching date'), _('DATE')), ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
('r', 'rev', '', _('revision'), _('REV')) ('r', 'rev', '', _('revision'), _('REV'))
] + mergetoolopts, ] + mergetoolopts,

mercurial/shelve.py

wcdeleted = set(repo.status().deleted) wcdeleted = set(repo.status().deleted)
shelvetouched = set(shelvectx.files()) shelvetouched = set(shelvectx.files())
intersection = wcdeleted.intersection(shelvetouched) intersection = wcdeleted.intersection(shelvetouched)
if intersection: if intersection:
m = _("shelved change touches missing files") m = _("shelved change touches missing files")
hint = _("run hg status to see which files are missing") hint = _("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 dounshelve(ui, repo, *shelved, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
abortf = opts.get('abort') abortf = opts.get('abort')
continuef = opts.get('continue') continuef = opts.get('continue')
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("name"): if opts.get("name"):
shelved.append(opts["name"]) shelved.append(opts["name"])