Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eol: make sure we always release the wlock when writing cache
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 13 Oct 2016 13:47:47 +0200
changeset 30164 1c518d69d994
parent 30163 f5607b6253da
child 30165 423377290a3a
eol: make sure we always release the wlock when writing cache If any exception were to happen after we acquired the wlock, we could leave it unreleased. We move the wlock release in a 'finally:' close as it should be.
hgext/eol.py file | annotate | diff | comparison | revisions 
--- a/hgext/eol.py	Thu Oct 13 21:42:11 2016 +0200
+++ b/hgext/eol.py	Thu Oct 13 13:47:47 2016 +0200
@@ -360,7 +360,6 @@
                     # Write the cache to update mtime and cache .hgeol
                     with self.vfs("eol.cache", "w") as f:
                         f.write(hgeoldata)
-                    wlock.release()
                 except error.LockUnavailable:
                     # If we cannot lock the repository and clear the
                     # dirstate, then a commit might not see all files
@@ -368,6 +367,9 @@
                     # repository, then we can also not make a commit,
                     # so ignore the error.
                     pass
+                finally:
+                    if wlock is not None:
+                        wlock.release()
 
         def commitctx(self, ctx, haserror=False):
             for f in sorted(ctx.added() + ctx.modified()):
Mercurial