# HG changeset patch # User Pierre-Yves David # Date 2014-08-05 20:51:13 # Node ID 8d99c107b0414f68f5c0add2f642b3d576fedcab # Parent 97f86ce79abefb0b01fde910f7b21223c56ab9ac shelve: use `targetphase` while unbundling This removes the last manual phase movement in shelve. diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -73,7 +73,8 @@ class shelvedfile(object): try: gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs) changegroup.addchangegroup(self.repo, gen, 'unshelve', - 'bundle:' + self.vfs.join(self.fname)) + 'bundle:' + self.vfs.join(self.fname), + targetphase=phases.secret) finally: fp.close() @@ -579,8 +580,6 @@ def unshelve(ui, repo, *shelved, **opts) ui.quiet = True shelvedfile(repo, basename, 'hg').applybundle() - nodes = [ctx.node() for ctx in repo.set('%d:', oldtiprev)] - phases.retractboundary(repo, phases.secret, nodes) ui.quiet = oldquiet