[PATCH 09 of 10] subrepo: ensure "lock.release()" execution at the end of "_cachestorehash()"

[FUJIWARA Katsunori]

# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1401288802 -32400
#      Wed May 28 23:53:22 2014 +0900
# Node ID c55208e571d22bc350a9c12193403f7f2e730db5
# Parent  1870030d4dd84398ad88caa9579cf9a4480ea980
subrepo: ensure "lock.release()" execution at the end of "_cachestorehash()"

Before this patch, "lock.release()" for "self._repo" in
"_cachestorehash()" of "hgsubrepo" may not be executed, if unexpected
exception is raised, because it isn't executed in "finally" clause.

This patch ensures "lock.release()" execution at the end of
"_cachestorehash()" by moving it into "finally" clause.

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -568,10 +568,12 @@ class hgsubrepo(abstractsubrepo):
         '''
         cachefile = _getstorehashcachename(remotepath)
         lock = self._repo.lock()
-        storehash = list(self._calcstorehash(remotepath))
-        vfs = self._cachestorehashvfs
-        vfs.writelines(cachefile, storehash, mode='w', notindexed=True)
-        lock.release()
+        try:
+            storehash = list(self._calcstorehash(remotepath))
+            vfs = self._cachestorehashvfs
+            vfs.writelines(cachefile, storehash, mode='w', notindexed=True)
+        finally:
+            lock.release()
 
     @annotatesubrepoerror
     def _initrepo(self, parentrepo, source, create):