[PATCH 1 of 5 shelve-ext] shelve: move temporary commit creation to a separate function
Kostia Balytskyi
ikostia at fb.com
Sun Nov 13 11:39:34 UTC 2016
# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1479036952 28800
# Sun Nov 13 03:35:52 2016 -0800
# Node ID 45dbc9a803375958310bced301227b02802372b0
# Parent 2188194ca1ee86953855e0d2fb9396ec18636ed9
shelve: move temporary commit creation to a separate function
Committing working copy changes before rebasing a shelved commit
on top of them is an independent piece of behavior, which fits
into its own function.
Similar to the previous serier, this and a couple of following
patches are for unshelve refactoring.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -631,6 +631,26 @@ def unshelvecontinue(ui, repo, state, op
unshelvecleanup(ui, repo, state.name, opts)
ui.status(_("unshelve of '%s' complete\n") % state.name)
+def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
+ """Temporarily commit working copy changes before moving unshelve commit"""
+ # Store pending changes in a commit and remember added in case a shelve
+ # contains unknown files that are part of the pending change
+ s = repo.status()
+ addedbefore = frozenset(s.added)
+ if not (s.modified or s.added or s.removed or s.deleted):
+ return tmpwctx, addedbefore
+ ui.status(_("temporarily committing pending changes "
+ "(restore with 'hg unshelve --abort')\n"))
+ commitfunc = getcommitfunc(extra=None, interactive=False,
+ editor=False)
+ tempopts = {}
+ tempopts['message'] = "pending changes temporary commit"
+ tempopts['date'] = opts.get('date')
+ ui.quiet = True
+ node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
+ tmpwctx = repo[node]
+ return tmpwctx, addedbefore
+
@command('unshelve',
[('a', 'abort', None,
_('abort an incomplete unshelve operation')),
@@ -753,21 +773,8 @@ def _dounshelve(ui, repo, *shelved, **op
# and shelvectx is the unshelved changes. Then we merge it all down
# to the original pctx.
- # Store pending changes in a commit and remember added in case a shelve
- # contains unknown files that are part of the pending change
- s = repo.status()
- addedbefore = frozenset(s.added)
- if s.modified or s.added or s.removed or s.deleted:
- ui.status(_("temporarily committing pending changes "
- "(restore with 'hg unshelve --abort')\n"))
- commitfunc = getcommitfunc(extra=None, interactive=False,
- editor=False)
- tempopts = {}
- tempopts['message'] = "pending changes temporary commit"
- tempopts['date'] = opts.get('date')
- ui.quiet = True
- node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
- tmpwctx = repo[node]
+ tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts,
+ tmpwctx)
ui.quiet = True
shelvedfile(repo, basename, 'hg').applybundle()
More information about the Mercurial-devel
mailing list