evolve: comparison hgext/simple4server.py

equal deleted inserted replaced

-:cc19b6400dae
+:3de3d85069fd
 finally:
 lock.release()
 repo.hook('evolve_pushobsmarkers')
 return wireproto.pushres(0)
-# from mercurial.obsolete: 19e9478c1a22
-def _encodemarkersstream(fp, markers):
-"""write a binary version of a set of markers
-Includes the initial version number"""
-fp.write(_pack('>B', 0))
-for mark in markers:
-fp.write(obsolete._encodeonemarker(mark))
 # from evolve extension: 1a23c7c52a43
 def _getobsmarkersstream(repo, heads=None, common=None):
 """Get a binary stream for all markers relevant to `::<heads> - ::<common>`
 """
 revset = ''
 revset += ' - (::%ln)'
 args.append(common)
 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
 if not util.safehasattr(obsolete.obsstore, 'relevantmarkers'):
 # from evolve extension: 1a23c7c52a43
 if p != node.nullid:
 entry += 1
 sha.update(p)
 tmarkers = repo.obsstore.relevantmarkers([ctx.node()])
 if tmarkers:
-bmarkers = [obsolete._encodeonemarker(m) for m in tmarkers]
+bmarkers = [obsolete._fm0encodeonemarker(m) for m in tmarkers]
 bmarkers.sort()
 for m in bmarkers:
 entry += 1
 sha.update(m)
 if entry:
 """hash of binary version of relevant markers + obsparent
 (special case so that all empty are hashed as nullid)"""
 hashs = _obsrelsethashtree(repo)
 nm = repo.changelog.nodemap
-return  [hashs[nm.get(n)][1] for n in nodes]
+revs = [nm.get(n) for n in nodes]
+return [r is None and node.nullid or hashs[r][1] for r in revs]
 # from evolve extension: 1a23c7c52a43
 def srv_obshash(repo, proto, nodes):
 """give the obshash of a a set of node
 advertise = repo.ui.configbool('__temporary__', 'advertiseobsolete', True)
 if obsolete._enabled and advertise:
 caps += ' _evoext_pushobsmarkers_0'
 caps += ' _evoext_pullobsmarkers_0'
 caps += ' _evoext_obshash_0'
-caps += ' _evoext_b2x_obsmarkers_0'
+caps += ' _evoext_getbundle_obscommon'
 return caps
+def _getbundleobsmarkerpart(orig, bundler, repo, source, heads=None, common=None,
+bundlecaps=None, **kwargs):
+if 'evo_obscommon' not in kwargs:
+return orig(bundler, repo, source, heads, common, bundlecaps, **kwargs)
+if kwargs.get('obsmarkers', False):
+if heads is None:
+heads = repo.heads()
+obscommon = kwargs.get('evo_obscommon', ())
+obsset = repo.set('::%ln - ::%ln', heads, obscommon)
+subset = [c.node() for c in obsset]
+markers = repo.obsstore.relevantmarkers(subset)
+exchange.buildobsmarkerspart(bundler, markers)
 # from evolve extension: 10867a8e27c6
 # heavily modified
 def extsetup(ui):
 localrepo.moderncaps.add('_evoext_b2x_obsmarkers_0')
-if gboptsmap is not None:
+gboptsmap['evo_obscommon'] = 'nodes'
-gboptsmap['evo_obsmarker'] = 'plain'
-gboptsmap['evo_obscommon'] = 'plain'
-gboptsmap['evo_obsheads'] = 'plain'
-else:
-gboptslist.append('evo_obsheads')
-gboptslist.append('evo_obscommon')
-gboptslist.append('evo_obsmarker')
 if not util.safehasattr(obsolete.obsstore, 'relevantmarkers'):
 obsolete.obsstore = pruneobsstore
 obsolete.obsstore.relevantmarkers = relevantmarkers
 hgweb_mod.perms['evoext_pushobsmarkers_0'] = 'push'
 hgweb_mod.perms['evoext_pullobsmarkers_0'] = 'pull'
 hgweb_mod.perms['evoext_obshash'] = 'pull'
 wireproto.commands['evoext_pushobsmarkers_0'] = (srv_pushobsmarkers, '')
 wireproto.commands['evoext_pullobsmarkers_0'] = (srv_pullobsmarkers, '*')
 # wrap module content
-extensions.wrapfunction(exchange, '_getbundleextrapart', _getbundleextrapart)
+extensions.wrapfunction(exchange, '_pullbundle2extraprepare', _getbundleobsmarkerpart)
 extensions.wrapfunction(wireproto, 'capabilities', capabilities)
 # wrap command content
 oldcap, args = wireproto.commands['capabilities']
 def newcap(repo, proto):
 return capabilities(oldcap, repo, proto)
 wireproto.commands['evoext_obshash'] = (srv_obshash, 'nodes')
 # specific simple4server content
 extensions.wrapfunction(pushkey, '_nslist', _nslist)
 pushkey._namespaces['namespaces'] = (lambda *x: False, pushkey._nslist)
-#from evolve extension
-@bundle2.parthandler('evolve:b2x:obsmarkerv1')
-def handleobsmarkerv1(op, inpart):
-"""add a stream of obsmarker to the repo"""
-tr = op.gettransaction()
-advparams = dict(inpart.advisoryparams)
-length = advparams.get('totalbytes')
-if length is None:
-obsdata = inpart.read()
-else:
-length = int(length)
-data = StringIO()
-current = 0
-op.ui.progress('OBSEXC', current, unit="bytes", total=length)
-while current < length:
-readsize = min(length-current, 4096)
-data.write(inpart.read(readsize))
-current += readsize
-op.ui.progress('OBSEXC', current, unit="bytes", total=length)
-op.ui.progress('OBSEXC', None)
-obsdata = data.getvalue()
-totalsize = len(obsdata)
-old = len(op.repo.obsstore._all)
-op.repo.obsstore.mergemarkers(tr, obsdata)
-new = len(op.repo.obsstore._all) - old
-op.records.add('evo_obsmarkers', {'new': new, 'bytes': totalsize})
-tr.hookargs['evolve_new_obsmarkers'] = str(new)
-#from evolve extension
-def _getbundleextrapart(orig, bundler, repo, source, **kwargs):
-if int(kwargs.pop('evo_obsmarker', False)):
-common = kwargs.pop('evo_obscommon')
-common = wireproto.decodelist(common)
-heads = kwargs.pop('evo_obsheads')
-heads = wireproto.decodelist(heads)
-obsdata = _getobsmarkersstream(repo, common=common, heads=heads)
-if len(obsdata.getvalue()) > 5:
-advparams = [('totalbytes', str(len(obsdata.getvalue())))]
-obspart = bundle2.bundlepart('EVOLVE:B2X:OBSMARKERV1',
-advisoryparams=advparams,
-data=obsdata)
-bundler.addpart(obspart)
-orig(bundler, repo, source)

branch	stable
changeset 1146	3de3d85069fd
parent 1097	580a2d838996
child 1215	004e21b8d67b
child 1245	580a8f5ea462