This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6679

unshelve: store information about interactive mode in shelvedstate
ClosedPublic

Authored by navaneeth.suresh on Jul 23 2019, 3:32 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGee86ad6f50fe: unshelve: store information about interactive mode in shelvedstate
Summary

This is a follow-up patch to 5162753c4c14. This makes unshelve
stores the information about interactive mode on conflicts.

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 added a subscriber: pulkit.Jul 24 2019, 4:57 AM
pulkit added inline comments.
mercurial/shelve.py
181

We are already in shelve code, so no need to prepend shelved to the name.

Also, we can only had interactive stored in the shelved state. If it's not present in the state file, we can assume we were not running interactive unshelve.

856

unrequired change.

945

This change is unrelated to storing info about interactive in shelvedstate. Can you decouple this into a separate patch?

navaneeth.suresh marked 3 inline comments as done.Jul 24 2019, 8:06 AM
navaneeth.suresh added inline comments.
mercurial/shelve.py
945

Doing that right away!

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

The above comment is not done.

I meant, we don't need _noninteractive.

navaneeth.suresh marked an inline comment as done.Jul 24 2019, 1:20 PM
navaneeth.suresh updated this revision to Diff 16054.
navaneeth.suresh marked an inline comment as done.Jul 24 2019, 1:20 PM
navaneeth.suresh added inline comments.
mercurial/shelve.py
181

Done.

navaneeth.suresh marked an inline comment as done.Jul 24 2019, 1:35 PM
navaneeth.suresh updated this revision to Diff 16055.
pulkit accepted this revision.Jul 25 2019, 8:47 AM
This revision is now accepted and ready to land.Jul 25 2019, 8:47 AM
pulkit requested changes to this revision.Jul 29 2019, 5:50 AM
This revision now requires changes to proceed.Jul 29 2019, 5:50 AM
pulkit accepted this revision.Jul 29 2019, 5:50 AM
This revision is now accepted and ready to land.Jul 29 2019, 5:50 AM
yuja added a subscriber: yuja.Jul 29 2019, 9:21 AM

@@ -936,7 +942,7 @@

if opts.get("name"):
    shelved.append(opts["name"])
  • if abortf or continuef and not interactive:

+ if abortf or continuef:

mercurial/shelve.py:938: local variable 'interactive' is assigned to but never used

Maybe --continue --interactive has to be banned if the mode can't be
overridden by the command option.

navaneeth.suresh added a comment.Jul 30 2019, 12:10 PM

mercurial/shelve.py:938: local variable 'interactive' is assigned to but never used
Maybe --continue --interactive has to be banned if the mode can't be
overridden by the command option.

Noted. Created D6703. Thanks!

Revision Contents
Changeset List

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

Diff 16093

mercurial/shelve.py

versions of a shelved state are possible and handles them appropriately. versions of a shelved state are possible and handles them appropriately.
""" """
_version = 2 _version = 2
_filename = 'shelvedstate' _filename = 'shelvedstate'
_keep = 'keep' _keep = 'keep'
_nokeep = 'nokeep' _nokeep = 'nokeep'
# colon is essential to differentiate from a real bookmark name # colon is essential to differentiate from a real bookmark name
_noactivebook = ':no-active-bookmark' _noactivebook = ':no-active-bookmark'
_interactive = 'interactive'
pulkitUnsubmitted
Done

We are already in shelve code, so no need to prepend shelved to the name.

Also, we can only had interactive stored in the shelved state. If it's not present in the state file, we can assume we were not running interactive unshelve.

pulkit: We are already in shelve code, so no need to prepend shelved to the name. Also, we can only…
pulkitUnsubmitted
Done

The above comment is not done.

I meant, we don't need _noninteractive.

pulkit: The above comment is not done. I meant, we don't need _noninteractive.
navaneeth.sureshAuthorUnsubmitted
Done

Done.

navaneeth.suresh: Done.
@classmethod @classmethod
def _verifyandtransform(cls, d): def _verifyandtransform(cls, d):
"""Some basic shelvestate syntactic verification and transformation""" """Some basic shelvestate syntactic verification and transformation"""
try: try:
d['originalwctx'] = nodemod.bin(d['originalwctx']) d['originalwctx'] = nodemod.bin(d['originalwctx'])
d['pendingctx'] = nodemod.bin(d['pendingctx']) d['pendingctx'] = nodemod.bin(d['pendingctx'])
d['parents'] = [nodemod.bin(h) d['parents'] = [nodemod.bin(h)
for h in d['parents'].split(' ')] for h in d['parents'].split(' ')]
obj.pendingctx = repo[d['pendingctx']] obj.pendingctx = repo[d['pendingctx']]
obj.parents = d['parents'] obj.parents = d['parents']
obj.nodestoremove = d['nodestoremove'] obj.nodestoremove = d['nodestoremove']
obj.branchtorestore = d.get('branchtorestore', '') obj.branchtorestore = d.get('branchtorestore', '')
obj.keep = d.get('keep') == cls._keep obj.keep = d.get('keep') == cls._keep
obj.activebookmark = '' obj.activebookmark = ''
if d.get('activebook', '') != cls._noactivebook: if d.get('activebook', '') != cls._noactivebook:
obj.activebookmark = d.get('activebook', '') obj.activebookmark = d.get('activebook', '')
obj.interactive = d.get('interactive') == cls._interactive
except (error.RepoLookupError, KeyError) as err: except (error.RepoLookupError, KeyError) as err:
raise error.CorruptedState(pycompat.bytestr(err)) raise error.CorruptedState(pycompat.bytestr(err))
return obj return obj
@classmethod @classmethod
def save(cls, repo, name, originalwctx, pendingctx, nodestoremove, def save(cls, repo, name, originalwctx, pendingctx, nodestoremove,
branchtorestore, keep=False, activebook=''): branchtorestore, keep=False, activebook='', interactive=False):
info = { info = {
"name": name, "name": name,
"originalwctx": nodemod.hex(originalwctx.node()), "originalwctx": nodemod.hex(originalwctx.node()),
"pendingctx": nodemod.hex(pendingctx.node()), "pendingctx": nodemod.hex(pendingctx.node()),
"parents": ' '.join([nodemod.hex(p) "parents": ' '.join([nodemod.hex(p)
for p in repo.dirstate.parents()]), for p in repo.dirstate.parents()]),
"nodestoremove": ' '.join([nodemod.hex(n) "nodestoremove": ' '.join([nodemod.hex(n)
for n in nodestoremove]), for n in nodestoremove]),
"branchtorestore": branchtorestore, "branchtorestore": branchtorestore,
"keep": cls._keep if keep else cls._nokeep, "keep": cls._keep if keep else cls._nokeep,
"activebook": activebook or cls._noactivebook "activebook": activebook or cls._noactivebook
} }
if interactive:
info['interactive'] = cls._interactive
scmutil.simplekeyvaluefile( scmutil.simplekeyvaluefile(
repo.vfs, cls._filename).write(info, repo.vfs, cls._filename).write(info,
firstline=("%d" % cls._version)) firstline=("%d" % cls._version))
@classmethod @classmethod
def clear(cls, repo): def clear(cls, repo):
repo.vfs.unlinkpath(cls._filename, ignoremissing=True) repo.vfs.unlinkpath(cls._filename, ignoremissing=True)
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 = opts.get('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'"))
return newnode, bool(snode) return newnode, bool(snode)
def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx, def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx,
tmpwctx, shelvectx, branchtorestore, tmpwctx, shelvectx, branchtorestore,
activebookmark): activebookmark):
"""Rebase restored commit from its original location to a destination""" """Rebase restored commit from its original location to a destination"""
# If the shelve is not immediately on top of the commit # If the shelve is not immediately on top of the commit
# we'll be merging with, rebase it to be on top. # we'll be merging with, rebase it to be on top.
interactive = opts.get('interactive') interactive = opts.get('interactive')
pulkitUnsubmitted
Done

unrequired change.

pulkit: unrequired change.
if tmpwctx.node() == shelvectx.p1().node() and not interactive: if tmpwctx.node() == shelvectx.p1().node() and not interactive:
# We won't skip on interactive mode because, the user might want to # We won't skip on interactive mode because, the user might want to
# unshelve certain changes only. # unshelve certain changes only.
return shelvectx, False return shelvectx, False
overrides = { overrides = {
('ui', 'forcemerge'): opts.get('tool', ''), ('ui', 'forcemerge'): opts.get('tool', ''),
('phases', 'new-commit'): phases.secret, ('phases', 'new-commit'): phases.secret,
} }
with repo.ui.configoverride(overrides, 'unshelve'): with repo.ui.configoverride(overrides, 'unshelve'):
ui.status(_('rebasing shelved changes\n')) ui.status(_('rebasing shelved changes\n'))
stats = merge.graft(repo, shelvectx, shelvectx.p1(), stats = merge.graft(repo, shelvectx, shelvectx.p1(),
labels=['shelve', 'working-copy'], labels=['shelve', 'working-copy'],
keepconflictparent=True) keepconflictparent=True)
if stats.unresolvedcount: if stats.unresolvedcount:
tr.close() tr.close()
nodestoremove = [repo.changelog.node(rev) nodestoremove = [repo.changelog.node(rev)
for rev in pycompat.xrange(oldtiprev, len(repo))] for rev in pycompat.xrange(oldtiprev, len(repo))]
shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove, shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,
branchtorestore, opts.get('keep'), activebookmark) branchtorestore, opts.get('keep'), activebookmark,
interactive)
raise error.InterventionRequired( raise error.InterventionRequired(
_("unresolved conflicts (see 'hg resolve', then " _("unresolved conflicts (see 'hg resolve', then "
"'hg unshelve --continue')")) "'hg unshelve --continue')"))
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(tmpwctx.node(), nodemod.nullid) repo.setparents(tmpwctx.node(), nodemod.nullid)
newnode, ispartialunshelve = _createunshelvectx(ui, repo, newnode, ispartialunshelve = _createunshelvectx(ui, repo,
shelvectx, basename, interactive, opts) shelvectx, basename, interactive, opts)
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:
pulkitUnsubmitted
Done

This change is unrelated to storing info about interactive in shelvedstate. Can you decouple this into a separate patch?

pulkit: This change is unrelated to storing info about interactive in shelvedstate. Can you decouple…
navaneeth.sureshAuthorUnsubmitted
Done

Doing that right away!

navaneeth.suresh: Doing that right away!
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 shelved:
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)
elif len(shelved) > 1: elif 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]
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
> 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