changeset 898:8026c094173a

pull: acquire wlock before lock to fix lock-checker warnings
author Augie Fackler <raf@durin42.com>
date Wed, 29 Apr 2015 18:03:03 -0400
parents 431d5121528d
children 5cc2ad8a162b
files hggit/__init__.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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'):