equal
deleted
inserted
replaced
212 bundle2.applybundle(repo, gen, tr, source='strip', |
212 bundle2.applybundle(repo, gen, tr, source='strip', |
213 url=tmpbundleurl) |
213 url=tmpbundleurl) |
214 else: |
214 else: |
215 txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) |
215 txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) |
216 with repo.transaction(txnname) as tr: |
216 with repo.transaction(txnname) as tr: |
217 gen.apply(repo, tr, 'strip', tmpbundleurl, True) |
217 bundle2.applybundle1(repo, gen, tr, 'strip', tmpbundleurl, |
|
218 emptyok=True) |
218 if not repo.ui.verbose: |
219 if not repo.ui.verbose: |
219 repo.ui.popbuffer() |
220 repo.ui.popbuffer() |
220 f.close() |
221 f.close() |
221 repo._phasecache.invalidate() |
222 repo._phasecache.invalidate() |
222 |
223 |