@@ -171,11 +171,11 @@ def _readmarkers(data):
try:
date = util.parsedate(decodemeta(metadata).pop('date', '0 0'))
except util.Abort:
date = (0., 0)
- yield (pre, sucs, flags, metadata, date)
+ yield (pre, sucs, flags, metadata, date, None)
def encodemeta(meta):
"""Return encoded metadata string to string mapping.
Assume no ':' in key and no '\0' in both key and value."""
@@ -240,11 +240,11 @@ class obsstore(object):
Markers can be accessed with two mappings:
- precursors[x] -> set(markers on precursors edges of x)
- successors[x] -> set(markers on successors edges of x)
"""
- fields = ('prec', 'succs', 'flag', 'meta', 'date')
+ fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents')
def __init__(self, sopener):
# caches for various obsolescence related cache
self.caches = {}
self._all = []
@@ -293,11 +293,11 @@ class obsstore(object):
if len(succ) != 20:
raise ValueError(succ)
if prec in succs:
raise ValueError(_('in-marker cycle with %s') % node.hex(prec))
marker = (str(prec), tuple(succs), int(flag), encodemeta(metadata),
- date)
+ date, None)
return bool(self.add(transaction, [marker]))
def add(self, transaction, markers):
"""Add new markers to the store
@@ -357,11 +357,11 @@ def _encodemarkers(markers, addheader=Fa
for marker in markers:
yield _encodeonemarker(marker)
def _encodeonemarker(marker):
- pre, sucs, flags, metadata, date = marker
+ pre, sucs, flags, metadata, date, parents = marker
metadata = decodemeta(metadata)
metadata['date'] = '%d %i' % date
metadata = encodemeta(metadata)
nbsuc = len(sucs)
format = _fmfixed + (_fmnode * nbsuc)