Patchwork [1,of,2] selector2: vendor selector2 library

login
register
mail settings
Submitter Yuya Nishihara
Date July 15, 2017, 1:48 p.m.
Message ID <20170715224805.1dba00fda742afb35b93a2ca@tcha.org>
Download mbox | patch
Permalink /patch/22404/
State Not Applicable
Headers show

Comments

Yuya Nishihara - July 15, 2017, 1:48 p.m.
On Fri, 14 Jul 2017 20:27:26 -0700, Jun Wu wrote:
> # HG changeset patch
> # User Jun Wu <quark@fb.com>
> # Date 1500088786 25200
> #      Fri Jul 14 20:19:46 2017 -0700
> # Node ID 5664763de82b48ca6882bbb624d01d467b4920d0
> # Parent  0407a51b9d8c3ade36b6495f44897c7a70e20975
> # Available At https://bitbucket.org/quark-zju/hg-draft
> #              hg pull https://bitbucket.org/quark-zju/hg-draft -r 5664763de82b
> selector2: vendor selector2 library

I've added the following change for py3 compatibility. It might be better to
add hgvendored package to automate this sort of things.

Patch

diff --git a/mercurial/__init__.py b/mercurial/__init__.py
--- a/mercurial/__init__.py
+++ b/mercurial/__init__.py
@@ -31,6 +31,9 @@  if sys.version_info[0] >= 3:
             # Only handle Mercurial-related modules.
             if not fullname.startswith(('mercurial.', 'hgext.', 'hgext3rd.')):
                 return None
+            # selectors2 is already dual-version clean, don't try and mangle it
+            if fullname.startswith('mercurial.selectors2'):
+                return None
             # zstd is already dual-version clean, don't try and mangle it
             if fullname.startswith('mercurial.zstd'):
                 return None