# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1243426573 -7200
# Node ID 60f9e574b6ebc8cf6ec6e6583568ca155334a5e5
# Parent  27638a2335770c62ed5d2709881421b05ac89fc3
localrepo: use lock.release for single lock

diff -r 27638a233577 -r 60f9e574b6eb mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed May 27 23:39:41 2009 +0200
+++ b/mercurial/localrepo.py	Wed May 27 14:16:13 2009 +0200
@@ -971,18 +971,17 @@
 
                 # update dirstate for files that are actually clean
                 if fixup:
-                    wlock = None
                     try:
+                        wlock = self.wlock(False)
                         try:
                             # updating the dirstate is optional
                             # so we don't wait on the lock
-                            wlock = self.wlock(False)
                             for f in fixup:
                                 self.dirstate.normal(f)
-                        except error.LockError:
-                            pass
-                    finally:
-                        release(wlock)
+                        finally:
+                            wlock.release()
+                    except error.LockError:
+                        pass
 
         if not parentworking:
             mf1 = mfmatches(ctx1)
@@ -1062,16 +1061,15 @@
             wlock.release()
 
     def remove(self, list, unlink=False):
-        wlock = None
+        if unlink:
+            for f in list:
+                try:
+                    util.unlink(self.wjoin(f))
+                except OSError, inst:
+                    if inst.errno != errno.ENOENT:
+                        raise
+        wlock = self.wlock()
         try:
-            if unlink:
-                for f in list:
-                    try:
-                        util.unlink(self.wjoin(f))
-                    except OSError, inst:
-                        if inst.errno != errno.ENOENT:
-                            raise
-            wlock = self.wlock()
             for f in list:
                 if unlink and os.path.exists(self.wjoin(f)):
                     self.ui.warn(_("%s still exists!\n") % f)
@@ -1082,7 +1080,7 @@
                 else:
                     self.dirstate.remove(f)
         finally:
-            release(wlock)
+            wlock.release()
 
     def undelete(self, list):
         manifests = [self.manifest.read(self.changelog.read(p)[0])