[PATCH] keyword: wlock while setting branch in kwdemo

Christian Ebert blacktrash at gmx.net
Wed Nov 20 12:57:41 UTC 2013


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1384952108 0
#      Wed Nov 20 12:55:08 2013 +0000
# Node ID 45d15012f02b332cdc16f00a894b1ec29926633d
# Parent  6d4fda48b4e3710cfc2161f676adb46c424079d3
keyword: wlock while setting branch in kwdemo

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -439,7 +439,11 @@
     repo[None].add([fn])
     ui.note(_('\nkeywords written to %s:\n') % fn)
     ui.note(keywords)
-    repo.dirstate.setbranch('demobranch')
+    wlock = repo.wlock()
+    try:
+        repo.dirstate.setbranch('demobranch')
+    finally:
+        wlock.release()
     for name, cmd in ui.configitems('hooks'):
         if name.split('.', 1)[0].find('commit') > -1:
             repo.ui.setconfig('hooks', name, '')



More information about the Mercurial-devel mailing list