--- a/hgkw/keyword.py	Tue Aug 21 14:07:57 2007 +0200
+++ b/hgkw/keyword.py	Sat Aug 25 15:38:04 2007 +0200
@@ -90,19 +90,19 @@
 try:
     # cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78
     from mercurial import dispatch
-    __parse = dispatch._parse
+    _parse = dispatch._parse
 except ImportError:
     try:
         # commands.parse moves to cmdutil.parse in 0c61124ad877
-        __parse = cmdutil.parse
+        _parse = cmdutil.parse
     except AttributeError:
-        __parse = commands.parse
+        _parse = commands.parse
 
 try:
     # bail_if_changed moves from commands to cmdutil in 0c61124ad877
-    _bail_if_changed = cmdutil.bail_if_changed
+    bail_if_changed = cmdutil.bail_if_changed
 except AttributeError:
-    _bail_if_changed = commands.bail_if_changed
+    bail_if_changed = commands.bail_if_changed
 
 # commands.parse/cmdutil.parse returned nothing for
 # "hg diff --rev" before 88803a69b24a due to bug in fancyopts
@@ -315,7 +315,7 @@
     try:
         wlock = repo.wlock()
         lock = repo.lock()
-        _bail_if_changed(repo)
+        bail_if_changed(repo)
         ctx = repo.changectx()
         if not ctx:
             raise hg.RepoError(_('no revision checked out'))
@@ -442,7 +442,7 @@
                     'grep', 'identify', 'incoming', 'init', 'outgoing', 'push',
                     'remove', 'rename', 'rollback']
 
-    if not repo.local() or __parse(ui, sys.argv[1:])[0] in nokwcommands:
+    if not repo.local() or _parse(ui, sys.argv[1:])[0] in nokwcommands:
         return
 
     kwfmatcher = _keywordmatcher(ui, repo)