# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240392509 -3600
# Node ID aa3d951d2f1a25010f41a1ce9840c4c8fbe3ed4f
# Parent  fa7d7d6ca1adcfe82f0213595e9d179a10a86b4f# Parent  43d8c042ca2025b9f04f546a890db14212559c7d
Merge with stable

diff -r fa7d7d6ca1ad -r aa3d951d2f1a hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Apr 21 11:37:50 2009 +0100
+++ b/hgkw/keyword.py	Wed Apr 22 10:28:29 2009 +0100
@@ -85,6 +85,7 @@
 from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions
 from mercurial import patch, localrepo, templater, templatefilters, util
 from mercurial.hgweb import webcommands
+from mercurial.lock import release
 from mercurial.node import nullid, hex
 from mercurial.i18n import _
 import re, shutil, tempfile, time
@@ -275,8 +276,7 @@
         lock = repo.lock()
         kwt.overwrite(None, expand, status[6])
     finally:
-        del wlock, lock
-
+        release(lock, wlock)
 
 def demo(ui, repo, *args, **opts):
     '''print [keywordmaps] configuration and an expansion example