Mercurial > hg
comparison hgext/narrow/narrowcommands.py @ 41760:1eb2fc21da12
cleanup: prefer nested context managers to \-continuations
I'd prefer Python accept a tuple of context managers, but alas it
isn't meant to be. This will have to suffice.
Differential Revision: https://phab.mercurial-scm.org/D5994
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 20 Feb 2019 18:02:28 -0500 |
parents | ebbc4e70ebd1 |
children | 6cad258e1348 |
comparison
equal
deleted
inserted
replaced
41759:aaad36b88298 | 41760:1eb2fc21da12 |
---|---|
276 if ellipsesremote: | 276 if ellipsesremote: |
277 ds = repo.dirstate | 277 ds = repo.dirstate |
278 p1, p2 = ds.p1(), ds.p2() | 278 p1, p2 = ds.p1(), ds.p2() |
279 with ds.parentchange(): | 279 with ds.parentchange(): |
280 ds.setparents(node.nullid, node.nullid) | 280 ds.setparents(node.nullid, node.nullid) |
281 with wrappedextraprepare,\ | 281 with wrappedextraprepare: |
282 repo.ui.configoverride(overrides, 'widen'): | 282 with repo.ui.configoverride(overrides, 'widen'): |
283 exchange.pull(repo, remote, heads=common) | 283 exchange.pull(repo, remote, heads=common) |
284 with ds.parentchange(): | 284 with ds.parentchange(): |
285 ds.setparents(p1, p2) | 285 ds.setparents(p1, p2) |
286 else: | 286 else: |
287 with remote.commandexecutor() as e: | 287 with remote.commandexecutor() as e: |
288 bundle = e.callcommand('narrow_widen', { | 288 bundle = e.callcommand('narrow_widen', { |
294 'commonheads': common, | 294 'commonheads': common, |
295 'known': [], | 295 'known': [], |
296 'ellipses': False, | 296 'ellipses': False, |
297 }).result() | 297 }).result() |
298 | 298 |
299 with repo.transaction('widening') as tr,\ | 299 with repo.transaction('widening') as tr: |
300 repo.ui.configoverride(overrides, 'widen'): | 300 with repo.ui.configoverride(overrides, 'widen'): |
301 tgetter = lambda: tr | 301 tgetter = lambda: tr |
302 bundle2.processbundle(repo, bundle, | 302 bundle2.processbundle(repo, bundle, |
303 transactiongetter=tgetter) | 303 transactiongetter=tgetter) |
304 | 304 |
305 with repo.transaction('widening'): | 305 with repo.transaction('widening'): |
306 repo.setnewnarrowpats() | 306 repo.setnewnarrowpats() |
307 narrowspec.updateworkingcopy(repo) | 307 narrowspec.updateworkingcopy(repo) |
308 narrowspec.copytoworkingcopy(repo) | 308 narrowspec.copytoworkingcopy(repo) |