Mercurial Mercurial > test / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid name conflict with dispatch package(s)
authorChristian Ebert <blacktrash@gmx.net>
Tue, 06 Nov 2007 13:20:39 +0100
changeset 288 80a300088654
parent 287 62eff490c844
child 289 b8c86166bf86
child 290 b05795ad5632
Avoid name conflict with dispatch package(s) Thanks to Marcin Kasperski for spotting and analysing this. Message-ID: <87wsswvhbk.fsf@cauchy.softax.local> ff.
hgkw/keyword.py file | annotate | diff | comparison | revisions 
--- a/hgkw/keyword.py	Mon Oct 29 10:55:41 2007 +0100
+++ b/hgkw/keyword.py	Tue Nov 06 13:20:39 2007 +0100
@@ -89,8 +89,8 @@
 
 try:
     # cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78
-    from mercurial import dispatch
-    _parse = dispatch._parse
+    # also avoid name conflict with other dispatch package(s)
+    from mercurial.dispatch import _parse
 except ImportError:
     try:
         # commands.parse moves to cmdutil.parse in 0c61124ad877
test