##// END OF EJS Templates
scmutil: accept multiple predecessors in 'replacements' (API)...
scmutil: accept multiple predecessors in 'replacements' (API) This changeset makes 'cleanupnodes' accepts multiple predecessors as `replacements` keys. The same as it accepts multiple successors as `replacements` values. To avoid breaking all callers, the old and new ways are currently valid at the same time. We'll deprecate and drop the old way later. This change is the first step toward a better tracking of "fold" event in the evolution history. While working on the "rewind" command (in the evolve extension), we realized that first class tracking of folds are necessary. We already have good tracking of splits. When walking the evolution history from predecessors to successors, that makes for a clear distinction between having multiple successors because of the actual splitting of a changeset or content-divergences. The "rewind" command allows restoring older evolution of a stack of changesets. One of its mode walks the evolution history to automatically find appropriate predecessors. This means walking from successors to predecessors. In this case, we need to be able to make the same distinction between an actual fold and other cases. So we will have to track folds explicitly. This changesets only focus on making it possible to express fold at the `cleanupnodes` API level. The actual tracking will be implemented later.

File last commit:

r25969:7b200566 default
r39927:b9990353 default
Show More
pushkey.py
61 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
Matt Mackall
pushkey: add pushkey core
r11367 def _nslist(repo):
n = {}
for k in _namespaces:
n[k] = ""
Durham Goode
obsolete: add exchange option...
r22953 if not obsolete.isenabled(repo, obsolete.exchangeopt):
Pierre-Yves David
pushkey: do not exchange obsole markers if feature is disabled...
r17298 n.pop('obsolete')
Matt Mackall
pushkey: add pushkey core
r11367 return n
Matt Mackall
bookmarks: move pushkey functions into core
r13353 _namespaces = {"namespaces": (lambda *x: False, _nslist),
Pierre-Yves David
phases: add basic pushkey support
r15648 "bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks),
"phases": (phases.pushphase, phases.listphases),
Pierre-Yves.David@ens-lyon.org
obsolete: exchange obsolete marker over pushkey...
r17075 "obsolete": (obsolete.pushmarker, obsolete.listmarkers),
Pierre-Yves David
phases: add basic pushkey support
r15648 }
Matt Mackall
pushkey: add pushkey core
r11367
def register(namespace, pushkey, listkeys):
_namespaces[namespace] = (pushkey, listkeys)
def _get(namespace):
return _namespaces.get(namespace, (lambda *x: False, lambda *x: {}))
def push(repo, namespace, key, old, new):
'''should succeed iff value was old'''
pk = _get(namespace)[0]
return pk(repo, key, old, new)
def list(repo, namespace):
'''return a dict'''
lk = _get(namespace)[1]
return lk(repo)
Pierre-Yves David
pushkey: add an ``encode`` function...
r21661 encode = encoding.fromlocal
Pierre-Yves David
pushkey: add a ``decode`` function...
r21659 decode = encoding.tolocal
Pierre-Yves David
pushkey: introduce an ``encodekeys`` function...
r21650 def encodekeys(keys):
"""encode the content of a pushkey namespace for exchange over the wire"""
Pierre-Yves David
pushkey: add an ``encode`` function...
r21661 return '\n'.join(['%s\t%s' % (encode(k), encode(v)) for k, v in keys])
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():
k, v = l.split('\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