--- a/hgext/evolve.py Wed Aug 27 18:15:39 2014 +0200
+++ b/hgext/evolve.py Wed Aug 27 18:16:10 2014 +0200
@@ -2337,10 +2337,6 @@
_pushkeyescape = getattr(obsolete, '_pushkeyescape', None)
-def _encodemarkersstream(fp, markers):
- fp.write(_pack('>B', 0))
- for mark in markers:
- fp.write(obsolete._encodeonemarker(mark))
class pushobsmarkerStringIO(StringIO):
"""hacky string io for progress"""
@@ -2381,7 +2377,8 @@
obsexcmsg(repo.ui, "no marker to push\n")
elif remote.capable('_evoext_pushobsmarkers_0'):
obsdata = pushobsmarkerStringIO()
- _encodemarkersstream(obsdata, markers)
+ for chunk in obsolete.encodemarkers(markers, True):
+ obsdata.write(chunk)
obsdata.seek(0)
obsdata.ui = repo.ui
obsexcmsg(repo.ui, "pushing %i obsolescence markers (%i bytes)\n"
@@ -2578,7 +2575,8 @@
nodes = [c.node() for c in repo.set(revset, *args)]
markers = repo.obsstore.relevantmarkers(nodes)
obsdata = StringIO()
- _encodemarkersstream(obsdata, markers)
+ for chunk in obsolete.encodemarkers(markers, True):
+ obsdata.write(chunk)
obsdata.seek(0)
return obsdata