# HG changeset patch # User Augie Fackler # Date 1430344983 14400 # Wed Apr 29 18:03:03 2015 -0400 # Node ID 8026c094173abe67e0ec603b1aeca42267037b49 # Parent 431d5121528de4e2de884c3d437ecf23eb273822 pull: acquire wlock before lock to fix lock-checker warnings diff --git a/hggit/__init__.py b/hggit/__init__.py --- a/hggit/__init__.py +++ b/hggit/__init__.py @@ -227,6 +227,7 @@ bookmarks=bookmarks) if trmanager: pullop.trmanager = trmanager(repo, 'pull', remote.url()) + wlock = repo.wlock() lock = repo.lock() try: pullop.cgresult = repo.githandler.fetch(remote.path, heads) @@ -241,6 +242,7 @@ else: pullop.releasetransaction() lock.release() + wlock.release() else: return orig(repo, remote, heads, force, bookmarks=bookmarks) if not hgutil.safehasattr(localrepo.localrepository, 'pull'):