# HG changeset patch # User Christian Ebert # Date 2013-11-20 12:55:08 # Node ID 7ad2ae7792ad2072c8a14c5c6c8df01316cacd66 # Parent 169f8141ba007305eb048e50fb4c9cb3eb247adc 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 @@ def demo(ui, repo, *args, **opts): 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, '')