This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6683

unshelve: unify logic around creating an unshelve changeset
ClosedPublic

Authored by navaneeth.suresh on Jul 23 2019, 11:39 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc9114885c14b: unshelve: unify logic around creating an unshelve changeset
Summary

This is a follow-up patch to 5162753c4c14 on addressing reviews
on the commit. This unifies the logic around creating an unshelve
changeset.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 24 2019, 4:52 AM

This patch does following things:

  1. unify logic around creating unshelvectx
  2. changes how date is set in iteractive mode
  3. handles stripping in interavtive mode
  4. compute a matcher only if it's required
  5. and a change around making basename madatory argument

Can we have them in separate patches?

navaneeth.suresh retitled this revision from unshelve: fixes on interactive mode to unshelve: unify logic around creating an unshelve changeset.Jul 24 2019, 8:39 AM
navaneeth.suresh edited the summary of this revision. (Show Details)
navaneeth.suresh updated this revision to Diff 16038.
navaneeth.suresh added a comment.Jul 24 2019, 8:56 AM
In D6683#97731, @pulkit wrote:

This patch does following things:

  1. unify logic around creating unshelvectx
  2. changes how date is set in iteractive mode
  3. handles stripping in interavtive mode
  4. compute a matcher only if it's required
  5. and a change around making basename madatory argument

Can we have them in separate patches?

Done.

pulkit added inline comments.Jul 26 2019, 10:37 AM
mercurial/shelve.py
813

How about:

Handles creation of unshelve commit and updating the shelve if it was partially unshelved.

If interactive is:

  * false: commit all the changes in working directory.
  * true: prompts user to select changes to unshelve and commit them. Update the shelve with remaining changes.

Returns the node of the new commit formed and a bool indicating whether the shelve was partially unshelved.
navaneeth.suresh added inline comments.Jul 26 2019, 11:24 AM
mercurial/shelve.py
813

Awesome! Amending that right away.

pulkit accepted this revision.Jul 29 2019, 5:43 AM
This revision is now accepted and ready to land.Jul 29 2019, 5:43 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (53 lines)

Diff 16025

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.shelvedinteractively interactive = state.shelvedinteractively
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()):
targetphase = phases.internal targetphase = phases.internal
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
targetphase = phases.secret targetphase = phases.secret
overrides = {('phases', 'new-commit'): targetphase} overrides = {('phases', 'new-commit'): targetphase}
with repo.ui.configoverride(overrides, 'unshelve'): with repo.ui.configoverride(overrides, 'unshelve'):
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(state.parents[0], nodemod.nullid) repo.setparents(state.parents[0], nodemod.nullid)
if not interactive: newnode, ispartialunshelve = _createunshelvectx(ui,
ispartialunshelve = False repo, shelvectx, basename, interactive, opts)
newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(),
user=shelvectx.user(),
date=shelvectx.date())
else:
newnode, ispartialunshelve = _dounshelveinteractive(ui,
repo, shelvectx, basename, opts)
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal # If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it # merge state clean-up path doesn't happen, so do it
# here. Fix issue5494 # here. Fix issue5494
merge.mergestate.clean(repo) merge.mergestate.clean(repo)
shelvectx = state.pendingctx shelvectx = state.pendingctx
msg = _('note: unshelved changes already existed ' msg = _('note: unshelved changes already existed '
'in the working copy\n') 'in the working copy\n')
ui.status(msg) ui.status(msg)
else: else:
# only strip the shelvectx if we produced one # only strip the shelvectx if we produced one
state.nodestoremove.append(newnode) state.nodestoremove.append(newnode)
shelvectx = repo[newnode] shelvectx = repo[newnode]
hg.updaterepo(repo, pendingctx.node(), overwrite=False) hg.updaterepo(repo, pendingctx.node(), overwrite=False)
mergefiles(ui, repo, state.wctx, shelvectx) mergefiles(ui, repo, state.wctx, shelvectx)
restorebranch(ui, repo, state.branchtorestore) restorebranch(ui, repo, state.branchtorestore)
if not ispartialunshelve:
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
if not ispartialunshelve:
shelvedstate.clear(repo) shelvedstate.clear(repo)
unshelvecleanup(ui, repo, state.name, opts) unshelvecleanup(ui, repo, state.name, opts)
_restoreactivebookmark(repo, state.activebookmark) _restoreactivebookmark(repo, state.activebookmark)
ui.status(_("unshelve of '%s' complete\n") % state.name) ui.status(_("unshelve of '%s' complete\n") % state.name)
def hgcontinueunshelve(ui, repo): def hgcontinueunshelve(ui, repo):
"""logic to resume unshelve using 'hg continue'""" """logic to resume unshelve using 'hg continue'"""
with repo.wlock(): with repo.wlock():
if node is None: if node is None:
info = {'node': nodemod.hex(shelvectx.node())} info = {'node': nodemod.hex(shelvectx.node())}
shelvedfile(repo, basename, 'shelve').writeinfo(info) shelvedfile(repo, basename, 'shelve').writeinfo(info)
else: else:
shelvectx = repo[node] shelvectx = repo[node]
return repo, shelvectx return repo, shelvectx
def _dounshelveinteractive(ui, repo, shelvectx, basename, opts): def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts):
"""The user might want to unshelve certain changes only from the stored """Creates a commit ctx to unshelve interactively or non-interactively.
shelve. So, we would create two commits. One with requested changes to The user might want to unshelve certain changes only from the stored
unshelve at that time and the latter is shelved for future. shelve in interactive. So, we would create two commits. One with requested
changes to unshelve at that time and the latter is shelved for future.
Here, we return both the newnode which is created interactively and a
bool to know whether the shelve is partly done or completely done.
pulkitUnsubmitted
Not Done

How about:

Handles creation of unshelve commit and updating the shelve if it was partially unshelved.

If interactive is:

  * false: commit all the changes in working directory.
  * true: prompts user to select changes to unshelve and commit them. Update the shelve with remaining changes.

Returns the node of the new commit formed and a bool indicating whether the shelve was partially unshelved.
pulkit: How about: ``` Handles creation of unshelve commit and updating the shelve if it was partially…
navaneeth.sureshAuthorUnsubmitted
Done

Awesome! Amending that right away.

navaneeth.suresh: Awesome! Amending that right away.
""" """
opts['message'] = shelvectx.description() opts['message'] = shelvectx.description()
opts['interactive-unshelve'] = True opts['interactive-unshelve'] = True
pats = [] pats = []
if not interactive:
newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(),
user=shelvectx.user(),
date=shelvectx.date())
return newnode, False
commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, commitfunc = getcommitfunc(shelvectx.extra(), interactive=True,
editor=True) editor=True)
newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False, newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False,
cmdutil.recordfilter, *pats, cmdutil.recordfilter, *pats,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
snode = repo.commit(text=shelvectx.description(), snode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(), extra=shelvectx.extra(),
user=shelvectx.user(), user=shelvectx.user(),
date=shelvectx.date()) date=opts.get('date'))
m = scmutil.matchfiles(repo, repo[snode].files())
if snode: if snode:
m = scmutil.matchfiles(repo, repo[snode].files())
_shelvecreatedcommit(repo, snode, basename, m) _shelvecreatedcommit(repo, snode, basename, m)
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"""
branchtorestore, opts.get('keep'), activebookmark, branchtorestore, opts.get('keep'), activebookmark,
shelvedinteractively=interactive) shelvedinteractively=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)
if not interactive: newnode, ispartialunshelve = _createunshelvectx(ui, repo,
ispartialunshelve = False shelvectx, basename, interactive, opts)
newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(),
user=shelvectx.user(),
date=shelvectx.date())
else:
newnode, ispartialunshelve = _dounshelveinteractive(ui, repo,
shelvectx, basename, opts)
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal # If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it # merge state clean-up path doesn't happen, so do it
# here. Fix issue5494 # here. Fix issue5494
merge.mergestate.clean(repo) merge.mergestate.clean(repo)
shelvectx = tmpwctx shelvectx = tmpwctx
msg = _('note: unshelved changes already existed ' msg = _('note: unshelved changes already existed '