This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6684

unshelve: modify --continue on interactive unshelve
AbandonedPublic

Authored by pulkit on Jul 24 2019, 8:14 AM.

Details

Reviewers
navaneeth.suresh
Group Reviewers
hg-reviewers
Summary

shelvedstate should store info about interactive mode after D6679.
This patch modifies the behavior of hg unshelve --continue after
an unshelve on interactive mode to get the basename from the
shelvedstate.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 24 2019, 10:06 AM
pulkit added inline comments.
tests/test-shelve.t
1354

This test change should be in the parent differential.

pulkit added inline comments.Jul 24 2019, 10:54 AM
mercurial/shelve.py
949

Now I understand how this and the parent patches are arranged.

Why don't be have all the logic related to interactive in unshelvecontinue, including getting the name of the shelve we are processing.

Right now, we are getting name of top most shelve, however we should read the shelvedstate and get the name from there.

navaneeth.suresh added inline comments.Jul 24 2019, 1:28 PM
mercurial/shelve.py
949

Doing that right away!

navaneeth.suresh edited the summary of this revision. (Show Details)Jul 24 2019, 1:43 PM
navaneeth.suresh updated this revision to Diff 16056.
navaneeth.suresh edited the summary of this revision. (Show Details)Jul 24 2019, 2:02 PM
navaneeth.suresh updated this revision to Diff 16058.
navaneeth.suresh marked an inline comment as done.Jul 24 2019, 2:04 PM
pulkit added a comment.Jul 25 2019, 5:28 AM

Sorry for getting this and the parent patch split before, after the recent improvements, it looks like they should be folded into one.

navaneeth.suresh added a comment.Jul 25 2019, 8:41 AM
In D6684#97930, @pulkit wrote:

Sorry for getting this and the parent patch split before, after the recent improvements, it looks like they should be folded into one.

Cool. Changes from this patch is folded to affect in D6679. Abandoning this.

pulkit added a reviewer: navaneeth.suresh.Jul 25 2019, 8:46 AM
pulkit commandeered this revision.
pulkit abandoned this revision.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (17 lines)
Mtests/test-shelve.t (3 lines)

Diff 16056

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):
"""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
basename = state.name
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()):
raise error.Abort( raise error.Abort(
_("unresolved conflicts, can't continue"), _("unresolved conflicts, can't continue"),
hint=_("see 'hg resolve', then 'hg unshelve --continue'")) hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
continuef = opts.get('continue') continuef = opts.get('continue')
interactive = opts.get('interactive') interactive = opts.get('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("name"): if opts.get("name"):
shelved.append(opts["name"]) shelved.append(opts["name"])
if abortf or continuef and not interactive: if abortf or continuef:
if abortf and continuef: if abortf and continuef:
raise error.Abort(_('cannot use both abort and continue')) raise error.Abort(_('cannot use both abort and continue'))
if shelved: if opts.get("name"):
raise error.Abort(_('cannot combine abort/continue with ' raise error.Abort(_('cannot combine abort/continue with '
'naming a shelved change')) 'naming a shelved change'))
if abortf and opts.get('tool', False): if abortf and opts.get('tool', False):
ui.warn(_('tool option will be ignored\n')) ui.warn(_('tool option will be ignored\n'))
state = _loadshelvedstate(ui, repo, opts) state = _loadshelvedstate(ui, repo, opts)
if abortf: if abortf:
return unshelveabort(ui, repo, state) return unshelveabort(ui, repo, state)
elif continuef: elif continuef:
return unshelvecontinue(ui, repo, state, opts) return unshelvecontinue(ui, repo, state, opts)
pulkitAuthorUnsubmitted
Done

Now I understand how this and the parent patches are arranged.

Why don't be have all the logic related to interactive in unshelvecontinue, including getting the name of the shelve we are processing.

Right now, we are getting name of top most shelve, however we should read the shelvedstate and get the name from there.

pulkit: Now I understand how this and the parent patches are arranged. Why don't be have all the logic…
navaneeth.sureshUnsubmitted
Done

Doing that right away!

navaneeth.suresh: Doing that right away!
elif len(shelved) > 1: if len(shelved) > 1:
raise error.Abort(_('can only unshelve one change at a time')) raise error.Abort(_('can only unshelve one change at a time'))
elif not shelved: elif not shelved:
shelved = listshelves(repo) shelved = listshelves(repo)
if not shelved: if not shelved:
raise error.Abort(_('no shelved changes to apply!')) raise error.Abort(_('no shelved changes to apply!'))
basename = util.split(shelved[0][1])[1] basename = util.split(shelved[0][1])[1]
if not (abortf or continuef):
ui.status(_("unshelving change '%s'\n") % basename) ui.status(_("unshelving change '%s'\n") % basename)
elif shelved: else:
basename = shelved[0] basename = shelved[0]
if continuef and interactive:
state = _loadshelvedstate(ui, repo, opts)
return unshelvecontinue(ui, repo, state, opts, basename)
if not shelvedfile(repo, basename, patchextension).exists(): if not shelvedfile(repo, basename, patchextension).exists():
raise error.Abort(_("shelved change '%s' not found") % basename) raise error.Abort(_("shelved change '%s' not found") % basename)
repo = repo.unfiltered() repo = repo.unfiltered()
lock = tr = None lock = tr = None
try: try:
lock = repo.lock() lock = repo.lock()

tests/test-shelve.t

> EOF > EOF
$ hg resolve -m bar1 bar2 $ hg resolve -m bar1 bar2
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ cat bar1 $ cat bar1
A A
B B
C C
$ hg unshelve --continue -i <<EOF $ hg unshelve --continue <<EOF
pulkitAuthorUnsubmitted
Not Done

This test change should be in the parent differential.

pulkit: This test change should be in the parent differential.
> y > y
> y > y
> y > y
> y > y
> EOF > EOF
unshelving change 'default-01'
diff --git a/bar1 b/bar1 diff --git a/bar1 b/bar1
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'bar1'? examine changes to 'bar1'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
A A
+B +B