Mercurial > hg

diff mercurial/__init__.py @ 32521:942051a29fb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loader: pywatchman appears to already be py3 compatible Our loader was doing some confusing things in pywatchman, but it looks like we shouldn't be using it there anyway.
author Augie Fackler <raf@durin42.com>
date Sun, 28 May 2017 15:45:47 -0400
parents 397e3a2e9347
children 5d0c0c8d2929
line wrap: on
line diff
--- a/mercurial/__init__.py	Sun May 28 17:02:24 2017 -0400
+++ b/mercurial/__init__.py	Sun May 28 15:45:47 2017 -0400
@@ -34,6 +34,9 @@
             # zstd is already dual-version clean, don't try and mangle it
             if fullname.startswith('mercurial.zstd'):
                 return None
+            # pywatchman is already dual-version clean, don't try and mangle it
+            if fullname.startswith('hgext.fsmonitor.pywatchman'):
+                return None
 
             # Try to find the module using other registered finders.
             spec = None