##// END OF EJS Templates
with: use context manager for transaction in strip
Bryan O'Sullivan -
r27875:add2ba16 default
parent child Browse files
Show More
@@ -185,15 +185,11 b' def strip(ui, repo, nodelist, backup=Tru'
185 # silence internal shuffling chatter
185 # silence internal shuffling chatter
186 repo.ui.pushbuffer()
186 repo.ui.pushbuffer()
187 if isinstance(gen, bundle2.unbundle20):
187 if isinstance(gen, bundle2.unbundle20):
188 tr = repo.transaction('strip')
188 with repo.transaction('strip') as tr:
189 tr.hookargs = {'source': 'strip',
189 tr.hookargs = {'source': 'strip',
190 'url': 'bundle:' + vfs.join(chgrpfile)}
190 'url': 'bundle:' + vfs.join(chgrpfile)}
191 try:
192 bundle2.applybundle(repo, gen, tr, source='strip',
191 bundle2.applybundle(repo, gen, tr, source='strip',
193 url='bundle:' + vfs.join(chgrpfile))
192 url='bundle:' + vfs.join(chgrpfile))
194 tr.close()
195 finally:
196 tr.release()
197 else:
193 else:
198 gen.apply(repo, 'strip', 'bundle:' + vfs.join(chgrpfile), True)
194 gen.apply(repo, 'strip', 'bundle:' + vfs.join(chgrpfile), True)
199 if not repo.ui.verbose:
195 if not repo.ui.verbose:
General Comments 0
You need to be logged in to leave comments. Login now