changeset 20113 | 7ad2ae7792ad |
parent 20033 | f962870712da |
child 20240 | 60c4d76b79b5 |
--- a/hgext/keyword.py Sun Nov 17 15:43:46 2013 +0100 +++ b/hgext/keyword.py Wed Nov 20 12:55:08 2013 +0000 @@ -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, '')