# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1385643432 0
# Node ID 21d35cf4933ea3b4a37a7704213c6aca8bc6e1b1
# Parent  164ed9bf157c5020c7b6ab47d05c3297d1806b29# Parent  02972bce7d415d0d31426f2b13739a2b22d260a8
Merge with default

diff -r 164ed9bf157c -r 21d35cf4933e hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Nov 17 10:59:35 2013 -0500
+++ b/hgkw/keyword.py	Thu Nov 28 12:57:12 2013 +0000
@@ -438,7 +438,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, '')