diff hgext/evolve.py @ 1283:35d8789ea7a8

merge with stable

--- a/hgext/evolve.py	Mon Apr 20 14:21:38 2015 +0200
+++ b/hgext/evolve.py	Thu Apr 23 03:18:30 2015 +0200
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.1.3'
+__version__ = '5.1.4'
 testedwith = '3.3.3 3.4-rc'
 buglink = 'http://bz.selenic.com/'
 
@@ -27,7 +27,6 @@
 import random
 from StringIO import StringIO
 import struct
-import urllib
 import re
 sha1re = re.compile(r'\b[0-9a-f]{6,40}\b')
 
@@ -2757,7 +2756,7 @@
                 heads = repo.heads()
             obscommon = kwargs.get('evo_obscommon', ())
             assert obscommon
-            obsset = repo.set('::%ln - ::%ln', heads, obscommon)
+            obsset = repo.unfiltered().set('::%ln - ::%ln', heads, obscommon)
             subset = [c.node() for c in obsset]
             markers = repo.obsstore.relevantmarkers(subset)
             exchange.buildobsmarkerspart(bundler, markers)
@@ -2936,7 +2935,6 @@
     else:
         treefunc = _obsrelsethashtreefm1
 
-    treefunc = _obsrelsethashtree
     for chg, obs in treefunc(repo):
         ui.status('%s %s\n' % (node.hex(chg), node.hex(obs)))