##// END OF EJS Templates
py3: fix sorting of obsolete markers when building bundle...
py3: fix sorting of obsolete markers when building bundle Last item of marker tuple (parents) is either None or tuple. Comparison thus fails on Python 3 with: TypeError: '<' not supported between instances of 'tuple' and 'NoneType' Fixing this by coercing None to the empty tuple when sorting markers in exchange._getbundleobsmarkerpart().

File last commit:

r43347:687b865b default
r43438:01e8eefd default
Show More
pushkey.py
71 lines | 1.7 KiB | text/x-python | PythonLexer
Matt Mackall
pushkey: add pushkey core
r11367 # pushkey.py - dispatching for pushing and pulling keys
#
# Copyright 2010 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
pushkey: use absolute_import
r25969 from __future__ import absolute_import
from . import (
bookmarks,
encoding,
obsolete,
phases,
)
Matt Mackall
bookmarks: move pushkey functions into core
r13353
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Mackall
pushkey: add pushkey core
r11367 def _nslist(repo):
n = {}
for k in _namespaces:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 n[k] = b""
Durham Goode
obsolete: add exchange option...
r22953 if not obsolete.isenabled(repo, obsolete.exchangeopt):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 n.pop(b'obsolete')
Matt Mackall
pushkey: add pushkey core
r11367 return n
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
_namespaces = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"namespaces": (lambda *x: False, _nslist),
b"bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks),
b"phases": (phases.pushphase, phases.listphases),
b"obsolete": (obsolete.pushmarker, obsolete.listmarkers),
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 }
Matt Mackall
pushkey: add pushkey core
r11367
def register(namespace, pushkey, listkeys):
_namespaces[namespace] = (pushkey, listkeys)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Mackall
pushkey: add pushkey core
r11367 def _get(namespace):
return _namespaces.get(namespace, (lambda *x: False, lambda *x: {}))
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Mackall
pushkey: add pushkey core
r11367 def push(repo, namespace, key, old, new):
'''should succeed iff value was old'''
pk = _get(namespace)[0]
return pk(repo, key, old, new)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Mackall
pushkey: add pushkey core
r11367 def list(repo, namespace):
'''return a dict'''
lk = _get(namespace)[1]
return lk(repo)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Pierre-Yves David
pushkey: add an ``encode`` function...
r21661 encode = encoding.fromlocal
Pierre-Yves David
pushkey: add a ``decode`` function...
r21659 decode = encoding.tolocal
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Pierre-Yves David
pushkey: introduce an ``encodekeys`` function...
r21650 def encodekeys(keys):
"""encode the content of a pushkey namespace for exchange over the wire"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'\n'.join([b'%s\t%s' % (encode(k), encode(v)) for k, v in keys])
Pierre-Yves David
pushkey: introduce an ``decodekeys`` function...
r21652
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Pierre-Yves David
pushkey: introduce an ``decodekeys`` function...
r21652 def decodekeys(data):
"""decode the content of a pushkey namespace from exchange over the wire"""
result = {}
for l in data.splitlines():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 k, v = l.split(b'\t')
Pierre-Yves David
pushkey: add a ``decode`` function...
r21659 result[decode(k)] = decode(v)
Pierre-Yves David
pushkey: introduce an ``decodekeys`` function...
r21652 return result