Show More
@@ -201,13 +201,15 b' def strip(ui, repo, nodelist, backup=Tru' | |||||
201 | if not repo.ui.verbose: |
|
201 | if not repo.ui.verbose: | |
202 | # silence internal shuffling chatter |
|
202 | # silence internal shuffling chatter | |
203 | repo.ui.pushbuffer() |
|
203 | repo.ui.pushbuffer() | |
|
204 | tmpbundleurl = 'bundle:' + vfs.join(tmpbundlefile) | |||
204 | if isinstance(gen, bundle2.unbundle20): |
|
205 | if isinstance(gen, bundle2.unbundle20): | |
205 | with repo.transaction('strip') as tr: |
|
206 | with repo.transaction('strip') as tr: | |
206 | bundle2.applybundle(repo, gen, tr, source='strip', |
|
207 | bundle2.applybundle(repo, gen, tr, source='strip', | |
207 |
url= |
|
208 | url=tmpbundleurl) | |
208 | else: |
|
209 | else: | |
209 | gen.apply(repo, 'strip', 'bundle:' + vfs.join(tmpbundlefile), |
|
210 | txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) | |
210 | True) |
|
211 | with repo.transaction(txnname): | |
|
212 | gen.apply(repo, 'strip', tmpbundleurl, True) | |||
211 | if not repo.ui.verbose: |
|
213 | if not repo.ui.verbose: | |
212 | repo.ui.popbuffer() |
|
214 | repo.ui.popbuffer() | |
213 | f.close() |
|
215 | f.close() |
General Comments 0
You need to be logged in to leave comments.
Login now