##// END OF EJS Templates
shelve: use `targetphase` while unbundling...
Pierre-Yves David -
r22042:8d99c107 default
parent child Browse files
Show More
@@ -73,7 +73,8 b' class shelvedfile(object):'
73 try:
73 try:
74 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
74 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
75 changegroup.addchangegroup(self.repo, gen, 'unshelve',
75 changegroup.addchangegroup(self.repo, gen, 'unshelve',
76 'bundle:' + self.vfs.join(self.fname))
76 'bundle:' + self.vfs.join(self.fname),
77 targetphase=phases.secret)
77 finally:
78 finally:
78 fp.close()
79 fp.close()
79
80
@@ -579,8 +580,6 b' def unshelve(ui, repo, *shelved, **opts)'
579
580
580 ui.quiet = True
581 ui.quiet = True
581 shelvedfile(repo, basename, 'hg').applybundle()
582 shelvedfile(repo, basename, 'hg').applybundle()
582 nodes = [ctx.node() for ctx in repo.set('%d:', oldtiprev)]
583 phases.retractboundary(repo, phases.secret, nodes)
584
583
585 ui.quiet = oldquiet
584 ui.quiet = oldquiet
586
585
General Comments 0
You need to be logged in to leave comments. Login now