changeset 952:f83f46411b09

evolve: bump requirement to 3.0.1 Use of bundle2 for pulling will require this version or above.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 03 Jun 2014 01:16:39 -0700
parents e3f7258d05d5
children a02e5916a7e3
files README hgext/evolve.py
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/README	Mon Jun 02 14:58:45 2014 -0700
+++ b/README	Tue Jun 03 01:16:39 2014 -0700
@@ -49,6 +49,7 @@
 
 4.0.0 --
 
+- require Mercurial version 3.0.1 or above
 - deprecated `gup` and `gdown` in favor of prev and next
 - record parent of pruned parent at prune time
 - added a `debugobsstorestat` command to gather data on obsmarker content.
--- a/hgext/evolve.py	Mon Jun 02 14:58:45 2014 -0700
+++ b/hgext/evolve.py	Tue Jun 03 01:16:39 2014 -0700
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in 2.3
 '''
 
-testedwith = '3.0'
+testedwith = '3.0.1'
 buglink = 'https://bitbucket.org/marmoute/mutable-history/issues'
 
 import sys
@@ -34,11 +34,14 @@
     from mercurial import obsolete
     if not obsolete._enabled:
         obsolete._enabled = True
-    from mercurial import bundle2
-    bundle2._
+    from mercurial import wireproto
+    gboptslist = getattr(wireproto, 'gboptslist', None)
 except (ImportError, AttributeError):
+    gboptslist = None
+
+if gboptslist is None:
     raise util.Abort('Your Mercurial is too old for this version of Evolve\n'
-                     'requires version >> 3.0.x')
+                     'requires version 3.0.1 or above')