##// END OF EJS Templates
shelve: look for shelved node in the repository before unbundling...
Boris Feld -
r39651:c67c94c0 default
parent child Browse files
Show More
@@ -764,9 +764,15 b' def _commitworkingcopychanges(ui, repo, '
764 764 def _unshelverestorecommit(ui, repo, basename):
765 765 """Recreate commit in the repository during the unshelve"""
766 766 repo = repo.unfiltered()
767 with ui.configoverride({('ui', 'quiet'): True}):
768 shelvedfile(repo, basename, 'hg').applybundle()
767 if shelvedfile(repo, basename, 'shelve').exists():
768 node = shelvedfile(repo, basename, 'shelve').readinfo()['node']
769 if node is None or node not in repo:
770 with ui.configoverride({('ui', 'quiet'): True}):
771 shelvedfile(repo, basename, 'hg').applybundle()
769 772 shelvectx = repo['tip']
773 else:
774 shelvectx = repo[node]
775
770 776 return repo, shelvectx
771 777
772 778 def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx,
General Comments 0
You need to be logged in to leave comments. Login now