This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6688

unshelve: make basename as a mandatory argument for unshelvecontinue()
AbandonedPublic

Authored by navaneeth.suresh on Jul 24 2019, 8:52 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 24 2019, 10:49 AM

Can you explain in commit description as why this is done?

navaneeth.suresh added a comment.Jul 24 2019, 1:46 PM
In D6688#97859, @pulkit wrote:

Can you explain in commit description as why this is done?

This patch will become obsolete after D6684. Should I abandon this?

pulkit added a comment.Jul 25 2019, 5:24 AM
In D6688#97899, @navaneeth.suresh wrote:
In D6688#97859, @pulkit wrote:

Can you explain in commit description as why this is done?

This patch will become obsolete after D6684. Should I abandon this?

Yes.

navaneeth.suresh abandoned this revision.Jul 25 2019, 8:10 AM

Abandoning since changes in D6679 will make this obsolete.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (2 lines)

Diff 16042

mercurial/shelve.py

def unshelvecleanup(ui, repo, name, opts): def unshelvecleanup(ui, repo, name, opts):
"""remove related files after an unshelve""" """remove related files after an unshelve"""
if not opts.get('keep'): if not opts.get('keep'):
for filetype in shelvefileextensions: for filetype in shelvefileextensions:
shfile = shelvedfile(repo, name, filetype) shfile = shelvedfile(repo, name, filetype)
if shfile.exists(): if shfile.exists():
shfile.movetobackup() shfile.movetobackup()
cleanupoldbackups(repo) cleanupoldbackups(repo)
def unshelvecontinue(ui, repo, state, opts, basename=None): def unshelvecontinue(ui, repo, state, opts, basename):
"""subcommand to continue an in-progress unshelve""" """subcommand to continue an in-progress unshelve"""
# We're finishing off a merge. First parent is our original # We're finishing off a merge. First parent is our original
# parent, second is the temporary "fake" commit we're unshelving. # parent, second is the temporary "fake" commit we're unshelving.
interactive = state.interactive interactive = state.interactive
with repo.lock(): with repo.lock():
checkparents(repo, state) checkparents(repo, state)
ms = merge.mergestate.read(repo) ms = merge.mergestate.read(repo)
if list(ms.unresolved()): if list(ms.unresolved()):