[PATCH shelve-ext] shelve: make --keep option survive user intevention (issue5431)
Kostia Balytskyi
ikostia at fb.com
Wed Nov 23 18:51:47 UTC 2016
# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1479926825 28800
# Wed Nov 23 10:47:05 2016 -0800
# Node ID 90b1e0d3e7daaf489428e0b9028cd7b32f37ea70
# Parent db897ddf3a8ebb8df9556ce97de11f6380a9ef0b
shelve: make --keep option survive user intevention (issue5431)
Currently if user runs 'hg unshelve --keep' and merge conflicts
occur, the information about --keep provided by user is lost and
shelf is deleted after 'hg unshelve --continue'. This is obviously
not desired, so this patch fixes it.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -159,6 +159,8 @@ class shelvedstate(object):
"""
_version = 1
_filename = 'shelvedstate'
+ _keep = 'keep'
+ _nokeep = 'nokeep'
@classmethod
def load(cls, repo):
@@ -175,6 +177,7 @@ class shelvedstate(object):
parents = [nodemod.bin(h) for h in fp.readline().split()]
stripnodes = [nodemod.bin(h) for h in fp.readline().split()]
branchtorestore = fp.readline().strip()
+ keep = fp.readline().strip() == cls._keep
except (ValueError, TypeError) as err:
raise error.CorruptedState(str(err))
finally:
@@ -188,6 +191,7 @@ class shelvedstate(object):
obj.parents = parents
obj.stripnodes = stripnodes
obj.branchtorestore = branchtorestore
+ obj.keep = keep
except error.RepoLookupError as err:
raise error.CorruptedState(str(err))
@@ -195,7 +199,7 @@ class shelvedstate(object):
@classmethod
def save(cls, repo, name, originalwctx, pendingctx, stripnodes,
- branchtorestore):
+ branchtorestore, keep=False):
fp = repo.vfs(cls._filename, 'wb')
fp.write('%i\n' % cls._version)
fp.write('%s\n' % name)
@@ -206,6 +210,7 @@ class shelvedstate(object):
fp.write('%s\n' %
' '.join([nodemod.hex(n) for n in stripnodes]))
fp.write('%s\n' % branchtorestore)
+ fp.write('%s\n' % (cls._keep if keep else cls._nokeep))
fp.close()
@classmethod
@@ -680,7 +685,7 @@ def _rebaserestoredcommit(ui, repo, opts
stripnodes = [repo.changelog.node(rev)
for rev in xrange(oldtiprev, len(repo))]
shelvedstate.save(repo, basename, pctx, tmpwctx, stripnodes,
- branchtorestore)
+ branchtorestore, opts.get('keep'))
util.rename(repo.join('rebasestate'),
repo.join('unshelverebasestate'))
@@ -782,6 +787,7 @@ def _dounshelve(ui, repo, *shelved, **op
try:
state = shelvedstate.load(repo)
+ opts['keep'] = opts.get('keep') or state.keep
except IOError as err:
if err.errno != errno.ENOENT:
raise
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1622,3 +1622,31 @@ progress
abort: no unshelve in progress
[255]
$ cd ..
+
+Unshelve respects --keep even if user intervention is needed
+ $ hg init unshelvekeep
+ $ echo 1 > file && hg ci -Am 1
+ adding file
+ $ echo 2 >> file
+ $ hg shelve
+ shelved as default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ echo 3 >> file && hg ci -Am 13
+ $ hg shelve --list
+ default (1s ago) changes to: 1
+ $ hg unshelve --keep
+ unshelving change 'default'
+ rebasing shelved changes
+ rebasing 3:1d24e58054c8 "changes to: 1" (tip)
+ merging file
+ warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
+ unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
+ [1]
+ $ hg resolve --mark file
+ (no more unresolved files)
+ continue: hg unshelve --continue
+ $ hg unshelve --continue
+ rebasing 3:1d24e58054c8 "changes to: 1" (tip)
+ unshelve of 'default' complete
+ $ hg shelve --list
+ default (1s ago) changes to: 1
More information about the Mercurial-devel
mailing list