push: explicitly encode a list of obsmarkers to push
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 04 Jul 2014 19:31:49 +0200
changeset 22033 342e7c428e47
parent 22032 d7f25834ffbb
child 22034 5f57bc77657c
push: explicitly encode a list of obsmarkers to push Sending obsmarkers through pushkey requires extra encoding (since pushkey can't take binary content) and slicing (since we can hit http header limit). As we send all obsolescences markers that exists in the repo for each push, we used to just look at the content of the "obsolete" pushkey namespace (already encoded and sliced) and send its content. However, future changeset will make it possible to push only parts of the obsmarkers. To prepare this we now explicitly encode a list of markers. The list of markers is still "all of them" but future changeset will takes care of that. The new code uses a "_protected" method but that seems reasonable to keep it private as this is the is the only external user of it and this whole pushing obsmarker through pushkey things in fairly hacky already)
mercurial/exchange.py
--- a/mercurial/exchange.py	Mon Aug 04 16:32:41 2014 -0700
+++ b/mercurial/exchange.py	Fri Jul 04 19:31:49 2014 +0200
@@ -590,7 +590,7 @@
     if (obsolete._enabled and repo.obsstore and
         'obsolete' in remote.listkeys('namespaces')):
         rslts = []
-        remotedata = repo.listkeys('obsolete')
+        remotedata = obsolete._pushkeyescape(repo.obsstore)
         for key in sorted(remotedata, reverse=True):
             # reverse sort to ensure we end with dump0
             data = remotedata[key]