changeset 32863 | 58a6f64a7018 |
parent 32861 | a470bbb4e3af |
child 32909 | 7e2eb964a561 |
--- a/mercurial/exchange.py Thu Jun 15 14:47:18 2017 -0700 +++ b/mercurial/exchange.py Thu Jun 15 22:57:20 2017 -0700 @@ -1733,8 +1733,8 @@ # push can proceed if not util.safehasattr(cg, 'params'): # legacy case: bundle1 (changegroup 01) - lockandtr[1] = repo.lock() - r = cg.apply(repo, source, url) + with repo.lock(): + r = cg.apply(repo, source, url) else: r = None try: