branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 02 Mar 2018 16:31:08 -0500
changeset 3509 174d966e1eaa
parent 3508 0b3ab8b6f39d (current diff)
parent 3507 c0b6a95b94b9 (diff)
child 3512 57033b0bd347
child 5218 39c8585a7126
branching: merge with stable
hgext3rd/evolve/obscache.py
tests/test-wireproto.t
--- a/hgext3rd/evolve/obscache.py	Fri Mar 02 16:30:48 2018 -0500
+++ b/hgext3rd/evolve/obscache.py	Fri Mar 02 16:31:08 2018 -0500
@@ -225,6 +225,8 @@
             self.clear(reset=True)
 
         starttime = timer()
+        revs = list(revs)
+        obsmarkers = list(obsmarkers)
         self._updatefrom(repo, revs, obsmarkers)
         duration = timer() - starttime
         repo.ui.log('evoext-cache', 'updated %s in %.4f seconds (%sr, %so)\n',
--- a/tests/test-wireproto.t	Fri Mar 02 16:30:48 2018 -0500
+++ b/tests/test-wireproto.t	Fri Mar 02 16:31:08 2018 -0500
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
+  _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
 
 Check we cannot use pushkey for marker exchange anymore