diff -r 580a8f5ea462 -r c7db753ca300 hgext/simple4server.py --- a/hgext/simple4server.py Fri Apr 10 23:25:07 2015 -0400 +++ b/hgext/simple4server.py Fri Apr 10 23:43:14 2015 -0400 @@ -178,15 +178,15 @@ return wireproto.streamres(proto.groupchunks(finaldata)) -# from evolve extension: 2299204c3c27 +# from evolve extension: 3249814dabd1 def _obsrelsethashtreefm0(repo): return _obsrelsethashtree(repo, obsolete._fm0encodeonemarker) -# from evolve extension: 2299204c3c27 +# from evolve extension: 3249814dabd1 def _obsrelsethashtreefm1(repo): return _obsrelsethashtree(repo, obsolete._fm1encodeonemarker) -# from evolve extension: 2299204c3c27 +# from evolve extension: 3249814dabd1 def _obsrelsethashtree(repo, encodeonemarker): cache = [] unfi = repo.unfiltered() @@ -235,7 +235,7 @@ print >> sys.stderr, 'Witchcraft tracking: OFF' return cache -# from evolve extension: 2299204c3c27 +# from evolve extension: 3249814dabd1 def _obshash(repo, nodes, version=0): if version == 0: hashs = _obsrelsethashtreefm0(repo) @@ -247,15 +247,15 @@ 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: 2299204c3c27 +# from evolve extension: 3249814dabd1 def srv_obshash(repo, proto, nodes): return wireproto.encodelist(_obshash(repo, wireproto.decodelist(nodes))) -# from evolve extension: 2299204c3c27 +# from evolve extension: 3249814dabd1 def srv_obshash1(repo, proto, nodes): return wireproto.encodelist(_obshash(repo, wireproto.decodelist(nodes), version=1)) -# from evolve extension: 2299204c3c27 +# from evolve extension: 3249814dabd1 def capabilities(orig, repo, proto): """wrapper to advertise new capability""" caps = orig(repo, proto)