equal
deleted
inserted
replaced
202 if not repo.ui.verbose: |
202 if not repo.ui.verbose: |
203 # silence internal shuffling chatter |
203 # silence internal shuffling chatter |
204 repo.ui.pushbuffer() |
204 repo.ui.pushbuffer() |
205 if isinstance(gen, bundle2.unbundle20): |
205 if isinstance(gen, bundle2.unbundle20): |
206 with repo.transaction('strip') as tr: |
206 with repo.transaction('strip') as tr: |
207 tr.hookargs = {'source': 'strip', |
|
208 'url': 'bundle:' + vfs.join(tmpbundlefile)} |
|
209 bundle2.applybundle(repo, gen, tr, source='strip', |
207 bundle2.applybundle(repo, gen, tr, source='strip', |
210 url='bundle:' + vfs.join(tmpbundlefile)) |
208 url='bundle:' + vfs.join(tmpbundlefile)) |
211 else: |
209 else: |
212 gen.apply(repo, 'strip', 'bundle:' + vfs.join(tmpbundlefile), |
210 gen.apply(repo, 'strip', 'bundle:' + vfs.join(tmpbundlefile), |
213 True) |
211 True) |