evolution: stop wrongly flagging unrelated part of a split as divergent

Before this change, divergence introduced by successors of a split would "spill"
to other unrelated successors of the split that were not ambiguous.

This small changes fixes it.

Thanks goes to Manuel Jacobs for the discussion leading to this realization that
a new simple and correct definition could be found.

mercurial/obsolete.py

@@ -1,1155 +1,1157 b''
 # obsolete.py - obsolete markers handling
 #
 # Copyright 2012 Pierre-Yves David <[e-mail]>
 #                Logilab SA        <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 """Obsolete marker handling
 
 An obsolete marker maps an old changeset to a list of new
 changesets. If the list of new changesets is empty, the old changeset
 is said to be "killed". Otherwise, the old changeset is being
 "replaced" by the new changesets.
 
 Obsolete markers can be used to record and distribute changeset graph
 transformations performed by history rewrite operations, and help
 building new tools to reconcile conflicting rewrite actions. To
 facilitate conflict resolution, markers include various annotations
 besides old and news changeset identifiers, such as creation date or
 author name.
 
 The old obsoleted changeset is called a "predecessor" and possible
 replacements are called "successors". Markers that used changeset X as
 a predecessor are called "successor markers of X" because they hold
 information about the successors of X. Markers that use changeset Y as
 a successors are call "predecessor markers of Y" because they hold
 information about the predecessors of Y.
 
 Examples:
 
 - When changeset A is replaced by changeset A', one marker is stored:
 
     (A, (A',))
 
 - When changesets A and B are folded into a new changeset C, two markers are
   stored:
 
     (A, (C,)) and (B, (C,))
 
 - When changeset A is simply "pruned" from the graph, a marker is created:
 
     (A, ())
 
 - When changeset A is split into B and C, a single marker is used:
 
     (A, (B, C))
 
   We use a single marker to distinguish the "split" case from the "divergence"
   case. If two independent operations rewrite the same changeset A in to A' and
   A'', we have an error case: divergent rewriting. We can detect it because
   two markers will be created independently:
 
   (A, (B,)) and (A, (C,))
 
 Format
 ------
 
 Markers are stored in an append-only file stored in
 '.hg/store/obsstore'.
 
 The file starts with a version header:
 
 - 1 unsigned byte: version number, starting at zero.
 
 The header is followed by the markers. Marker format depend of the version. See
 comment associated with each format for details.
 
 """
 
 import binascii
 import struct
 import weakref
 
 from .i18n import _
 from .node import (
     bin,
     hex,
 )
 from . import (
     encoding,
     error,
     obsutil,
     phases,
     policy,
     pycompat,
     util,
 )
 from .utils import (
     dateutil,
     hashutil,
 )
 
 parsers = policy.importmod('parsers')
 
 _pack = struct.pack
 _unpack = struct.unpack
 _calcsize = struct.calcsize
 propertycache = util.propertycache
 
 # Options for obsolescence
 createmarkersopt = b'createmarkers'
 allowunstableopt = b'allowunstable'
 allowdivergenceopt = b'allowdivergence'
 exchangeopt = b'exchange'
 
 
 def _getoptionvalue(repo, option):
     """Returns True if the given repository has the given obsolete option
     enabled.
     """
     configkey = b'evolution.%s' % option
     newconfig = repo.ui.configbool(b'experimental', configkey)
 
     # Return the value only if defined
     if newconfig is not None:
         return newconfig
 
     # Fallback on generic option
     try:
         return repo.ui.configbool(b'experimental', b'evolution')
     except (error.ConfigError, AttributeError):
         # Fallback on old-fashion config
         # inconsistent config: experimental.evolution
         result = set(repo.ui.configlist(b'experimental', b'evolution'))
 
         if b'all' in result:
             return True
 
         # Temporary hack for next check
         newconfig = repo.ui.config(b'experimental', b'evolution.createmarkers')
         if newconfig:
             result.add(b'createmarkers')
 
         return option in result
 
 
 def getoptions(repo):
     """Returns dicts showing state of obsolescence features."""
 
     createmarkersvalue = _getoptionvalue(repo, createmarkersopt)
     if createmarkersvalue:
         unstablevalue = _getoptionvalue(repo, allowunstableopt)
         divergencevalue = _getoptionvalue(repo, allowdivergenceopt)
         exchangevalue = _getoptionvalue(repo, exchangeopt)
     else:
         # if we cannot create obsolescence markers, we shouldn't exchange them
         # or perform operations that lead to instability or divergence
         unstablevalue = False
         divergencevalue = False
         exchangevalue = False
 
     return {
         createmarkersopt: createmarkersvalue,
         allowunstableopt: unstablevalue,
         allowdivergenceopt: divergencevalue,
         exchangeopt: exchangevalue,
     }
 
 
 def isenabled(repo, option):
     """Returns True if the given repository has the given obsolete option
     enabled.
     """
     return getoptions(repo)[option]
 
 
 # Creating aliases for marker flags because evolve extension looks for
 # bumpedfix in obsolete.py
 bumpedfix = obsutil.bumpedfix
 usingsha256 = obsutil.usingsha256
 
 ## Parsing and writing of version "0"
 #
 # The header is followed by the markers. Each marker is made of:
 #
 # - 1 uint8 : number of new changesets "N", can be zero.
 #
 # - 1 uint32: metadata size "M" in bytes.
 #
 # - 1 byte: a bit field. It is reserved for flags used in common
 #   obsolete marker operations, to avoid repeated decoding of metadata
 #   entries.
 #
 # - 20 bytes: obsoleted changeset identifier.
 #
 # - N*20 bytes: new changesets identifiers.
 #
 # - M bytes: metadata as a sequence of nul-terminated strings. Each
 #   string contains a key and a value, separated by a colon ':', without
 #   additional encoding. Keys cannot contain '\0' or ':' and values
 #   cannot contain '\0'.
 _fm0version = 0
 _fm0fixed = b'>BIB20s'
 _fm0node = b'20s'
 _fm0fsize = _calcsize(_fm0fixed)
 _fm0fnodesize = _calcsize(_fm0node)
 
 
 def _fm0readmarkers(data, off, stop):
     # Loop on markers
     while off < stop:
         # read fixed part
         cur = data[off : off + _fm0fsize]
         off += _fm0fsize
         numsuc, mdsize, flags, pre = _unpack(_fm0fixed, cur)
         # read replacement
         sucs = ()
         if numsuc:
             s = _fm0fnodesize * numsuc
             cur = data[off : off + s]
             sucs = _unpack(_fm0node * numsuc, cur)
             off += s
         # read metadata
         # (metadata will be decoded on demand)
         metadata = data[off : off + mdsize]
         if len(metadata) != mdsize:
             raise error.Abort(
                 _(
                     b'parsing obsolete marker: metadata is too '
                     b'short, %d bytes expected, got %d'
                 )
                 % (mdsize, len(metadata))
             )
         off += mdsize
         metadata = _fm0decodemeta(metadata)
         try:
             when, offset = metadata.pop(b'date', b'0 0').split(b' ')
             date = float(when), int(offset)
         except ValueError:
             date = (0.0, 0)
         parents = None
         if b'p2' in metadata:
             parents = (metadata.pop(b'p1', None), metadata.pop(b'p2', None))
         elif b'p1' in metadata:
             parents = (metadata.pop(b'p1', None),)
         elif b'p0' in metadata:
             parents = ()
         if parents is not None:
             try:
                 parents = tuple(bin(p) for p in parents)
                 # if parent content is not a nodeid, drop the data
                 for p in parents:
                     if len(p) != 20:
                         parents = None
                         break
             except binascii.Error:
                 # if content cannot be translated to nodeid drop the data.
                 parents = None
 
         metadata = tuple(sorted(metadata.items()))
 
         yield (pre, sucs, flags, metadata, date, parents)
 
 
 def _fm0encodeonemarker(marker):
     pre, sucs, flags, metadata, date, parents = marker
     if flags & usingsha256:
         raise error.Abort(_(b'cannot handle sha256 with old obsstore format'))
     metadata = dict(metadata)
     time, tz = date
     metadata[b'date'] = b'%r %i' % (time, tz)
     if parents is not None:
         if not parents:
             # mark that we explicitly recorded no parents
             metadata[b'p0'] = b''
         for i, p in enumerate(parents, 1):
             metadata[b'p%i' % i] = hex(p)
     metadata = _fm0encodemeta(metadata)
     numsuc = len(sucs)
     format = _fm0fixed + (_fm0node * numsuc)
     data = [numsuc, len(metadata), flags, pre]
     data.extend(sucs)
     return _pack(format, *data) + metadata
 
 
 def _fm0encodemeta(meta):
     """Return encoded metadata string to string mapping.
 
     Assume no ':' in key and no '\0' in both key and value."""
     for key, value in meta.items():
         if b':' in key or b'\0' in key:
             raise ValueError(b"':' and '\0' are forbidden in metadata key'")
         if b'\0' in value:
             raise ValueError(b"':' is forbidden in metadata value'")
     return b'\0'.join([b'%s:%s' % (k, meta[k]) for k in sorted(meta)])
 
 
 def _fm0decodemeta(data):
     """Return string to string dictionary from encoded version."""
     d = {}
     for l in data.split(b'\0'):
         if l:
             key, value = l.split(b':', 1)
             d[key] = value
     return d
 
 
 ## Parsing and writing of version "1"
 #
 # The header is followed by the markers. Each marker is made of:
 #
 # - uint32: total size of the marker (including this field)
 #
 # - float64: date in seconds since epoch
 #
 # - int16: timezone offset in minutes
 #
 # - uint16: a bit field. It is reserved for flags used in common
 #   obsolete marker operations, to avoid repeated decoding of metadata
 #   entries.
 #
 # - uint8: number of successors "N", can be zero.
 #
 # - uint8: number of parents "P", can be zero.
 #
 #     0: parents data stored but no parent,
 #     1: one parent stored,
 #     2: two parents stored,
 #     3: no parent data stored
 #
 # - uint8: number of metadata entries M
 #
 # - 20 or 32 bytes: predecessor changeset identifier.
 #
 # - N*(20 or 32) bytes: successors changesets identifiers.
 #
 # - P*(20 or 32) bytes: parents of the predecessors changesets.
 #
 # - M*(uint8, uint8): size of all metadata entries (key and value)
 #
 # - remaining bytes: the metadata, each (key, value) pair after the other.
 _fm1version = 1
 _fm1fixed = b'>IdhHBBB'
 _fm1nodesha1 = b'20s'
 _fm1nodesha256 = b'32s'
 _fm1nodesha1size = _calcsize(_fm1nodesha1)
 _fm1nodesha256size = _calcsize(_fm1nodesha256)
 _fm1fsize = _calcsize(_fm1fixed)
 _fm1parentnone = 3
 _fm1metapair = b'BB'
 _fm1metapairsize = _calcsize(_fm1metapair)
 
 
 def _fm1purereadmarkers(data, off, stop):
     # make some global constants local for performance
     noneflag = _fm1parentnone
     sha2flag = usingsha256
     sha1size = _fm1nodesha1size
     sha2size = _fm1nodesha256size
     sha1fmt = _fm1nodesha1
     sha2fmt = _fm1nodesha256
     metasize = _fm1metapairsize
     metafmt = _fm1metapair
     fsize = _fm1fsize
     unpack = _unpack
 
     # Loop on markers
     ufixed = struct.Struct(_fm1fixed).unpack
 
     while off < stop:
         # read fixed part
         o1 = off + fsize
         t, secs, tz, flags, numsuc, numpar, nummeta = ufixed(data[off:o1])
 
         if flags & sha2flag:
             nodefmt = sha2fmt
             nodesize = sha2size
         else:
             nodefmt = sha1fmt
             nodesize = sha1size
 
         (prec,) = unpack(nodefmt, data[o1 : o1 + nodesize])
         o1 += nodesize
 
         # read 0 or more successors
         if numsuc == 1:
             o2 = o1 + nodesize
             sucs = (data[o1:o2],)
         else:
             o2 = o1 + nodesize * numsuc
             sucs = unpack(nodefmt * numsuc, data[o1:o2])
 
         # read parents
         if numpar == noneflag:
             o3 = o2
             parents = None
         elif numpar == 1:
             o3 = o2 + nodesize
             parents = (data[o2:o3],)
         else:
             o3 = o2 + nodesize * numpar
             parents = unpack(nodefmt * numpar, data[o2:o3])
 
         # read metadata
         off = o3 + metasize * nummeta
         metapairsize = unpack(b'>' + (metafmt * nummeta), data[o3:off])
         metadata = []
         for idx in range(0, len(metapairsize), 2):
             o1 = off + metapairsize[idx]
             o2 = o1 + metapairsize[idx + 1]
             metadata.append((data[off:o1], data[o1:o2]))
             off = o2
 
         yield (prec, sucs, flags, tuple(metadata), (secs, tz * 60), parents)
 
 
 def _fm1encodeonemarker(marker):
     pre, sucs, flags, metadata, date, parents = marker
     # determine node size
     _fm1node = _fm1nodesha1
     if flags & usingsha256:
         _fm1node = _fm1nodesha256
     numsuc = len(sucs)
     numextranodes = 1 + numsuc
     if parents is None:
         numpar = _fm1parentnone
     else:
         numpar = len(parents)
         numextranodes += numpar
     formatnodes = _fm1node * numextranodes
     formatmeta = _fm1metapair * len(metadata)
     format = _fm1fixed + formatnodes + formatmeta
     # tz is stored in minutes so we divide by 60
     tz = date[1] // 60
     data = [None, date[0], tz, flags, numsuc, numpar, len(metadata), pre]
     data.extend(sucs)
     if parents is not None:
         data.extend(parents)
     totalsize = _calcsize(format)
     for key, value in metadata:
         lk = len(key)
         lv = len(value)
         if lk > 255:
             msg = (
                 b'obsstore metadata key cannot be longer than 255 bytes'
                 b' (key "%s" is %u bytes)'
             ) % (key, lk)
             raise error.ProgrammingError(msg)
         if lv > 255:
             msg = (
                 b'obsstore metadata value cannot be longer than 255 bytes'
                 b' (value "%s" for key "%s" is %u bytes)'
             ) % (value, key, lv)
             raise error.ProgrammingError(msg)
         data.append(lk)
         data.append(lv)
         totalsize += lk + lv
     data[0] = totalsize
     data = [_pack(format, *data)]
     for key, value in metadata:
         data.append(key)
         data.append(value)
     return b''.join(data)
 
 
 def _fm1readmarkers(data, off, stop):
     native = getattr(parsers, 'fm1readmarkers', None)
     if not native:
         return _fm1purereadmarkers(data, off, stop)
     return native(data, off, stop)
 
 
 # mapping to read/write various marker formats
 # <version> -> (decoder, encoder)
 formats = {
     _fm0version: (_fm0readmarkers, _fm0encodeonemarker),
     _fm1version: (_fm1readmarkers, _fm1encodeonemarker),
 }
 
 
 def _readmarkerversion(data):
     return _unpack(b'>B', data[0:1])[0]
 
 
 @util.nogc
 def _readmarkers(data, off=None, stop=None):
     """Read and enumerate markers from raw data"""
     diskversion = _readmarkerversion(data)
     if not off:
         off = 1  # skip 1 byte version number
     if stop is None:
         stop = len(data)
     if diskversion not in formats:
         msg = _(b'parsing obsolete marker: unknown version %r') % diskversion
         raise error.UnknownVersion(msg, version=diskversion)
     return diskversion, formats[diskversion][0](data, off, stop)
 
 
 def encodeheader(version=_fm0version):
     return _pack(b'>B', version)
 
 
 def encodemarkers(markers, addheader=False, version=_fm0version):
     # Kept separate from flushmarkers(), it will be reused for
     # markers exchange.
     encodeone = formats[version][1]
     if addheader:
         yield encodeheader(version)
     for marker in markers:
         yield encodeone(marker)
 
 
 @util.nogc
 def _addsuccessors(successors, markers):
     for mark in markers:
         successors.setdefault(mark[0], set()).add(mark)
 
 
 @util.nogc
 def _addpredecessors(predecessors, markers):
     for mark in markers:
         for suc in mark[1]:
             predecessors.setdefault(suc, set()).add(mark)
 
 
 @util.nogc
 def _addchildren(children, markers):
     for mark in markers:
         parents = mark[5]
         if parents is not None:
             for p in parents:
                 children.setdefault(p, set()).add(mark)
 
 
 def _checkinvalidmarkers(repo, markers):
     """search for marker with invalid data and raise error if needed
 
     Exist as a separated function to allow the evolve extension for a more
     subtle handling.
     """
     for mark in markers:
         if repo.nullid in mark[1]:
             raise error.Abort(
                 _(
                     b'bad obsolescence marker detected: '
                     b'invalid successors nullid'
                 )
             )
 
 
 class obsstore:
     """Store obsolete markers
 
     Markers can be accessed with two mappings:
     - predecessors[x] -> set(markers on predecessors edges of x)
     - successors[x] -> set(markers on successors edges of x)
     - children[x]   -> set(markers on predecessors edges of children(x)
     """
 
     fields = (b'prec', b'succs', b'flag', b'meta', b'date', b'parents')
     # prec:    nodeid, predecessors changesets
     # succs:   tuple of nodeid, successor changesets (0-N length)
     # flag:    integer, flag field carrying modifier for the markers (see doc)
     # meta:    binary blob in UTF-8, encoded metadata dictionary
     # date:    (float, int) tuple, date of marker creation
     # parents: (tuple of nodeid) or None, parents of predecessors
     #          None is used when no data has been recorded
 
     def __init__(self, repo, svfs, defaultformat=_fm1version, readonly=False):
         # caches for various obsolescence related cache
         self.caches = {}
         self.svfs = svfs
         self._repo = weakref.ref(repo)
         self._defaultformat = defaultformat
         self._readonly = readonly
 
     @property
     def repo(self):
         r = self._repo()
         if r is None:
             msg = "using the obsstore of a deallocated repo"
             raise error.ProgrammingError(msg)
         return r
 
     def __iter__(self):
         return iter(self._all)
 
     def __len__(self):
         return len(self._all)
 
     def __nonzero__(self):
         from . import statichttprepo
 
         if isinstance(self.repo, statichttprepo.statichttprepository):
             # If repo is accessed via static HTTP, then we can't use os.stat()
             # to just peek at the file size.
             return len(self._data) > 1
         if not self._cached('_all'):
             try:
                 return self.svfs.stat(b'obsstore').st_size > 1
             except FileNotFoundError:
                 # just build an empty _all list if no obsstore exists, which
                 # avoids further stat() syscalls
                 pass
         return bool(self._all)
 
     __bool__ = __nonzero__
 
     @property
     def readonly(self):
         """True if marker creation is disabled
 
         Remove me in the future when obsolete marker is always on."""
         return self._readonly
 
     def create(
         self,
         transaction,
         prec,
         succs=(),
         flag=0,
         parents=None,
         date=None,
         metadata=None,
         ui=None,
     ):
         """obsolete: add a new obsolete marker
 
         * ensuring it is hashable
         * check mandatory metadata
         * encode metadata
 
         If you are a human writing code creating marker you want to use the
         `createmarkers` function in this module instead.
 
         return True if a new marker have been added, False if the markers
         already existed (no op).
         """
         flag = int(flag)
         if metadata is None:
             metadata = {}
         if date is None:
             if b'date' in metadata:
                 # as a courtesy for out-of-tree extensions
                 date = dateutil.parsedate(metadata.pop(b'date'))
             elif ui is not None:
                 date = ui.configdate(b'devel', b'default-date')
                 if date is None:
                     date = dateutil.makedate()
             else:
                 date = dateutil.makedate()
         if flag & usingsha256:
             if len(prec) != 32:
                 raise ValueError(prec)
             for succ in succs:
                 if len(succ) != 32:
                     raise ValueError(succ)
         else:
             if len(prec) != 20:
                 raise ValueError(prec)
             for succ in succs:
                 if len(succ) != 20:
                     raise ValueError(succ)
         if prec in succs:
             raise ValueError('in-marker cycle with %s' % prec.hex())
 
         metadata = tuple(sorted(metadata.items()))
         for k, v in metadata:
             try:
                 # might be better to reject non-ASCII keys
                 k.decode('utf-8')
                 v.decode('utf-8')
             except UnicodeDecodeError:
                 raise error.ProgrammingError(
                     b'obsstore metadata must be valid UTF-8 sequence '
                     b'(key = %r, value = %r)'
                     % (pycompat.bytestr(k), pycompat.bytestr(v))
                 )
 
         marker = (bytes(prec), tuple(succs), flag, metadata, date, parents)
         return bool(self.add(transaction, [marker]))
 
     def add(self, transaction, markers):
         """Add new markers to the store
 
         Take care of filtering duplicate.
         Return the number of new marker."""
         if self._readonly:
             raise error.Abort(
                 _(b'creating obsolete markers is not enabled on this repo')
             )
         known = set()
         getsuccessors = self.successors.get
         new = []
         for m in markers:
             if m not in getsuccessors(m[0], ()) and m not in known:
                 known.add(m)
                 new.append(m)
         if new:
             f = self.svfs(b'obsstore', b'ab')
             try:
                 offset = f.tell()
                 transaction.add(b'obsstore', offset)
                 # offset == 0: new file - add the version header
                 data = b''.join(encodemarkers(new, offset == 0, self._version))
                 f.write(data)
             finally:
                 # XXX: f.close() == filecache invalidation == obsstore rebuilt.
                 # call 'filecacheentry.refresh()'  here
                 f.close()
             addedmarkers = transaction.changes.get(b'obsmarkers')
             if addedmarkers is not None:
                 addedmarkers.update(new)
             self._addmarkers(new, data)
             # new marker *may* have changed several set. invalidate the cache.
             self.caches.clear()
         # records the number of new markers for the transaction hooks
         previous = int(transaction.hookargs.get(b'new_obsmarkers', b'0'))
         transaction.hookargs[b'new_obsmarkers'] = b'%d' % (previous + len(new))
         return len(new)
 
     def mergemarkers(self, transaction, data):
         """merge a binary stream of markers inside the obsstore
 
         Returns the number of new markers added."""
         version, markers = _readmarkers(data)
         return self.add(transaction, markers)
 
     @propertycache
     def _data(self):
         return self.svfs.tryread(b'obsstore')
 
     @propertycache
     def _version(self):
         if len(self._data) >= 1:
             return _readmarkerversion(self._data)
         else:
             return self._defaultformat
 
     @propertycache
     def _all(self):
         data = self._data
         if not data:
             return []
         self._version, markers = _readmarkers(data)
         markers = list(markers)
         _checkinvalidmarkers(self.repo, markers)
         return markers
 
     @propertycache
     def successors(self):
         successors = {}
         _addsuccessors(successors, self._all)
         return successors
 
     @propertycache
     def predecessors(self):
         predecessors = {}
         _addpredecessors(predecessors, self._all)
         return predecessors
 
     @propertycache
     def children(self):
         children = {}
         _addchildren(children, self._all)
         return children
 
     def _cached(self, attr):
         return attr in self.__dict__
 
     def _addmarkers(self, markers, rawdata):
         markers = list(markers)  # to allow repeated iteration
         self._data = self._data + rawdata
         self._all.extend(markers)
         if self._cached('successors'):
             _addsuccessors(self.successors, markers)
         if self._cached('predecessors'):
             _addpredecessors(self.predecessors, markers)
         if self._cached('children'):
             _addchildren(self.children, markers)
         _checkinvalidmarkers(self.repo, markers)
 
     def relevantmarkers(self, nodes):
         """return a set of all obsolescence markers relevant to a set of nodes.
 
         "relevant" to a set of nodes mean:
 
         - marker that use this changeset as successor
         - prune marker of direct children on this changeset
         - recursive application of the two rules on predecessors of these
           markers
 
         It is a set so you cannot rely on order."""
 
         pendingnodes = set(nodes)
         seenmarkers = set()
         seennodes = set(pendingnodes)
         precursorsmarkers = self.predecessors
         succsmarkers = self.successors
         children = self.children
         while pendingnodes:
             direct = set()
             for current in pendingnodes:
                 direct.update(precursorsmarkers.get(current, ()))
                 pruned = [m for m in children.get(current, ()) if not m[1]]
                 direct.update(pruned)
                 pruned = [m for m in succsmarkers.get(current, ()) if not m[1]]
                 direct.update(pruned)
             direct -= seenmarkers
             pendingnodes = {m[0] for m in direct}
             seenmarkers |= direct
             pendingnodes -= seennodes
             seennodes |= pendingnodes
         return seenmarkers
 
 
 def makestore(ui, repo):
     """Create an obsstore instance from a repo."""
     # read default format for new obsstore.
     # developer config: format.obsstore-version
     defaultformat = ui.configint(b'format', b'obsstore-version')
     # rely on obsstore class default when possible.
     kwargs = {}
     if defaultformat is not None:
         kwargs['defaultformat'] = defaultformat
     readonly = not isenabled(repo, createmarkersopt)
     store = obsstore(repo, repo.svfs, readonly=readonly, **kwargs)
     if store and readonly:
         ui.warn(
             _(b'"obsolete" feature not enabled but %i markers found!\n')
             % len(list(store))
         )
     return store
 
 
 def commonversion(versions):
     """Return the newest version listed in both versions and our local formats.
 
     Returns None if no common version exists.
     """
     versions.sort(reverse=True)
     # search for highest version known on both side
     for v in versions:
         if v in formats:
             return v
     return None
 
 
 # arbitrary picked to fit into 8K limit from HTTP server
 # you have to take in account:
 # - the version header
 # - the base85 encoding
 _maxpayload = 5300
 
 
 def _pushkeyescape(markers):
     """encode markers into a dict suitable for pushkey exchange
 
     - binary data is base85 encoded
     - split in chunks smaller than 5300 bytes"""
     keys = {}
     parts = []
     currentlen = _maxpayload * 2  # ensure we create a new part
     for marker in markers:
         nextdata = _fm0encodeonemarker(marker)
         if len(nextdata) + currentlen > _maxpayload:
             currentpart = []
             currentlen = 0
             parts.append(currentpart)
         currentpart.append(nextdata)
         currentlen += len(nextdata)
     for idx, part in enumerate(reversed(parts)):
         data = b''.join([_pack(b'>B', _fm0version)] + part)
         keys[b'dump%i' % idx] = util.b85encode(data)
     return keys
 
 
 def listmarkers(repo):
     """List markers over pushkey"""
     if not repo.obsstore:
         return {}
     return _pushkeyescape(sorted(repo.obsstore))
 
 
 def pushmarker(repo, key, old, new):
     """Push markers over pushkey"""
     if not key.startswith(b'dump'):
         repo.ui.warn(_(b'unknown key: %r') % key)
         return False
     if old:
         repo.ui.warn(_(b'unexpected old value for %r') % key)
         return False
     data = util.b85decode(new)
     with repo.lock(), repo.transaction(b'pushkey: obsolete markers') as tr:
         repo.obsstore.mergemarkers(tr, data)
         repo.invalidatevolatilesets()
         return True
 
 
 # mapping of 'set-name' -> <function to compute this set>
 cachefuncs = {}
 
 
 def cachefor(name):
     """Decorator to register a function as computing the cache for a set"""
 
     def decorator(func):
         if name in cachefuncs:
             msg = b"duplicated registration for volatileset '%s' (existing: %r)"
             raise error.ProgrammingError(msg % (name, cachefuncs[name]))
         cachefuncs[name] = func
         return func
 
     return decorator
 
 
 def getrevs(repo, name):
     """Return the set of revision that belong to the <name> set
 
     Such access may compute the set and cache it for future use"""
     repo = repo.unfiltered()
     with util.timedcm('getrevs %s', name):
         if not repo.obsstore:
             return frozenset()
         if name not in repo.obsstore.caches:
             repo.obsstore.caches[name] = cachefuncs[name](repo)
         return repo.obsstore.caches[name]
 
 
 # To be simple we need to invalidate obsolescence cache when:
 #
 # - new changeset is added:
 # - public phase is changed
 # - obsolescence marker are added
 # - strip is used a repo
 def clearobscaches(repo):
     """Remove all obsolescence related cache from a repo
 
     This remove all cache in obsstore is the obsstore already exist on the
     repo.
 
     (We could be smarter here given the exact event that trigger the cache
     clearing)"""
     # only clear cache is there is obsstore data in this repo
     if b'obsstore' in repo._filecache:
         repo.obsstore.caches.clear()
 
 
 def _mutablerevs(repo):
     """the set of mutable revision in the repository"""
     return repo._phasecache.getrevset(repo, phases.relevant_mutable_phases)
 
 
 @cachefor(b'obsolete')
 def _computeobsoleteset(repo):
     """the set of obsolete revisions"""
     getnode = repo.changelog.node
     notpublic = _mutablerevs(repo)
     isobs = repo.obsstore.successors.__contains__
     return frozenset(r for r in notpublic if isobs(getnode(r)))
 
 
 @cachefor(b'orphan')
 def _computeorphanset(repo):
     """the set of non obsolete revisions with obsolete parents"""
     pfunc = repo.changelog.parentrevs
     mutable = _mutablerevs(repo)
     obsolete = getrevs(repo, b'obsolete')
     others = mutable - obsolete
     unstable = set()
     for r in sorted(others):
         # A rev is unstable if one of its parent is obsolete or unstable
         # this works since we traverse following growing rev order
         for p in pfunc(r):
             if p in obsolete or p in unstable:
                 unstable.add(r)
                 break
     return frozenset(unstable)
 
 
 @cachefor(b'suspended')
 def _computesuspendedset(repo):
     """the set of obsolete parents with non obsolete descendants"""
     suspended = repo.changelog.ancestors(getrevs(repo, b'orphan'))
     return frozenset(r for r in getrevs(repo, b'obsolete') if r in suspended)
 
 
 @cachefor(b'extinct')
 def _computeextinctset(repo):
     """the set of obsolete parents without non obsolete descendants"""
     return getrevs(repo, b'obsolete') - getrevs(repo, b'suspended')
 
 
 @cachefor(b'phasedivergent')
 def _computephasedivergentset(repo):
     """the set of revs trying to obsolete public revisions"""
     bumped = set()
     # util function (avoid attribute lookup in the loop)
     phase = repo._phasecache.phase  # would be faster to grab the full list
     public = phases.public
     cl = repo.changelog
     torev = cl.index.get_rev
     tonode = cl.node
     obsstore = repo.obsstore
     candidates = sorted(_mutablerevs(repo) - getrevs(repo, b"obsolete"))
     for rev in candidates:
         # We only evaluate mutable, non-obsolete revision
         node = tonode(rev)
         # (future) A cache of predecessors may worth if split is very common
         for pnode in obsutil.allpredecessors(
             obsstore, [node], ignoreflags=bumpedfix
         ):
             prev = torev(pnode)  # unfiltered! but so is phasecache
             if (prev is not None) and (phase(repo, prev) <= public):
                 # we have a public predecessor
                 bumped.add(rev)
                 break  # Next draft!
     return frozenset(bumped)
 
 
 @cachefor(b'contentdivergent')
 def _computecontentdivergentset(repo):
     """the set of rev that compete to be the final successors of some revision."""
     divergent = set()
     obsstore = repo.obsstore
     newermap = {}
     tonode = repo.changelog.node
     candidates = sorted(_mutablerevs(repo) - getrevs(repo, b"obsolete"))
     for rev in candidates:
         node = tonode(rev)
         mark = obsstore.predecessors.get(node, ())
         toprocess = set(mark)
         seen = set()
         while toprocess:
             prec = toprocess.pop()[0]
             if prec in seen:
                 continue  # emergency cycle hanging prevention
             seen.add(prec)
             if prec not in newermap:
                 obsutil.successorssets(repo, prec, cache=newermap)
             newer = [n for n in newermap[prec] if n]
-            if len(newer) > 1:
+            # Strickly speaking, the len(newer) is not needed, but it speeds
+            # things up.
+            if len(newer) > 1 and any(n for n in newer if node not in n):
                 divergent.add(rev)
                 break
             toprocess.update(obsstore.predecessors.get(prec, ()))
     return frozenset(divergent)
 
 
 def makefoldid(relation, user):
 
     folddigest = hashutil.sha1(user)
     for p in relation[0] + relation[1]:
         folddigest.update(b'%d' % p.rev())
         folddigest.update(p.node())
     # Since fold only has to compete against fold for the same successors, it
     # seems fine to use a small ID. Smaller ID save space.
     return hex(folddigest.digest())[:8]
 
 
 def createmarkers(
     repo, relations, flag=0, date=None, metadata=None, operation=None
 ):
     """Add obsolete markers between changesets in a repo
 
     <relations> must be an iterable of ((<old>,...), (<new>, ...)[,{metadata}])
     tuple. `old` and `news` are changectx. metadata is an optional dictionary
     containing metadata for this marker only. It is merged with the global
     metadata specified through the `metadata` argument of this function.
     Any string values in metadata must be UTF-8 bytes.
 
     Trying to obsolete a public changeset will raise an exception.
 
     Current user and date are used except if specified otherwise in the
     metadata attribute.
 
     This function operates within a transaction of its own, but does
     not take any lock on the repo.
     """
     # prepare metadata
     if metadata is None:
         metadata = {}
     if b'user' not in metadata:
         luser = (
             repo.ui.config(b'devel', b'user.obsmarker') or repo.ui.username()
         )
         metadata[b'user'] = encoding.fromlocal(luser)
 
     # Operation metadata handling
     useoperation = repo.ui.configbool(
         b'experimental', b'evolution.track-operation'
     )
     if useoperation and operation:
         metadata[b'operation'] = operation
 
     # Effect flag metadata handling
     saveeffectflag = repo.ui.configbool(
         b'experimental', b'evolution.effect-flags'
     )
 
     with repo.transaction(b'add-obsolescence-marker') as tr:
         markerargs = []
         for rel in relations:
             predecessors = rel[0]
             if not isinstance(predecessors, tuple):
                 # preserve compat with old API until all caller are migrated
                 predecessors = (predecessors,)
             if len(predecessors) > 1 and len(rel[1]) != 1:
                 msg = b'Fold markers can only have 1 successors, not %d'
                 raise error.ProgrammingError(msg % len(rel[1]))
             foldid = None
             foldsize = len(predecessors)
             if 1 < foldsize:
                 foldid = makefoldid(rel, metadata[b'user'])
             for foldidx, prec in enumerate(predecessors, 1):
                 sucs = rel[1]
                 localmetadata = metadata.copy()
                 if len(rel) > 2:
                     localmetadata.update(rel[2])
                 if foldid is not None:
                     localmetadata[b'fold-id'] = foldid
                     localmetadata[b'fold-idx'] = b'%d' % foldidx
                     localmetadata[b'fold-size'] = b'%d' % foldsize
 
                 if not prec.mutable():
                     raise error.Abort(
                         _(b"cannot obsolete public changeset: %s") % prec,
                         hint=b"see 'hg help phases' for details",
                     )
                 nprec = prec.node()
                 nsucs = tuple(s.node() for s in sucs)
                 npare = None
                 if not nsucs:
                     npare = tuple(p.node() for p in prec.parents())
                 if nprec in nsucs:
                     raise error.Abort(
                         _(b"changeset %s cannot obsolete itself") % prec
                     )
 
                 # Effect flag can be different by relation
                 if saveeffectflag:
                     # The effect flag is saved in a versioned field name for
                     # future evolution
                     effectflag = obsutil.geteffectflag(prec, sucs)
                     localmetadata[obsutil.EFFECTFLAGFIELD] = b"%d" % effectflag
 
                 # Creating the marker causes the hidden cache to become
                 # invalid, which causes recomputation when we ask for
                 # prec.parents() above.  Resulting in n^2 behavior.  So let's
                 # prepare all of the args first, then create the markers.
                 markerargs.append((nprec, nsucs, npare, localmetadata))
 
         for args in markerargs:
             nprec, nsucs, npare, localmetadata = args
             repo.obsstore.create(
                 tr,
                 nprec,
                 nsucs,
                 flag,
                 parents=npare,
                 date=date,
                 metadata=localmetadata,
                 ui=repo.ui,
             )
             repo.filteredrevcache.clear()

tests/test-obsmarker-template.t

@@ -1,3193 +1,3190 b''
 This test file test the various templates related to obsmarkers.
 
 Global setup
 ============
 
   $ . $TESTDIR/testlib/obsmarker-common.sh
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > interactive = true
   > [phases]
   > publish=False
   > [experimental]
   > evolution=true
   > evolution.allowdivergence=true
   > [templates]
   > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
   > obsfateverb = "{obsfateverb(successors, markers)}"
   > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
   > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
   > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
   > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
   > [alias]
   > tlog = log -G -T '{node|short}\
   >     \n  Predecessors: {predecessors}\
   >     \n  semi-colon: {join(predecessors, "; ")}\
   >     \n  json: {predecessors|json}\
   >     \n  map: {join(predecessors % "{rev}:{node}", " ")}\
   >     \n  Successors: {successorssets}\
   >     \n  multi-line: {join(successorssets, "\n  multi-line: ")}\
   >     \n  json: {successorssets|json}\n'
   > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}'
   > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers|json}\n")}'
   > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % "  Obsfate: {fate}\n"}")}'
   > EOF
 
 Test templates on amended commit
 ================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-amend
   $ cd $TESTTMP/templates-local-amend
   $ mkcommit ROOT
   $ mkcommit A0
   $ echo 42 >> A0
   $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0"
   $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2
 
   $ hg log --hidden -G
   @  changeset:   3:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | x  changeset:   2:a468dc9b3633
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test2
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:a468dc9b3633
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Check templates
 ---------------
   $ hg up 'desc(A0)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   o  d004c8f274b9
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 3:d004c8f274b9
   |      multi-line: 3:d004c8f274b9
   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  d004c8f274b9
   |
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000);
   o  ea207398892e
   
 
   $ hg fatelogkw
   o  d004c8f274b9
   |
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
   o  ea207398892e
   
 
   $ hg log -G --config command-templates.log=
   o  changeset:   3:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test, test2
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
   $ hg log -G -T "default"
   o  changeset:   3:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test, test2
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ hg up 'desc(A1)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset a468dc9b3633
   (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   o  d004c8f274b9
   |    Predecessors: 2:a468dc9b3633
   |    semi-colon: 2:a468dc9b3633
   |    json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
   |    map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
   |    Successors:
   |    multi-line:
   |    json: []
   | @  a468dc9b3633
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 3:d004c8f274b9
   |      multi-line: 3:d004c8f274b9
   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  d004c8f274b9
   |
   | @  a468dc9b3633
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
   o  ea207398892e
   
 Predecessors template should show all the predecessors as we force their display
 with --hidden
   $ hg tlog --hidden
   o  d004c8f274b9
   |    Predecessors: 2:a468dc9b3633
   |    semi-colon: 2:a468dc9b3633
   |    json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
   |    map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
   |    Successors:
   |    multi-line:
   |    json: []
   | @  a468dc9b3633
   |/     Predecessors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |      Successors: 3:d004c8f274b9
   |      multi-line: 3:d004c8f274b9
   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:a468dc9b3633
   |      multi-line: 2:a468dc9b3633
   |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog --hidden
   o  d004c8f274b9
   |
   | @  a468dc9b3633
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000);
   o  ea207398892e
   
 
 Predecessors template shouldn't show anything as all obsolete commit are not
 visible.
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
   @  d004c8f274b9
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg tlog --hidden
   @  d004c8f274b9
   |    Predecessors: 2:a468dc9b3633
   |    semi-colon: 2:a468dc9b3633
   |    json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
   |    map: 2:a468dc9b36338b14fdb7825f55ce3df4e71517ad
   |    Successors:
   |    multi-line:
   |    json: []
   | x  a468dc9b3633
   |/     Predecessors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |      Successors: 3:d004c8f274b9
   |      multi-line: 3:d004c8f274b9
   |      json: [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:a468dc9b3633
   |      multi-line: 2:a468dc9b3633
   |      json: [["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   @  d004c8f274b9
   |
   o  ea207398892e
   
 
   $ hg fatelog --hidden
   @  d004c8f274b9
   |
   | x  a468dc9b3633
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000);
   o  ea207398892e
   
   $ hg fatelogjson --hidden
   @  d004c8f274b9
   |
   | x  a468dc9b3633
   |/     Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}]
   | x  471f378eab4c
   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}]
   o  ea207398892e
   
 
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   @  d004c8f274b9
   |
   | x  a468dc9b3633
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:a468dc9b3633
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   @  d004c8f274b9
   |
   | x  a468dc9b3633
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:a468dc9b3633
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   @  d004c8f274b9
   |
   | x  a468dc9b3633
   |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
   o  ea207398892e
   
 
   $ hg log -G -T "default" --hidden
   @  changeset:   3:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | x  changeset:   2:a468dc9b3633
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test2
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:a468dc9b3633
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ hg log -G -T "default" --hidden -v
   @  changeset:   3:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  files:       A0
   |  description:
   |  A2
   |
   |
   | x  changeset:   2:a468dc9b3633
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |    files:       A0
   |    description:
   |    A1
   |
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
   |    files:       A0
   |    description:
   |    A0
   |
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      files:       ROOT
      description:
      ROOT
   
   
 Test templates with splitted commit
 ===================================
 
   $ hg init $TESTTMP/templates-local-split
   $ cd $TESTTMP/templates-local-split
   $ mkcommit ROOT
   $ echo 42 >> a
   $ echo 43 >> b
   $ hg commit -A -m "A0"
   adding a
   adding b
   $ hg log --hidden -G
   @  changeset:   1:471597cad322
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 # Simulate split
   $ hg up -r "desc(ROOT)"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo 42 >> a
   $ hg commit -A -m "A0"
   adding a
   created new head
   $ echo 43 >> b
   $ hg commit -A -m "A0"
   adding b
   $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
   @  changeset:   3:f257fde29c7a
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   2:337fec4d2edc
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Check templates
 ---------------
 
   $ hg up 'obsolete()' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471597cad322
   (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   o  f257fde29c7a
   |    Predecessors: 1:471597cad322
   |    semi-colon: 1:471597cad322
   |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]
   |    map: 1:471597cad322d1f659bb169751be9133dad92ef3
   |    Successors:
   |    multi-line:
   |    json: []
   o  337fec4d2edc
   |    Predecessors: 1:471597cad322
   |    semi-colon: 1:471597cad322
   |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]
   |    map: 1:471597cad322d1f659bb169751be9133dad92ef3
   |    Successors:
   |    multi-line:
   |    json: []
   | @  471597cad322
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:337fec4d2edc 3:f257fde29c7a
   |      multi-line: 2:337fec4d2edc 3:f257fde29c7a
   |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  f257fde29c7a
   |
   o  337fec4d2edc
   |
   | @  471597cad322
   |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up f257fde29c7a
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Predecessors template should not show a predecessor as it's not displayed in
 the log
   $ hg tlog
   @  f257fde29c7a
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  337fec4d2edc
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
 Predecessors template should show both predecessors as we force their display
 with --hidden
   $ hg tlog --hidden
   @  f257fde29c7a
   |    Predecessors: 1:471597cad322
   |    semi-colon: 1:471597cad322
   |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]
   |    map: 1:471597cad322d1f659bb169751be9133dad92ef3
   |    Successors:
   |    multi-line:
   |    json: []
   o  337fec4d2edc
   |    Predecessors: 1:471597cad322
   |    semi-colon: 1:471597cad322
   |    json: ["471597cad322d1f659bb169751be9133dad92ef3"]
   |    map: 1:471597cad322d1f659bb169751be9133dad92ef3
   |    Successors:
   |    multi-line:
   |    json: []
   | x  471597cad322
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:337fec4d2edc 3:f257fde29c7a
   |      multi-line: 2:337fec4d2edc 3:f257fde29c7a
   |      json: [["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog --hidden
   @  f257fde29c7a
   |
   o  337fec4d2edc
   |
   | x  471597cad322
   |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg fatelogjson --hidden
   @  f257fde29c7a
   |
   o  337fec4d2edc
   |
   | x  471597cad322
   |/     Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}]
   o  ea207398892e
   
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   @  f257fde29c7a
   |
   o  337fec4d2edc
   |
   | x  471597cad322
   |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   @  f257fde29c7a
   |
   o  337fec4d2edc
   |
   | x  471597cad322
   |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   @  f257fde29c7a
   |
   o  337fec4d2edc
   |
   | x  471597cad322
   |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
 
   $ hg log -G -T "default" --hidden
   @  changeset:   3:f257fde29c7a
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   2:337fec4d2edc
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test templates with folded commit
 =================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-fold
   $ cd $TESTTMP/templates-local-fold
   $ mkcommit ROOT
   $ mkcommit A0
   $ mkcommit B0
   $ hg log --hidden -G
   @  changeset:   2:0dec01379d3b
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     B0
   |
   o  changeset:   1:471f378eab4c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Simulate a fold
   $ hg up -r "desc(ROOT)"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo "A0" > A0
   $ echo "B0" > B0
   $ hg commit -A -m "C0"
   adding A0
   adding B0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
   @  changeset:   3:eb5a0daa2192
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten as 3:eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten as 3:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Check templates
 ---------------
 
   $ hg up 'desc(A0)' --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   o  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 3:eb5a0daa2192
   |      multi-line: 3:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  eb5a0daa2192
   |
   | @  471f378eab4c
   |/     Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(B0)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
 
 Predecessors template should show both predecessors as they should be both
 displayed
   $ hg tlog
   o  eb5a0daa2192
   |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
   |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  0dec01379d3b
   | |    Predecessors:
   | |    semi-colon:
   | |    json: []
   | |    map:
   | |    Successors: 3:eb5a0daa2192
   | |    multi-line: 3:eb5a0daa2192
   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 3:eb5a0daa2192
   |      multi-line: 3:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
   | |    Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(C0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Predecessors template should not show predecessors as they are not displayed in
 the log
   $ hg tlog
   @  eb5a0daa2192
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 Predecessors template should show both predecessors as we force their display
 with --hidden
   $ hg tlog --hidden
   @  eb5a0daa2192
   |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
   |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | x  0dec01379d3b
   | |    Predecessors:
   | |    semi-colon:
   | |    json: []
   | |    map:
   | |    Successors: 3:eb5a0daa2192
   | |    multi-line: 3:eb5a0daa2192
   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 3:eb5a0daa2192
   |      multi-line: 3:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog --hidden
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 
   $ hg fatelogjson --hidden
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
   | |    Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
   | x  471f378eab4c
   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
   o  ea207398892e
   
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:eb5a0daa2192
   | x  471f378eab4c
   |/     Obsfate: rewritten as 3:eb5a0daa2192
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:eb5a0daa2192
   | x  471f378eab4c
   |/     Obsfate: rewritten as 3:eb5a0daa2192
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
   | x  471f378eab4c
   |/     Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
   $ hg log -G -T "default" --hidden
   @  changeset:   3:eb5a0daa2192
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten as 3:eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten as 3:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test templates with divergence
 ==============================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-divergence
   $ cd $TESTTMP/templates-local-divergence
   $ mkcommit ROOT
   $ mkcommit A0
   $ hg commit --amend -m "A1"
   $ hg log --hidden -G
   @  changeset:   2:fdf9bde5129a
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ hg update --hidden 'desc(A0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
   $ hg commit --amend -m "A2"
   2 new content-divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: content-divergent
   |  summary:     A2
   |
   | *  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:fdf9bde5129a
   |    obsolete:    rewritten using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ hg commit --amend -m 'A3'
   $ hg log --hidden -G
   @  changeset:   4:019fadeab383
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: content-divergent
   |  summary:     A3
   |
   | x  changeset:   3:65b757b745b9
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 4:019fadeab383
   |    summary:     A2
   |
   | *  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:fdf9bde5129a
   |    obsolete:    rewritten using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Check templates
 ---------------
 
   $ hg up 'desc(A0)' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' has diverged)
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   *  019fadeab383
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | *  fdf9bde5129a
   |/     Predecessors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |      Successors:
   |      multi-line:
   |      json: []
   | @  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:fdf9bde5129a; 4:019fadeab383
   |      multi-line: 2:fdf9bde5129a
   |      multi-line: 4:019fadeab383
   |      json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
   $ hg fatelog
   *  019fadeab383
   |
   | *  fdf9bde5129a
   |/
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(A1)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Predecessors template should not show predecessors as they are not displayed in
 the log
   $ hg tlog
   *  019fadeab383
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   | @  fdf9bde5129a
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors:
   |      multi-line:
   |      json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   *  019fadeab383
   |
   | @  fdf9bde5129a
   |/
   o  ea207398892e
   
 Predecessors template should the predecessors as we force their display with
 --hidden
   $ hg tlog --hidden
   *  019fadeab383
   |    Predecessors: 3:65b757b745b9
   |    semi-colon: 3:65b757b745b9
   |    json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
   |    map: 3:65b757b745b935093c87a2bccd877521cccffcbd
   |    Successors:
   |    multi-line:
   |    json: []
   | x  65b757b745b9
   |/     Predecessors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |      Successors: 4:019fadeab383
   |      multi-line: 4:019fadeab383
   |      json: [["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]]
   | @  fdf9bde5129a
   |/     Predecessors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   |      json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |      map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |      Successors:
   |      multi-line:
   |      json: []
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:fdf9bde5129a; 3:65b757b745b9
   |      multi-line: 2:fdf9bde5129a
   |      multi-line: 3:65b757b745b9
   |      json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog --hidden
   *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 
   $ hg fatelogjson --hidden
   *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"]}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"]}]
   o  ea207398892e
   
 
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: rewritten using amend as 4:019fadeab383
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a
   |      Obsfate: rewritten using amend as 3:65b757b745b9
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: rewritten using amend as 4:019fadeab383
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a
   |      Obsfate: rewritten using amend as 3:65b757b745b9
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   *  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000)
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000)
   |      Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
   $ hg log -G -T "default" --hidden
   *  changeset:   4:019fadeab383
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: content-divergent
   |  summary:     A3
   |
   | x  changeset:   3:65b757b745b9
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 4:019fadeab383
   |    summary:     A2
   |
   | @  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:fdf9bde5129a
   |    obsolete:    rewritten using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test templates with amended + folded commit
 ===========================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-amend-fold
   $ cd $TESTTMP/templates-local-amend-fold
   $ mkcommit ROOT
   $ mkcommit A0
   $ mkcommit B0
   $ hg commit --amend -m "B1"
   $ hg log --hidden -G
   @  changeset:   3:b7ea6d14e664
   |  tag:         tip
   |  parent:      1:471f378eab4c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     B1
   |
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 # Simulate a fold
   $ hg up -r "desc(ROOT)"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo "A0" > A0
   $ echo "B0" > B0
   $ hg commit -A -m "C0"
   adding A0
   adding B0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
   @  changeset:   4:eb5a0daa2192
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   | x  changeset:   3:b7ea6d14e664
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten as 4:eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    obsolete:    rewritten using amend as 3:b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten as 4:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Check templates
 ---------------
 
   $ hg up 'desc(A0)' --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   o  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 4:eb5a0daa2192
   |      multi-line: 4:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  eb5a0daa2192
   |
   | @  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(B0)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
   (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
 
 Predecessors template should both predecessors as they are visible
   $ hg tlog
   o  eb5a0daa2192
   |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
   |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  0dec01379d3b
   | |    Predecessors:
   | |    semi-colon:
   | |    json: []
   | |    map:
   | |    Successors: 4:eb5a0daa2192
   | |    multi-line: 4:eb5a0daa2192
   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 4:eb5a0daa2192
   |      multi-line: 4:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
   | |    Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(B1)' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset b7ea6d14e664
   (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
 
 Predecessors template should both predecessors as they are visible
   $ hg tlog
   o  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
   |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
   |    Successors:
   |    multi-line:
   |    json: []
   | @  b7ea6d14e664
   | |    Predecessors:
   | |    semi-colon:
   | |    json: []
   | |    map:
   | |    Successors: 4:eb5a0daa2192
   | |    multi-line: 4:eb5a0daa2192
   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 4:eb5a0daa2192
   |      multi-line: 4:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  eb5a0daa2192
   |
   | @  b7ea6d14e664
   | |    Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(C0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Predecessors template should show no predecessors as they are both non visible
   $ hg tlog
   @  eb5a0daa2192
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   @  eb5a0daa2192
   |
   o  ea207398892e
   
 Predecessors template should show all predecessors as we force their display
 with --hidden
   $ hg tlog --hidden
   @  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
   |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 3:b7ea6d14e664bdc8922221f7992631b50da3fb07
   |    Successors:
   |    multi-line:
   |    json: []
   | x  b7ea6d14e664
   | |    Predecessors: 2:0dec01379d3b
   | |    semi-colon: 2:0dec01379d3b
   | |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   | |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   | |    Successors: 4:eb5a0daa2192
   | |    multi-line: 4:eb5a0daa2192
   | |    json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   | | x  0dec01379d3b
   | |/     Predecessors:
   | |      semi-colon:
   | |      json: []
   | |      map:
   | |      Successors: 3:b7ea6d14e664
   | |      multi-line: 3:b7ea6d14e664
   | |      json: [["b7ea6d14e664bdc8922221f7992631b50da3fb07"]]
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 4:eb5a0daa2192
   |      multi-line: 4:eb5a0daa2192
   |      json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog --hidden
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
   | |    Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   | | x  0dec01379d3b
   | |/     Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 
   $ hg fatelogjson --hidden
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
   | |    Obsfate: [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
   | | x  0dec01379d3b
   | |/     Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"]}]
   | x  471f378eab4c
   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}]
   o  ea207398892e
   
 
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
   | |    Obsfate: rewritten as 4:eb5a0daa2192
   | | x  0dec01379d3b
   | |/     Obsfate: rewritten using amend as 3:b7ea6d14e664
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
   | |    Obsfate: rewritten as 4:eb5a0daa2192
   | | x  0dec01379d3b
   | |/     Obsfate: rewritten using amend as 3:b7ea6d14e664
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
   | |    Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
   | | x  0dec01379d3b
   | |/     Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000)
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
   $ hg log -G -T "default" --hidden
   @  changeset:   4:eb5a0daa2192
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   | x  changeset:   3:b7ea6d14e664
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten as 4:eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    obsolete:    rewritten using amend as 3:b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten as 4:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test template with pushed and pulled obs markers
 ================================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-remote-markers-1
   $ cd $TESTTMP/templates-local-remote-markers-1
   $ mkcommit ROOT
   $ mkcommit A0
   $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd $TESTTMP/templates-local-remote-markers-2
   $ hg log --hidden -G
   @  changeset:   1:471f378eab4c
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ cd $TESTTMP/templates-local-remote-markers-1
   $ hg commit --amend -m "A1"
   $ hg commit --amend -m "A2"
   $ hg log --hidden -G
   @  changeset:   3:7a230b46bf61
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | x  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 3:7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ cd $TESTTMP/templates-local-remote-markers-2
   $ hg pull
   pulling from $TESTTMP/templates-local-remote-markers-1
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
   new changesets 7a230b46bf61 (1 drafts)
   (run 'hg heads' to see heads)
   $ hg log --hidden -G
   o  changeset:   2:7a230b46bf61
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
   $ hg debugobsolete
   471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
   fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 7a230b46bf61e50b30308c6cfd7bd1269ef54702 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 
 Check templates
 ---------------
 
 Predecessors template should show current revision as it is the working copy
   $ hg tlog
   o  7a230b46bf61
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:7a230b46bf61
   |      multi-line: 2:7a230b46bf61
   |      json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  7a230b46bf61
   |
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Predecessors template should show no predecessors as they are non visible
   $ hg tlog
   @  7a230b46bf61
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   @  7a230b46bf61
   |
   o  ea207398892e
   
 Predecessors template should show all predecessors as we force their display
 with --hidden
   $ hg tlog --hidden
   @  7a230b46bf61
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | x  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 2:7a230b46bf61
   |      multi-line: 2:7a230b46bf61
   |      json: [["7a230b46bf61e50b30308c6cfd7bd1269ef54702"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog --hidden
   @  7a230b46bf61
   |
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   @  7a230b46bf61
   |
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:7a230b46bf61
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   @  7a230b46bf61
   |
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:7a230b46bf61
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   @  7a230b46bf61
   |
   | x  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
   $ hg log -G -T "default" --hidden
   @  changeset:   2:7a230b46bf61
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test template with obsmarkers cycle
 ===================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-cycle
   $ cd $TESTTMP/templates-local-cycle
   $ mkcommit ROOT
   $ mkcommit A0
   $ mkcommit B0
   $ hg up -r 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit C0
   created new head
 
 Create the cycle
 
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
   1 new obsolescence markers
 
 Check templates
 ---------------
 
   $ hg tlog
   @  f897c6137566
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   @  f897c6137566
   |
   o  ea207398892e
   
 
   $ hg up -r "desc(B0)" --hidden
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 0dec01379d3b
   (hidden revision '0dec01379d3b' is pruned)
   $ hg tlog
   o  f897c6137566
   |    Predecessors: 2:0dec01379d3b
   |    semi-colon: 2:0dec01379d3b
   |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   |    Successors:
   |    multi-line:
   |    json: []
   | @  0dec01379d3b
   | |    Predecessors: 1:471f378eab4c
   | |    semi-colon: 1:471f378eab4c
   | |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   | |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   | |    Successors: 3:f897c6137566; 1:471f378eab4c
   | |    multi-line: 3:f897c6137566
   | |    multi-line: 1:471f378eab4c
   | |    json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
   | x  471f378eab4c
   |/     Predecessors: 2:0dec01379d3b
   |      semi-colon: 2:0dec01379d3b
   |      json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   |      map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   |      Successors: 2:0dec01379d3b
   |      multi-line: 2:0dec01379d3b
   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  f897c6137566
   |
   | @  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 
   $ hg up -r "desc(A0)" --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg tlog
   o  f897c6137566
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   |    Successors:
   |    multi-line:
   |    json: []
   | @  471f378eab4c
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors:
   |      multi-line:
   |      json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  f897c6137566
   |
   | @  471f378eab4c
   |/     Obsfate: pruned;
   o  ea207398892e
   
 
   $ hg up -r "desc(ROOT)" --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg tlog
   o  f897c6137566
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   @  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
   o  f897c6137566
   |
   @  ea207398892e
   
 
   $ hg tlog --hidden
   o  f897c6137566
   |    Predecessors: 2:0dec01379d3b
   |    semi-colon: 2:0dec01379d3b
   |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   |    Successors:
   |    multi-line:
   |    json: []
   | x  0dec01379d3b
   | |    Predecessors: 1:471f378eab4c
   | |    semi-colon: 1:471f378eab4c
   | |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   | |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   | |    Successors: 3:f897c6137566; 1:471f378eab4c
   | |    multi-line: 3:f897c6137566
   | |    multi-line: 1:471f378eab4c
   | |    json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
   | x  471f378eab4c
   |/     Predecessors: 2:0dec01379d3b
   |      semi-colon: 2:0dec01379d3b
   |      json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   |      map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   |      Successors: 2:0dec01379d3b
   |      multi-line: 2:0dec01379d3b
   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
   @  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566
   | |    Obsfate: rewritten as 1:471f378eab4c
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b
   @  ea207398892e
   
   $ hg fatelogkw --hidden
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566
   | |    Obsfate: rewritten as 1:471f378eab4c
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b
   @  ea207398892e
   
   $ hg fatelogkw --hidden -v
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000)
   | |    Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000)
   @  ea207398892e
   
   $ hg log -G -T "default" --hidden
   o  changeset:   3:f897c6137566
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten as 3:f897c6137566
   | |  obsolete:    rewritten as 1:471f378eab4c
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten as 2:0dec01379d3b
   |    summary:     A0
   |
   @  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test template with split + divergence with cycles
 =================================================
 
   $ hg log -G
   o  changeset:   3:f897c6137566
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   @  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Create a commit with three files
   $ touch A B C
   $ hg commit -A -m "Add A,B,C" A B C
 
 Split it
   $ hg up 3
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ touch A
   $ hg commit -A -m "Add A,B,C" A
   created new head
 
   $ touch B
   $ hg commit -A -m "Add A,B,C" B
 
   $ touch C
   $ hg commit -A -m "Add A,B,C" C
 
   $ hg log -G
   @  changeset:   7:ba2ed02b0c9a
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add A,B,C
   |
   o  changeset:   6:4a004186e638
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add A,B,C
   |
   o  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add A,B,C
   |
   | o  changeset:   4:9bd10a0775e4
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     Add A,B,C
   |
   o  changeset:   3:f897c6137566
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
   $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G
   @  changeset:   7:ba2ed02b0c9a
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add A,B,C
   |
   o  changeset:   6:4a004186e638
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add A,B,C
   |
   o  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Add A,B,C
   |
   o  changeset:   3:f897c6137566
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Diverge one of the splitted commit
 
   $ hg up 6
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend -m "Add only B"
   1 new orphan changesets
 
   $ hg up 6 --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg commit --amend -m "Add B only"
-  4 new content-divergent changesets
+  2 new content-divergent changesets
 
   $ hg log -G
   @  changeset:   9:0b997eb7ceee
   |  tag:         tip
   |  parent:      5:dd800401bd8c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: content-divergent
   |  summary:     Add B only
   |
   | *  changeset:   8:b18bc8331526
   |/   parent:      5:dd800401bd8c
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     Add only B
   |
   | *  changeset:   7:ba2ed02b0c9a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan, content-divergent
+  | |  instability: orphan
   | |  summary:     Add A,B,C
   | |
   | x  changeset:   6:4a004186e638
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 8:b18bc8331526
   |    obsolete:    rewritten using amend as 9:0b997eb7ceee
   |    summary:     Add A,B,C
   |
-  *  changeset:   5:dd800401bd8c
+  o  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
   |  summary:     Add A,B,C
   |
   o  changeset:   3:f897c6137566
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Check templates
 ---------------
 
   $ hg tlog
   @  0b997eb7ceee
   |    Predecessors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
   |    json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
   |    map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
   |    Successors:
   |    multi-line:
   |    json: []
   | *  b18bc8331526
   |/     Predecessors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
   |      json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
   |      map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
   |      Successors:
   |      multi-line:
   |      json: []
   | *  ba2ed02b0c9a
   | |    Predecessors:
   | |    semi-colon:
   | |    json: []
   | |    map:
   | |    Successors:
   | |    multi-line:
   | |    json: []
   | x  4a004186e638
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 8:b18bc8331526; 9:0b997eb7ceee
   |      multi-line: 8:b18bc8331526
   |      multi-line: 9:0b997eb7ceee
   |      json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  f897c6137566
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
   $ hg fatelog
   @  0b997eb7ceee
   |
   | *  b18bc8331526
   |/
   | *  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   o  f897c6137566
   |
   o  ea207398892e
   
   $ hg tlog --hidden
   @  0b997eb7ceee
   |    Predecessors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
   |    json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
   |    map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
   |    Successors:
   |    multi-line:
   |    json: []
   | *  b18bc8331526
   |/     Predecessors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
   |      json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
   |      map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
   |      Successors:
   |      multi-line:
   |      json: []
   | *  ba2ed02b0c9a
   | |    Predecessors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
   | |    json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   | |    map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   | |    Successors:
   | |    multi-line:
   | |    json: []
   | x  4a004186e638
   |/     Predecessors: 4:9bd10a0775e4
   |      semi-colon: 4:9bd10a0775e4
   |      json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   |      map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   |      Successors: 8:b18bc8331526; 9:0b997eb7ceee
   |      multi-line: 8:b18bc8331526
   |      multi-line: 9:0b997eb7ceee
   |      json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Predecessors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   |    json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   |    map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   |    Successors:
   |    multi-line:
   |    json: []
   | x  9bd10a0775e4
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
   |      multi-line: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
   |      json: [["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]]
   o  f897c6137566
   |    Predecessors: 2:0dec01379d3b
   |    semi-colon: 2:0dec01379d3b
   |    json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   |    map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   |    Successors:
   |    multi-line:
   |    json: []
   | x  0dec01379d3b
   | |    Predecessors: 1:471f378eab4c
   | |    semi-colon: 1:471f378eab4c
   | |    json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
   | |    map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
   | |    Successors: 3:f897c6137566; 1:471f378eab4c
   | |    multi-line: 3:f897c6137566
   | |    multi-line: 1:471f378eab4c
   | |    json: [["f897c6137566320b081514b4c7227ecc3d384b39"], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]
   | x  471f378eab4c
   |/     Predecessors: 2:0dec01379d3b
   |      semi-colon: 2:0dec01379d3b
   |      json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
   |      map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
   |      Successors: 2:0dec01379d3b
   |      multi-line: 2:0dec01379d3b
   |      json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]]
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
   $ hg fatelog --hidden
   @  0b997eb7ceee
   |
   | *  b18bc8331526
   |/
   | *  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | x  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000); rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000);
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg fatelogjson --hidden
   @  0b997eb7ceee
   |
   | *  b18bc8331526
   |/
   | *  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | x  9bd10a0775e4
   |/     Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
   | x  471f378eab4c
   |/     Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
   o  ea207398892e
   
   $ hg up --hidden 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 9bd10a0775e4
   (hidden revision '9bd10a0775e4' has diverged)
   $ hg rebase -r 7 -d 8 --config extensions.rebase=
   rebasing 7:ba2ed02b0c9a "Add A,B,C"
   $ hg tlog
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |    Predecessors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   |    json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   |    map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   |    Successors:
   |    multi-line:
   |    json: []
   | *  0b997eb7ceee
   | |    Predecessors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
   | |    json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   | |    map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   | |    Successors:
   | |    multi-line:
   | |    json: []
   * |  b18bc8331526
   |/     Predecessors: 4:9bd10a0775e4
   |      semi-colon: 4:9bd10a0775e4
   |      json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   |      map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   |      Successors:
   |      multi-line:
   |      json: []
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Predecessors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   |    json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
   |    map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
   |    Successors:
   |    multi-line:
   |    json: []
   | @  9bd10a0775e4
   |/     Predecessors:
   |      semi-colon:
   |      json: []
   |      map:
   |      Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
   |      multi-line: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc
   |      multi-line: 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
   |      json: [["dd800401bd8c79d815329277739e433e883f784e", "0b997eb7ceeee06200a02f8aab185979092d514e", "eceed8f98ffc4186032e29a6542ab98888ebf68d"], ["dd800401bd8c79d815329277739e433e883f784e", "b18bc8331526a22cbb1801022bd1555bf291c48b", "eceed8f98ffc4186032e29a6542ab98888ebf68d"]]
   o  f897c6137566
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
   $ hg fatelog
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |
   | *  0b997eb7ceee
   | |
   * |  b18bc8331526
   |/
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | @  9bd10a0775e4
   |/     Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
   o  f897c6137566
   |
   o  ea207398892e
   
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |
   | *  0b997eb7ceee
   | |
   * |  b18bc8331526
   |/
   | x  ba2ed02b0c9a
   | |    Obsfate: rewritten using rebase as 10:eceed8f98ffc
   | x  4a004186e638
   |/     Obsfate: rewritten using amend as 8:b18bc8331526
   |      Obsfate: rewritten using amend as 9:0b997eb7ceee
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | @  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566
   | |    Obsfate: rewritten as 1:471f378eab4c
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b
   o  ea207398892e
   
   $ hg fatelogkw --hidden
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |
   | *  0b997eb7ceee
   | |
   * |  b18bc8331526
   |/
   | x  ba2ed02b0c9a
   | |    Obsfate: rewritten using rebase as 10:eceed8f98ffc
   | x  4a004186e638
   |/     Obsfate: rewritten using amend as 8:b18bc8331526
   |      Obsfate: rewritten using amend as 9:0b997eb7ceee
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | @  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566
   | |    Obsfate: rewritten as 1:471f378eab4c
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |
   | *  0b997eb7ceee
   | |
   * |  b18bc8331526
   |/
   | x  ba2ed02b0c9a
   | |    Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000)
   | x  4a004186e638
   |/     Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000)
   |      Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000)
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | @  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000)
   o  f897c6137566
   |
   | x  0dec01379d3b
   | |    Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000)
   | |    Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
   | x  471f378eab4c
   |/     Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
   $ hg log -G -T "default" --hidden
-  *  changeset:   10:eceed8f98ffc
+  o  changeset:   10:eceed8f98ffc
   |  tag:         tip
   |  parent:      8:b18bc8331526
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
   |  summary:     Add A,B,C
   |
   | *  changeset:   9:0b997eb7ceee
   | |  parent:      5:dd800401bd8c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: content-divergent
   | |  summary:     Add B only
   | |
   * |  changeset:   8:b18bc8331526
   |/   parent:      5:dd800401bd8c
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     Add only B
   |
   | x  changeset:   7:ba2ed02b0c9a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten using rebase as 10:eceed8f98ffc
   | |  summary:     Add A,B,C
   | |
   | x  changeset:   6:4a004186e638
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 8:b18bc8331526
   |    obsolete:    rewritten using amend as 9:0b997eb7ceee
   |    summary:     Add A,B,C
   |
-  *  changeset:   5:dd800401bd8c
+  o  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
   |  summary:     Add A,B,C
   |
   | @  changeset:   4:9bd10a0775e4
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
   |    summary:     Add A,B,C
   |
   o  changeset:   3:f897c6137566
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  obsolete:    rewritten as 3:f897c6137566
   | |  obsolete:    rewritten as 1:471f378eab4c
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten as 2:0dec01379d3b
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test templates with pruned commits
 ==================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/templates-local-prune
   $ cd $TESTTMP/templates-local-prune
   $ mkcommit ROOT
   $ mkcommit A0
   $ hg debugobsolete --record-parent `getid "."`
   1 new obsolescence markers
   obsoleted 1 changesets
 
 Check output
 ------------
 
   $ hg up "desc(A0)" --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
   @  471f378eab4c
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
   $ hg fatelog
   @  471f378eab4c
   |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 Test templates with multiple pruned commits
 ===========================================
 
 Test setup
 ----------
 
   $ hg init $TESTTMP/multiple-local-prune
   $ cd $TESTTMP/multiple-local-prune
   $ mkcommit ROOT
   $ mkcommit A0
   $ hg commit --amend -m "A1"
   $ hg debugobsolete --record-parent `getid "."`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg up -r "desc(A0)" --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' is pruned)
   $ hg commit --amend -m "A2"
   $ hg debugobsolete --record-parent `getid "."`
   1 new obsolescence markers
   obsoleted 1 changesets
 
 Check output
 ------------
 
   $ hg up "desc(A0)" --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471f378eab4c
   (hidden revision '471f378eab4c' is pruned)
   $ hg tlog
   @  471f378eab4c
   |    Predecessors:
   |    semi-colon:
   |    json: []
   |    map:
   |    Successors:
   |    multi-line:
   |    json: []
   o  ea207398892e
        Predecessors:
        semi-colon:
        json: []
        map:
        Successors:
        multi-line:
        json: []
 
 # todo: the obsfate output is not ideal
   $ hg fatelog
   @  471f378eab4c
   |    Obsfate: pruned;
   o  ea207398892e
   
   $ hg fatelog --hidden
   x  65b757b745b9
   |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
   | x  fdf9bde5129a
   |/     Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   x  65b757b745b9
   |    Obsfate: pruned
   | x  fdf9bde5129a
   |/     Obsfate: pruned
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a
   |      Obsfate: rewritten using amend as 3:65b757b745b9
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   x  65b757b745b9
   |    Obsfate: pruned
   | x  fdf9bde5129a
   |/     Obsfate: pruned
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a
   |      Obsfate: rewritten using amend as 3:65b757b745b9
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   x  65b757b745b9
   |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
   | x  fdf9bde5129a
   |/     Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
   | @  471f378eab4c
   |/     Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000)
   |      Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
 
   $ hg log -G -T "default" --hidden
   x  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  obsolete:    pruned
   |  summary:     A2
   |
   | x  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    pruned
   |    summary:     A1
   |
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    rewritten using amend as 2:fdf9bde5129a
   |    obsolete:    rewritten using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Check that {negrev} shows usable negative revisions despite hidden commits
 
   $ hg log -G -T "{negrev}\n"
   @  -3
   |
   o  -4
   
 
   $ hg log -G -T "{negrev}\n" --hidden
   x  -1
   |
   | x  -2
   |/
   | @  -3
   |/
   o  -4
   
 
 Test templates with splitted and pruned commit
 ==============================================
 
   $ hg init $TESTTMP/templates-local-split-prune
   $ cd $TESTTMP/templates-local-split-prune
   $ mkcommit ROOT
   $ echo 42 >> a
   $ echo 43 >> b
   $ hg commit -A -m "A0"
   adding a
   adding b
   $ hg log --hidden -G
   @  changeset:   1:471597cad322
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 # Simulate split
   $ hg up -r "desc(ROOT)"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo 42 >> a
   $ hg commit -A -m "A1"
   adding a
   created new head
   $ echo 43 >> b
   $ hg commit -A -m "A2"
   adding b
   $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
   1 new obsolescence markers
   obsoleted 1 changesets
 
 # Simulate prune
   $ hg debugobsolete --record-parent `getid "."`
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
   @  changeset:   3:0d0ef4bdf70e
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  obsolete:    pruned
   |  summary:     A2
   |
   o  changeset:   2:617adc3a144c
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A1
   |
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    split as 2:617adc3a144c, 3:0d0ef4bdf70e
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 Check templates
 ---------------
 
   $ hg up 'desc("A0")' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 471597cad322
   (hidden revision '471597cad322' was rewritten as: 617adc3a144c)
 
 # todo: the obsfate output is not ideal
   $ hg fatelog
   o  617adc3a144c
   |
   | @  471597cad322
   |/     Obsfate: rewritten as 2:617adc3a144c by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg up -r 'desc("A2")' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 0d0ef4bdf70e
   (hidden revision '0d0ef4bdf70e' is pruned)
 
   $ hg fatelog --hidden
   @  0d0ef4bdf70e
   |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
   o  617adc3a144c
   |
   | x  471597cad322
   |/     Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
 
 Check other fatelog implementations
 -----------------------------------
 
   $ hg fatelogkw --hidden -q
   @  0d0ef4bdf70e
   |    Obsfate: pruned
   o  617adc3a144c
   |
   | x  471597cad322
   |/     Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
   o  ea207398892e
   
   $ hg fatelogkw --hidden
   @  0d0ef4bdf70e
   |    Obsfate: pruned
   o  617adc3a144c
   |
   | x  471597cad322
   |/     Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e
   o  ea207398892e
   
   $ hg fatelogkw --hidden -v
   @  0d0ef4bdf70e
   |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
   o  617adc3a144c
   |
   | x  471597cad322
   |/     Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000)
   o  ea207398892e
   
   $ hg log -G -T "default" --hidden
   @  changeset:   3:0d0ef4bdf70e
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  obsolete:    pruned
   |  summary:     A2
   |
   o  changeset:   2:617adc3a144c
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A1
   |
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    obsolete:    split as 2:617adc3a144c, 3:0d0ef4bdf70e
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
 
 Test metadata encoding (issue5754)
 ==================================
 
   $ hg init $TESTTMP/metadata-encoding
   $ cd $TESTTMP/metadata-encoding
   $ cat <<'EOF' >> .hg/hgrc
   > [extensions]
   > amend =
   > EOF
   $ "$PYTHON" <<'EOF'
   > with open('test1', 'wb') as f:
   >    f.write(b't\xe8st1') and None
   > with open('test2', 'wb') as f:
   >    f.write(b't\xe8st2') and None
   > EOF
   $ mkcommit ROOT
   $ ( HGENCODING=latin-1 HGUSER="`cat test1`" mkcommit A0 )
   $ echo 42 >> A0
   $ HGENCODING=latin-1 hg amend -m "A1" --note "`cat test2`"
   $ HGENCODING=latin-1 hg amend -m "A2" \
   > --config devel.user.obsmarker="`cat test2`"
   $ mkcommit B0
   $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`"
   1 new obsolescence markers
   obsoleted 1 changesets
 
 metadata should be stored in UTF-8, and debugobsolete doesn't decode it to
 local encoding since the command is supposed to show unmodified content:
 
   $ HGENCODING=latin-1 hg debugobsolete
   5f66a482f0bb2fcaccfc215554ad5eb9f40b50f5 718c0d00cee1429bdb73064e0d88908c601507a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'note': 't\xc3\xa8st2', 'operation': 'amend', 'user': 'test'}
   718c0d00cee1429bdb73064e0d88908c601507a8 1132562159b35bb27e1d6b80c80ee94a1659a4da 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 't\xc3\xa8st2'}
   8f82db6f991db367fdbb3b6dba5e187ecc3ebd96 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 't\xc3\xa8st2'}
 
 metadata should be converted back to local encoding when displaying:
 
   $ HGENCODING=latin-1 hg fatelog --hidden
   @  8f82db6f991d
   |    Obsfate: pruned by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc)
   o  1132562159b3
   |
   | x  718c0d00cee1
   |/     Obsfate: rewritten using amend as 3:1132562159b3 by t\xe8st2 (at 1970-01-01 00:00 +0000); (esc)
   | x  5f66a482f0bb
   |/     Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ HGENCODING=utf-8 hg fatelog --hidden
   @  8f82db6f991d
   |    Obsfate: pruned by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc)
   o  1132562159b3
   |
   | x  718c0d00cee1
   |/     Obsfate: rewritten using amend as 3:1132562159b3 by t\xc3\xa8st2 (at 1970-01-01 00:00 +0000); (esc)
   | x  5f66a482f0bb
   |/     Obsfate: rewritten using amend as 2:718c0d00cee1 by test (at 1970-01-01 00:00 +0000);
   o  ea207398892e
   
   $ hg log -G -T "{negrev}\n"
   @  -1
   |
   o  -2
   |
   o  -5
   

tests/test-obsolete-divergent.t

@@ -1,798 +1,848 b''
 Test file dedicated to testing the divergent troubles from obsolete changeset.
 
 This is the most complex troubles from far so we isolate it in a dedicated
 file.
 
 Enable obsolete
 
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n
   > [experimental]
   > evolution.createmarkers=True
   > [extensions]
   > drawdag=$TESTDIR/drawdag.py
   > [alias]
   > debugobsolete = debugobsolete -d '0 0'
   > [phases]
   > publish=False
   > [templates]
   > wuentryshort = '{instability}:{if(divergentnodes, " ")}{divergentnodes} {reason} {node|shortest}\n'
   > whyunstableshort = '{whyunstable % wuentryshort}'
   > wuentryshorter = '{instability}:{divergentnodes % " {node|shortest} ({phase})"} {reason} {node|shortest}\n'
   > whyunstableshorter = '{whyunstable % wuentryshorter}'
   > EOF
 
 
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    hg ci -m "$1"
   > }
   $ getid() {
   >    hg log --hidden -r "desc('$1')" -T '{node}\n'
   > }
 
 setup repo
 
   $ hg init reference
   $ cd reference
   $ mkcommit base
   $ mkcommit A_0
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_1
   created new head
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_2
   created new head
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cd ..
 
 
   $ newcase() {
   >    hg clone -u 0 -q reference $1
   >    cd $1
   > }
 
 direct divergence
 -----------------
 
 A_1 have two direct and divergent successors A_1 and A_1
 
   $ newcase direct
   $ hg debugobsolete `getid A_0` `getid A_1`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_2`
   1 new obsolescence markers
   2 new content-divergent changesets
   $ hg log -G --hidden
   *  3:392fd25390da A_2
   |
   | *  2:82623d38b9ba A_1
   |/
   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   |/
   @  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ hg log -r 'contentdivergent()'
   2:82623d38b9ba A_1
   3:392fd25390da A_2
   $ hg log -r 'unstable()'
   2:82623d38b9ba A_1
   3:392fd25390da A_2
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
 
 check that mercurial refuse to push
 
   $ hg init ../other
   $ hg push ../other
   pushing to ../other
   searching for changes
   abort: push includes content-divergent changeset: 392fd25390da!
   [255]
 
   $ cd ..
 
 
 indirect divergence with known changeset
 -------------------------------------------
 
   $ newcase indirect_known
   $ hg debugobsolete `getid A_0` `getid A_1`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_2`
   1 new obsolescence markers
   2 new content-divergent changesets
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_2` `getid A_3`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  4:01f36c5a8fda A_3
   |
   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
   |/
   | *  2:82623d38b9ba A_1
   |/
   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   |/
   o  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       01f36c5a8fda
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       01f36c5a8fda
   01f36c5a8fda
       01f36c5a8fda
   $ hg log -r 'contentdivergent()'
   2:82623d38b9ba A_1
   4:01f36c5a8fda A_3
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   82623d38b9ba
       82623d38b9ba
   01f36c5a8fda
       01f36c5a8fda
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   01f36c5a8fda
       01f36c5a8fda
   $ cd ..
 
 
 indirect divergence with known changeset
 -------------------------------------------
 
   $ newcase indirect_unknown
   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
   1 new obsolescence markers
   $ hg debugobsolete `getid A_0` `getid A_2`
   1 new obsolescence markers
   2 new content-divergent changesets
   $ hg log -G --hidden
   *  3:392fd25390da A_2
   |
   | *  2:82623d38b9ba A_1
   |/
   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   |/
   @  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ hg log -r 'contentdivergent()'
   2:82623d38b9ba A_1
   3:392fd25390da A_2
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ cd ..
 
 do not take unknown node in account if they are final
 -----------------------------------------------------
 
   $ newcase final-unknown
   $ hg debugobsolete `getid A_0` `getid A_1`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_1` `getid A_2`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   1 new obsolescence markers
   $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
   1 new obsolescence markers
   $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
   1 new obsolescence markers
 
   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   007dc284c1f8
       392fd25390da
   $ hg debugsuccessorssets 'desc('A_0')' --closest
   $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden
   007dc284c1f8
       82623d38b9ba
 
   $ cd ..
 
 divergence that converge again is not divergence anymore
 -----------------------------------------------------
 
   $ newcase converged_divergence
   $ hg debugobsolete `getid A_0` `getid A_1`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_2`
   1 new obsolescence markers
   2 new content-divergent changesets
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_1` `getid A_3`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_2` `getid A_3`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  4:01f36c5a8fda A_3
   |
   | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
   |/
   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
   |/
   | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
   |/
   o  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       01f36c5a8fda
   82623d38b9ba
       01f36c5a8fda
   392fd25390da
       01f36c5a8fda
   01f36c5a8fda
       01f36c5a8fda
   $ hg log -r 'contentdivergent()'
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   01f36c5a8fda
       01f36c5a8fda
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba
       392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   01f36c5a8fda
       01f36c5a8fda
   $ cd ..
 
 split is not divergences
 -----------------------------
 
   $ newcase split
   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   o  3:392fd25390da A_2
   |
   | o  2:82623d38b9ba A_1
   |/
   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
   |/
   @  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba 392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ hg log -r 'contentdivergent()'
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba 392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
 
 Even when subsequent rewriting happen
 
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_1` `getid A_3`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_4
   created new head
   $ hg debugobsolete `getid A_2` `getid A_4`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_5
   created new head
   $ hg debugobsolete `getid A_4` `getid A_5`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  6:e442cfc57690 A_5
   |
   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
   |/
   | o  4:01f36c5a8fda A_3
   |/
   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
   |/
   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
   |/
   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
   |/
   o  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       01f36c5a8fda e442cfc57690
   82623d38b9ba
       01f36c5a8fda
   392fd25390da
       e442cfc57690
   01f36c5a8fda
       01f36c5a8fda
   6a411f0d7a0a
       e442cfc57690
   e442cfc57690
       e442cfc57690
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   01f36c5a8fda
       01f36c5a8fda
   e442cfc57690
       e442cfc57690
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba 392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   01f36c5a8fda
       01f36c5a8fda
   6a411f0d7a0a
       e442cfc57690
   e442cfc57690
       e442cfc57690
   $ hg log -r 'contentdivergent()'
 
 Check more complex obsolescence graft (with divergence)
 
   $ mkcommit B_0; hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg debugobsolete `getid B_0` `getid A_2`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ mkcommit A_7; hg up 0
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_8; hg up 0
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ mkcommit A_9; hg up 0
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid A_5` `getid A_9`
   1 new obsolescence markers
-  4 new content-divergent changesets
+  3 new content-divergent changesets
   $ hg log -G --hidden
   *  10:bed64f5d2f5a A_9
   |
   | *  9:14608b260df8 A_8
   |/
   | *  8:7ae126973a96 A_7
   |/
   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
   | |
   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8]
   |/
   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
   |/
-  | *  4:01f36c5a8fda A_3
+  | o  4:01f36c5a8fda A_3
   |/
   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
   |/
   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
   |/
   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
   |/
   @  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       01f36c5a8fda bed64f5d2f5a
       01f36c5a8fda 7ae126973a96 14608b260df8
   82623d38b9ba
       01f36c5a8fda
   392fd25390da
       bed64f5d2f5a
       7ae126973a96 14608b260df8
   01f36c5a8fda
       01f36c5a8fda
   6a411f0d7a0a
       bed64f5d2f5a
       7ae126973a96 14608b260df8
   e442cfc57690
       bed64f5d2f5a
       7ae126973a96 14608b260df8
   3750ebee865d
       bed64f5d2f5a
       7ae126973a96 14608b260df8
   7ae126973a96
       7ae126973a96
   14608b260df8
       14608b260df8
   bed64f5d2f5a
       bed64f5d2f5a
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   01f36c5a8fda
       01f36c5a8fda
   7ae126973a96
       7ae126973a96
   14608b260df8
       14608b260df8
   bed64f5d2f5a
       bed64f5d2f5a
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba 392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   01f36c5a8fda
       01f36c5a8fda
   6a411f0d7a0a
       e442cfc57690
   e442cfc57690
       e442cfc57690
   3750ebee865d
       392fd25390da
   7ae126973a96
       7ae126973a96
   14608b260df8
       14608b260df8
   bed64f5d2f5a
       bed64f5d2f5a
   $ hg log -r 'contentdivergent()'
-  4:01f36c5a8fda A_3
   8:7ae126973a96 A_7
   9:14608b260df8 A_8
   10:bed64f5d2f5a A_9
 
   $ hg log -r bed64f5d2f5a -T '{whyunstable}\n' | sort
   content-divergent: 4:01f36c5a8fda (draft) 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor 007dc284c1f8
   content-divergent: 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor e442cfc57690
   $ hg log -r bed64f5d2f5a -T whyunstableshort | sort
   content-divergent: 4:01f36c5a8fda (draft) 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor 007d
   content-divergent: 8:7ae126973a96 (draft) 9:14608b260df8 (draft) predecessor e442
   $ hg log -r bed64f5d2f5a -T whyunstableshorter | sort
   content-divergent: 01f3 (draft) 7ae1 (draft) 1460 (draft) predecessor 007d
   content-divergent: 7ae1 (draft) 1460 (draft) predecessor e442
 
 fix the divergence
 
   $ mkcommit A_A; hg up 0
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid A_9` `getid A_A`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_7` `getid A_A`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_8` `getid A_A`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   o  11:a139f71be9da A_A
   |
   | x  10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da]
   |/
   | x  9:14608b260df8 A_8 [rewritten as 11:a139f71be9da]
   |/
   | x  8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da]
   |/
   | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
   | |
   | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8]
   |/
   | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
   |/
   | o  4:01f36c5a8fda A_3
   |/
   | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
   |/
   | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
   |/
   | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
   |/
   @  0:d20a80d4def3 base
   
   $ hg debugsuccessorssets --hidden 'all()'
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       01f36c5a8fda a139f71be9da
   82623d38b9ba
       01f36c5a8fda
   392fd25390da
       a139f71be9da
   01f36c5a8fda
       01f36c5a8fda
   6a411f0d7a0a
       a139f71be9da
   e442cfc57690
       a139f71be9da
   3750ebee865d
       a139f71be9da
   7ae126973a96
       a139f71be9da
   14608b260df8
       a139f71be9da
   bed64f5d2f5a
       a139f71be9da
   a139f71be9da
       a139f71be9da
   $ hg debugsuccessorssets 'all()' --closest
   d20a80d4def3
       d20a80d4def3
   01f36c5a8fda
       01f36c5a8fda
   a139f71be9da
       a139f71be9da
   $ hg debugsuccessorssets 'all()' --closest --hidden
   d20a80d4def3
       d20a80d4def3
   007dc284c1f8
       82623d38b9ba 392fd25390da
   82623d38b9ba
       82623d38b9ba
   392fd25390da
       392fd25390da
   01f36c5a8fda
       01f36c5a8fda
   6a411f0d7a0a
       e442cfc57690
   e442cfc57690
       e442cfc57690
   3750ebee865d
       392fd25390da
   7ae126973a96
       a139f71be9da
   14608b260df8
       a139f71be9da
   bed64f5d2f5a
       a139f71be9da
   a139f71be9da
       a139f71be9da
   $ hg log -r 'contentdivergent()'
 
 #if serve
 
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \
   >   -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 check an obsolete changeset that was rewritten and also split
 
   $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | grep -E 'rewritten|split'
    <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br>
   split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
   $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | grep -E 'rewritten|split'
    <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br>
   split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
   $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | grep -E 'rewritten|split'
   <td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
   <td>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
   $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | grep -E 'rewritten|split'
   <dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd>
   <dd>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd>
   $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | grep -E 'rewritten|split'
   <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
   <td class="obsolete">split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
 
   $ killdaemons.py
 
 #endif
 
   $ cd ..
 
 
 Subset does not diverge
 ------------------------------
 
 Do not report divergent successors-set if it is a subset of another
 successors-set. (report [A,B] not [A] + [A,B])
 
   $ newcase subset
   $ hg debugobsolete `getid A_0` `getid A_2`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
   1 new obsolescence markers
   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   007dc284c1f8
       82623d38b9ba 392fd25390da
   $ hg debugsuccessorssets 'desc('A_0')' --closest
   $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden
   007dc284c1f8
       82623d38b9ba 392fd25390da
 
   $ cd ..
 
+Divergence introduced after a split
+-----------------------------------
+
+Make sure divergence introduced in sucessors of a split does not spill to the
+unrelated part.
+
+  $ newcase split-unrelated-branch
+  $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg up 'desc("A_2")'
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg commit --amend -m "A_3"
+  $ hg up 'desc("A_2")' --hidden
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  updated to hidden changeset 392fd25390da
+  (hidden revision '392fd25390da' was rewritten as: 4d672202d2fb)
+  $ hg commit --amend -m "A_4" --config experimental.evolution.allowdivergence=yes
+  2 new content-divergent changesets
+  $ hg log -G --hidden
+  @  5:6730f214b07b A_4
+  |
+  | *  4:4d672202d2fb A_3
+  |/
+  | x  3:392fd25390da A_2 [rewritten using amend as 5:6730f214b07b; rewritten using amend as 4:4d672202d2fb]
+  |/
+  | o  2:82623d38b9ba A_1
+  |/
+  | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
+  |/
+  o  0:d20a80d4def3 base
+  
+  $ hg debugsuccessorssets --hidden 'desc('A_0')'
+  007dc284c1f8
+      82623d38b9ba 4d672202d2fb
+      82623d38b9ba 6730f214b07b
+  $ hg debugsuccessorssets --hidden 'desc('A_1')'
+  82623d38b9ba
+      82623d38b9ba
+  $ hg debugsuccessorssets --hidden 'desc('A_2')'
+  392fd25390da
+      6730f214b07b
+      4d672202d2fb
+  $ hg log -r 'contentdivergent()'
+  4:4d672202d2fb A_3
+  5:6730f214b07b A_4
+  $ cd ..
+
+
+
 Use scmutil.cleanupnodes API to create divergence
+=================================================
 
   $ hg init cleanupnodes
   $ cd cleanupnodes
   $ hg debugdrawdag <<'EOS'
   >   B1  B3 B4
   >   |     \|
   >   A      Z
   > EOS
 
   $ hg update -q B1
   $ echo 3 >> B
   $ hg commit --amend -m B2
   $ cat > $TESTTMP/scmutilcleanup.py <<EOF
   > from mercurial import registrar, scmutil
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'cleanup')
   > def cleanup(ui, repo):
   >     def node(expr):
   >         unfi = repo.unfiltered()
   >         rev = unfi.revs(expr).first()
   >         return unfi.changelog.node(rev)
   >     with repo.wlock(), repo.lock(), repo.transaction(b'delayedstrip'):
   >         mapping = {node(b'desc(B1)'): [node(b'desc(B3)')],
   >                    node(b'desc(B3)'): [node(b'desc(B4)')]}
   >         scmutil.cleanupnodes(repo, mapping, b'test')
   > EOF
 
   $ rm .hg/localtags
   $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
   2 new content-divergent changesets
   $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
   @  5:1a2a9b5b0030 B2 content-divergent
   |
   | *  4:70d5a63ca112 B4 content-divergent
   | |
   | o  1:48b9aae0607f Z
   |
   o  0:426bada5c675 A
   
   $ hg debugobsolete
   a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
   a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'}
   ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'}
 
   $ hg debugwhyunstable 1a2a9b5b0030
   content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33
 
   $ hg log -r 1a2a9b5b0030 -T '{whyunstable}\n'
   content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433
   $ hg log -r 1a2a9b5b0030 -T whyunstableshort
   content-divergent: 4:70d5a63ca112 (draft) predecessor a178
   $ hg log -r 1a2a9b5b0030 -T whyunstableshorter
   content-divergent: 70d5 (draft) predecessor a178
 
 #if serve
 
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 check explanation for a content-divergent changeset
 
   $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=paper' | grep divergent:
    <td>content-divergent: <a href="/rev/70d5a63ca112?style=paper">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=paper">a178212c3433</a></td>
   $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=coal' | grep divergent:
    <td>content-divergent: <a href="/rev/70d5a63ca112?style=coal">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=coal">a178212c3433</a></td>
   $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=gitweb' | grep divergent:
   <td>content-divergent: <a class="list" href="/rev/70d5a63ca112?style=gitweb">70d5a63ca112</a> (draft) predecessor <a class="list" href="/rev/a178212c3433?style=gitweb">a178212c3433</a></td>
   $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=monoblue' | grep divergent:
   <dd>content-divergent: <a href="/rev/70d5a63ca112?style=monoblue">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=monoblue">a178212c3433</a></dd>
   $ get-with-headers.py localhost:$HGPORT 'rev/1a2a9b5b0030?style=spartan' | grep divergent:
   <td class="unstable">content-divergent: <a href="/rev/70d5a63ca112?style=spartan">70d5a63ca112</a> (draft) predecessor <a href="/rev/a178212c3433?style=spartan">a178212c3433</a></td>
 
   $ killdaemons.py
 
 #endif