mercurial-scm/hg-stable: mercurial/obsutil.py annotate

annotate mercurial/obsutil.py @ 34414:014d467f9d08

effectflag: store an empty effect flag for the moment The idea behind effect flag is to store additional information in obs-markers about what changed between a changeset and its successor(s). It's a low-level information that comes without guarantees. This information can be computed a posteriori, but only if we have all changesets locally. This is not the case with distributed workflows where you work with several people or on several computers (eg: laptop + build server). Storing the effect-flag as a bitfield has several advantages: - It's compact, we are using one byte per obs-marker at most for the effect- flag. - It's compoundable, the obsfate log approach needs to display evolve history that could spans several obs-markers. Computing the effect-flag between a changeset and its grand-grand-grand-successor is simple thanks to the bitfield. The effect-flag design has also some limitations: - Evolving a changeset and reverting these changes just after would lead to two obs-markers with the same effect-flag without information that the first and third changesets are the same. The effect-flag current design is a trade-off between compactness and usefulness. Storing this information helps commands to display a more complete and understandable evolve history. For example, obslog (an Evolve command) use it to improve its output: x 62206adfd571 (34302) obscache: skip updating outdated obscache... | rewritten(parent) by Matthieu Laneuville <matthieu.laneuville@octobus... | rewritten(content) by Boris Feld <boris.feld@octobus.net> The effect flag is stored in obs-markers metadata while we iterate on the information we want to store. We plan to extend the existing obsmarkers bit-field when the effect flag design will be stabilized. It's different from the CommitCustody concept, effect-flag are not signed and can be forged. It's also different from the operation metadata as the command name (for example: amend) could alter a changeset in different ways (changing the content with hg amend, changing the description with hg amend -e, changing the user with hg amend -U). Also it's compatible with every custom command that writes obs-markers without needing to be updated. The effect-flag is placed behind an experimental flag set to off by default. Hook the saving of effect flag in create markers, but store only an empty one for the moment, I will refine the values in effect flag in following patches. For more information, see: https://www.mercurial-scm.org/wiki/ChangesetEvolutionDevel#Record_types_of_operation Differential Revision: https://phab.mercurial-scm.org/D533

author	Boris Feld <boris.feld@octobus.net>
date	Thu, 06 Jul 2017 14:50:17 +0200
parents	7cdc8c5a481a
children	51aadc0d0da2

rev	line source
32897 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1 # obsutil.py - utility functions for obsolescence
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	2 #
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	3 # Copyright 2017 Boris Feld <boris.feld@octobus.net>
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	4 #
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	7
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	8 from __future__ import absolute_import
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	9
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	10 from . import (
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	11 phases,
33757 2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	12 util
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	13 )
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	14
33154 4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	15 class marker(object):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	16 """Wrap obsolete marker raw data"""
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	17
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	18 def __init__(self, repo, data):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	19 # the repo argument will be used to create changectx in later version
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	20 self._repo = repo
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	21 self._data = data
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	22 self._decodedmeta = None
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	23
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	24 def __hash__(self):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	25 return hash(self._data)
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	26
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	27 def __eq__(self, other):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	28 if type(other) != type(self):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	29 return False
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	30 return self._data == other._data
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	31
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	32 def precnode(self):
33757 2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	33 msg = ("'marker.precnode' is deprecated, "
33878 833f70277f0e obsmarker: fix precnode deprecation Boris Feld <boris.feld@octobus.net> parents: 33761 diff changeset	34 "use 'marker.prednode'")
33757 2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	35 util.nouideprecwarn(msg, '4.4')
2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	36 return self.prednode()
2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	37
2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	38 def prednode(self):
2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	39 """Predecessor changeset node identifier"""
33154 4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	40 return self._data[0]
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	41
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	42 def succnodes(self):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	43 """List of successor changesets node identifiers"""
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	44 return self._data[1]
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	45
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	46 def parentnodes(self):
33757 2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	47 """Parents of the predecessors (None if not recorded)"""
33154 4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	48 return self._data[5]
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	49
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	50 def metadata(self):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	51 """Decoded metadata dictionary"""
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	52 return dict(self._data[3])
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	53
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	54 def date(self):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	55 """Creation date as (unixtime, offset)"""
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	56 return self._data[4]
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	57
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	58 def flags(self):
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	59 """The flags field of the marker"""
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	60 return self._data[2]
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	61
33155 a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	62 def getmarkers(repo, nodes=None, exclusive=False):
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	63 """returns markers known in a repository
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	64
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	65 If <nodes> is specified, only markers "relevant" to those nodes are are
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	66 returned"""
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	67 if nodes is None:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	68 rawmarkers = repo.obsstore
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	69 elif exclusive:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	70 rawmarkers = exclusivemarkers(repo, nodes)
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	71 else:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	72 rawmarkers = repo.obsstore.relevantmarkers(nodes)
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	73
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	74 for markerdata in rawmarkers:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	75 yield marker(repo, markerdata)
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	76
32897 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	77 def closestpredecessors(repo, nodeid):
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	78 """yield the list of next predecessors pointing on visible changectx nodes
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	79
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	80 This function respect the repoview filtering, filtered revision will be
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	81 considered missing.
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	82 """
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	83
33759 d5acd967f95a obsstore: rename precursors into predecessors Boris Feld <boris.feld@octobus.net> parents: 33757 diff changeset	84 precursors = repo.obsstore.predecessors
32897 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	85 stack = [nodeid]
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	86 seen = set(stack)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	87
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	88 while stack:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	89 current = stack.pop()
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	90 currentpreccs = precursors.get(current, ())
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	91
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	92 for prec in currentpreccs:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	93 precnodeid = prec[0]
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	94
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	95 # Basic cycle protection
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	96 if precnodeid in seen:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	97 continue
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	98 seen.add(precnodeid)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	99
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	100 if precnodeid in repo:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	101 yield precnodeid
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	102 else:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	103 stack.append(precnodeid)
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	104
33761 e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	105 def allprecursors(args, *kwargs):
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	106 """ (DEPRECATED)
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	107 """
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	108 msg = ("'obsutil.allprecursors' is deprecated, "
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	109 "use 'obsutil.allpredecessors'")
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	110 util.nouideprecwarn(msg, '4.4')
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	111
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	112 return allpredecessors(args, *kwargs)
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	113
e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	114 def allpredecessors(obsstore, nodes, ignoreflags=0):
33150 d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	115 """Yield node for every precursors of <nodes>.
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	116
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	117 Some precursors may be unknown locally.
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	118
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	119 This is a linear yield unsuited to detecting folded changesets. It includes
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	120 initial nodes too."""
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	121
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	122 remaining = set(nodes)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	123 seen = set(remaining)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	124 while remaining:
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	125 current = remaining.pop()
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	126 yield current
33759 d5acd967f95a obsstore: rename precursors into predecessors Boris Feld <boris.feld@octobus.net> parents: 33757 diff changeset	127 for mark in obsstore.predecessors.get(current, ()):
33150 d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	128 # ignore marker flagged with specified flag
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	129 if mark[2] & ignoreflags:
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	130 continue
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	131 suc = mark[0]
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	132 if suc not in seen:
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	133 seen.add(suc)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	134 remaining.add(suc)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	135
33151 0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	136 def allsuccessors(obsstore, nodes, ignoreflags=0):
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	137 """Yield node for every successor of <nodes>.
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	138
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	139 Some successors may be unknown locally.
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	140
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	141 This is a linear yield unsuited to detecting split changesets. It includes
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	142 initial nodes too."""
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	143 remaining = set(nodes)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	144 seen = set(remaining)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	145 while remaining:
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	146 current = remaining.pop()
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	147 yield current
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	148 for mark in obsstore.successors.get(current, ()):
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	149 # ignore marker flagged with specified flag
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	150 if mark[2] & ignoreflags:
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	151 continue
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	152 for suc in mark[1]:
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	153 if suc not in seen:
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	154 seen.add(suc)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	155 remaining.add(suc)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	156
33149 d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	157 def _filterprunes(markers):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	158 """return a set with no prune markers"""
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	159 return set(m for m in markers if m[1])
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	160
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	161 def exclusivemarkers(repo, nodes):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	162 """set of markers relevant to "nodes" but no other locally-known nodes
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	163
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	164 This function compute the set of markers "exclusive" to a locally-known
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	165 node. This means we walk the markers starting from <nodes> until we reach a
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	166 locally-known precursors outside of <nodes>. Element of <nodes> with
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	167 locally-known successors outside of <nodes> are ignored (since their
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	168 precursors markers are also relevant to these successors).
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	169
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	170 For example:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	171
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	172 # (A0 rewritten as A1)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	173 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	174 # A0 <-1- A1 # Marker "1" is exclusive to A1
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	175
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	176 or
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	177
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	178 # (A0 rewritten as AX; AX rewritten as A1; AX is unkown locally)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	179 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	180 # <-1- A0 <-2- AX <-3- A1 # Marker "2,3" are exclusive to A1
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	181
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	182 or
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	183
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	184 # (A0 has unknown precursors, A0 rewritten as A1 and A2 (divergence))
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	185 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	186 # <-2- A1 # Marker "2" is exclusive to A0,A1
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	187 # /
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	188 # <-1- A0
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	189 # \
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	190 # <-3- A2 # Marker "3" is exclusive to A0,A2
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	191 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	192 # in addition:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	193 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	194 # Markers "2,3" are exclusive to A1,A2
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	195 # Markers "1,2,3" are exclusive to A0,A1,A2
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	196
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	197 See test/test-obsolete-bundle-strip.t for more examples.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	198
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	199 An example usage is strip. When stripping a changeset, we also want to
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	200 strip the markers exclusive to this changeset. Otherwise we would have
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	201 "dangling"" obsolescence markers from its precursors: Obsolescence markers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	202 marking a node as obsolete without any successors available locally.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	203
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	204 As for relevant markers, the prune markers for children will be followed.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	205 Of course, they will only be followed if the pruned children is
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	206 locally-known. Since the prune markers are relevant to the pruned node.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	207 However, while prune markers are considered relevant to the parent of the
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	208 pruned changesets, prune markers for locally-known changeset (with no
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	209 successors) are considered exclusive to the pruned nodes. This allows
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	210 to strip the prune markers (with the rest of the exclusive chain) alongside
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	211 the pruned changesets.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	212 """
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	213 # running on a filtered repository would be dangerous as markers could be
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	214 # reported as exclusive when they are relevant for other filtered nodes.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	215 unfi = repo.unfiltered()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	216
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	217 # shortcut to various useful item
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	218 nm = unfi.changelog.nodemap
33759 d5acd967f95a obsstore: rename precursors into predecessors Boris Feld <boris.feld@octobus.net> parents: 33757 diff changeset	219 precursorsmarkers = unfi.obsstore.predecessors
33149 d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	220 successormarkers = unfi.obsstore.successors
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	221 childrenmarkers = unfi.obsstore.children
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	222
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	223 # exclusive markers (return of the function)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	224 exclmarkers = set()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	225 # we need fast membership testing
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	226 nodes = set(nodes)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	227 # looking for head in the obshistory
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	228 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	229 # XXX we are ignoring all issues in regard with cycle for now.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	230 stack = [n for n in nodes if not _filterprunes(successormarkers.get(n, ()))]
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	231 stack.sort()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	232 # nodes already stacked
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	233 seennodes = set(stack)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	234 while stack:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	235 current = stack.pop()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	236 # fetch precursors markers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	237 markers = list(precursorsmarkers.get(current, ()))
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	238 # extend the list with prune markers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	239 for mark in successormarkers.get(current, ()):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	240 if not mark[1]:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	241 markers.append(mark)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	242 # and markers from children (looking for prune)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	243 for mark in childrenmarkers.get(current, ()):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	244 if not mark[1]:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	245 markers.append(mark)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	246 # traverse the markers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	247 for mark in markers:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	248 if mark in exclmarkers:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	249 # markers already selected
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	250 continue
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	251
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	252 # If the markers is about the current node, select it
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	253 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	254 # (this delay the addition of markers from children)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	255 if mark[1] or mark[0] == current:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	256 exclmarkers.add(mark)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	257
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	258 # should we keep traversing through the precursors?
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	259 prec = mark[0]
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	260
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	261 # nodes in the stack or already processed
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	262 if prec in seennodes:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	263 continue
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	264
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	265 # is this a locally known node ?
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	266 known = prec in nm
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	267 # if locally-known and not in the <nodes> set the traversal
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	268 # stop here.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	269 if known and prec not in nodes:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	270 continue
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	271
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	272 # do not keep going if there are unselected markers pointing to this
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	273 # nodes. If we end up traversing these unselected markers later the
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	274 # node will be taken care of at that point.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	275 precmarkers = _filterprunes(successormarkers.get(prec))
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	276 if precmarkers.issubset(exclmarkers):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	277 seennodes.add(prec)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	278 stack.append(prec)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	279
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	280 return exclmarkers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	281
33152 7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	282 def foreground(repo, nodes):
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	283 """return all nodes in the "foreground" of other node
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	284
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	285 The foreground of a revision is anything reachable using parent -> children
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	286 or precursor -> successor relation. It is very similar to "descendant" but
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	287 augmented with obsolescence information.
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	288
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	289 Beware that possible obsolescence cycle may result if complex situation.
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	290 """
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	291 repo = repo.unfiltered()
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	292 foreground = set(repo.set('%ln::', nodes))
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	293 if repo.obsstore:
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	294 # We only need this complicated logic if there is obsolescence
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	295 # XXX will probably deserve an optimised revset.
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	296 nm = repo.changelog.nodemap
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	297 plen = -1
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	298 # compute the whole set of successors or descendants
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	299 while len(foreground) != plen:
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	300 plen = len(foreground)
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	301 succs = set(c.node() for c in foreground)
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	302 mutable = [c.node() for c in foreground if c.mutable()]
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	303 succs.update(allsuccessors(repo.obsstore, mutable))
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	304 known = (n for n in succs if n in nm)
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	305 foreground = set(repo.set('%ln::', known))
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	306 return set(c.node() for c in foreground)
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	307
34414 014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	308 # logic around storing and using effect flags
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	309 EFFECTFLAGFIELD = "ef1"
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	310
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	311 def geteffectflag(relation):
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	312 """ From an obs-marker relation, compute what changed between the
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	313 predecessor and the successor.
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	314 """
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	315 effects = 0
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	316
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	317 source = relation[0]
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	318
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	319 return effects
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	320
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	321 def getobsoleted(repo, tr):
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	322 """return the set of pre-existing revisions obsoleted by a transaction"""
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	323 torev = repo.unfiltered().changelog.nodemap.get
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	324 phase = repo._phasecache.phase
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	325 succsmarkers = repo.obsstore.successors.get
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	326 public = phases.public
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	327 addedmarkers = tr.changes.get('obsmarkers')
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	328 addedrevs = tr.changes.get('revs')
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	329 seenrevs = set(addedrevs)
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	330 obsoleted = set()
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	331 for mark in addedmarkers:
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	332 node = mark[0]
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	333 rev = torev(node)
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	334 if rev is None or rev in seenrevs:
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	335 continue
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	336 seenrevs.add(rev)
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	337 if phase(repo, rev) == public:
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	338 continue
33739 888f24810ea2 obsutil: defend against succsmarkers() returning None Augie Fackler <augie@google.com> parents: 33274 diff changeset	339 if set(succsmarkers(node) or []).issubset(addedmarkers):
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	340 obsoleted.add(rev)
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	341 return obsoleted
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	342
33927 84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	343 class _succs(list):
84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	344 """small class to represent a successors with some metadata about it"""
84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	345
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	346 def __init__(self, args, *kwargs):
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	347 super(_succs, self).__init__(args, *kwargs)
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	348 self.markers = set()
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	349
33928 dba493981284 obsolete: add an explicit '_succs.copy()' method Boris Feld <boris.feld@octobus.net> parents: 33927 diff changeset	350 def copy(self):
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	351 new = _succs(self)
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	352 new.markers = self.markers.copy()
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	353 return new
33928 dba493981284 obsolete: add an explicit '_succs.copy()' method Boris Feld <boris.feld@octobus.net> parents: 33927 diff changeset	354
33959 c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	355 @util.propertycache
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	356 def _set(self):
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	357 # immutable
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	358 return set(self)
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	359
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	360 def canmerge(self, other):
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	361 return self._set.issubset(other._set)
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	362
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	363 def successorssets(repo, initialnode, closest=False, cache=None):
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	364 """Return set of all latest successors of initial nodes
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	365
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	366 The successors set of a changeset A are the group of revisions that succeed
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	367 A. It succeeds A as a consistent whole, each revision being only a partial
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	368 replacement. By default, the successors set contains non-obsolete
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	369 changesets only, walking the obsolescence graph until reaching a leaf. If
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	370 'closest' is set to True, closest successors-sets are return (the
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	371 obsolescence walk stops on known changesets).
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	372
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	373 This function returns the full list of successor sets which is why it
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	374 returns a list of tuples and not just a single tuple. Each tuple is a valid
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	375 successors set. Note that (A,) may be a valid successors set for changeset A
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	376 (see below).
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	377
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	378 In most cases, a changeset A will have a single element (e.g. the changeset
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	379 A is replaced by A') in its successors set. Though, it is also common for a
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	380 changeset A to have no elements in its successor set (e.g. the changeset
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	381 has been pruned). Therefore, the returned list of successors sets will be
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	382 [(A',)] or [], respectively.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	383
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	384 When a changeset A is split into A' and B', however, it will result in a
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	385 successors set containing more than a single element, i.e. [(A',B')].
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	386 Divergent changesets will result in multiple successors sets, i.e. [(A',),
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	387 (A'')].
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	388
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	389 If a changeset A is not obsolete, then it will conceptually have no
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	390 successors set. To distinguish this from a pruned changeset, the successor
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	391 set will contain itself only, i.e. [(A,)].
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	392
33272 df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	393 Finally, final successors unknown locally are considered to be pruned
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	394 (pruned: obsoleted without any successors). (Final: successors not affected
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	395 by markers).
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	396
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	397 The 'closest' mode respect the repoview filtering. For example, without
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	398 filter it will stop at the first locally known changeset, with 'visible'
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	399 filter it will stop on visible changesets).
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	400
33272 df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	401 The optional `cache` parameter is a dictionary that may contains
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	402 precomputed successors sets. It is meant to reuse the computation of a
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	403 previous call to `successorssets` when multiple calls are made at the same
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	404 time. The cache dictionary is updated in place. The caller is responsible
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	405 for its life span. Code that makes multiple calls to `successorssets`
df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	406 should use this cache mechanism or risk a performance hit.
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	407
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	408 Since results are different depending of the 'closest' most, the same cache
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	409 cannot be reused for both mode.
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	410 """
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	411
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	412 succmarkers = repo.obsstore.successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	413
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	414 # Stack of nodes we search successors sets for
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	415 toproceed = [initialnode]
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	416 # set version of above list for fast loop detection
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	417 # element added to "toproceed" must be added here
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	418 stackedset = set(toproceed)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	419 if cache is None:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	420 cache = {}
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	421
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	422 # This while loop is the flattened version of a recursive search for
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	423 # successors sets
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	424 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	425 # def successorssets(x):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	426 # successors = directsuccessors(x)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	427 # ss = [[]]
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	428 # for succ in directsuccessors(x):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	429 # # product as in itertools cartesian product
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	430 # ss = product(ss, successorssets(succ))
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	431 # return ss
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	432 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	433 # But we can not use plain recursive calls here:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	434 # - that would blow the python call stack
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	435 # - obsolescence markers may have cycles, we need to handle them.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	436 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	437 # The `toproceed` list act as our call stack. Every node we search
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	438 # successors set for are stacked there.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	439 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	440 # The `stackedset` is set version of this stack used to check if a node is
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	441 # already stacked. This check is used to detect cycles and prevent infinite
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	442 # loop.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	443 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	444 # successors set of all nodes are stored in the `cache` dictionary.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	445 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	446 # After this while loop ends we use the cache to return the successors sets
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	447 # for the node requested by the caller.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	448 while toproceed:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	449 # Every iteration tries to compute the successors sets of the topmost
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	450 # node of the stack: CURRENT.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	451 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	452 # There are four possible outcomes:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	453 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	454 # 1) We already know the successors sets of CURRENT:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	455 # -> mission accomplished, pop it from the stack.
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	456 # 2) Stop the walk:
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	457 # default case: Node is not obsolete
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	458 # closest case: Node is known at this repo filter level
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	459 # -> the node is its own successors sets. Add it to the cache.
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	460 # 3) We do not know successors set of direct successors of CURRENT:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	461 # -> We add those successors to the stack.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	462 # 4) We know successors sets of all direct successors of CURRENT:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	463 # -> We can compute CURRENT successors set and add it to the
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	464 # cache.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	465 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	466 current = toproceed[-1]
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	467
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	468 # case 2 condition is a bit hairy because of closest,
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	469 # we compute it on its own
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	470 case2condition = ((current not in succmarkers)
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	471 or (closest and current != initialnode
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	472 and current in repo))
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	473
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	474 if current in cache:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	475 # case (1): We already know the successors sets
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	476 stackedset.remove(toproceed.pop())
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	477 elif case2condition:
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	478 # case (2): end of walk.
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	479 if current in repo:
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	480 # We have a valid successors.
33927 84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	481 cache[current] = [_succs((current,))]
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	482 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	483 # Final obsolete version is unknown locally.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	484 # Do not count that as a valid successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	485 cache[current] = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	486 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	487 # cases (3) and (4)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	488 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	489 # We proceed in two phases. Phase 1 aims to distinguish case (3)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	490 # from case (4):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	491 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	492 # For each direct successors of CURRENT, we check whether its
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	493 # successors sets are known. If they are not, we stack the
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	494 # unknown node and proceed to the next iteration of the while
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	495 # loop. (case 3)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	496 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	497 # During this step, we may detect obsolescence cycles: a node
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	498 # with unknown successors sets but already in the call stack.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	499 # In such a situation, we arbitrary set the successors sets of
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	500 # the node to nothing (node pruned) to break the cycle.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	501 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	502 # If no break was encountered we proceed to phase 2.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	503 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	504 # Phase 2 computes successors sets of CURRENT (case 4); see details
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	505 # in phase 2 itself.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	506 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	507 # Note the two levels of iteration in each phase.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	508 # - The first one handles obsolescence markers using CURRENT as
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	509 # precursor (successors markers of CURRENT).
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	510 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	511 # Having multiple entry here means divergence.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	512 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	513 # - The second one handles successors defined in each marker.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	514 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	515 # Having none means pruned node, multiple successors means split,
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	516 # single successors are standard replacement.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	517 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	518 for mark in sorted(succmarkers[current]):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	519 for suc in mark[1]:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	520 if suc not in cache:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	521 if suc in stackedset:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	522 # cycle breaking
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	523 cache[suc] = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	524 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	525 # case (3) If we have not computed successors sets
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	526 # of one of those successors we add it to the
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	527 # `toproceed` stack and stop all work for this
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	528 # iteration.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	529 toproceed.append(suc)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	530 stackedset.add(suc)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	531 break
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	532 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	533 continue
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	534 break
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	535 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	536 # case (4): we know all successors sets of all direct
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	537 # successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	538 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	539 # Successors set contributed by each marker depends on the
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	540 # successors sets of all its "successors" node.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	541 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	542 # Each different marker is a divergence in the obsolescence
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	543 # history. It contributes successors sets distinct from other
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	544 # markers.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	545 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	546 # Within a marker, a successor may have divergent successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	547 # sets. In such a case, the marker will contribute multiple
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	548 # divergent successors sets. If multiple successors have
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	549 # divergent successors sets, a Cartesian product is used.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	550 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	551 # At the end we post-process successors sets to remove
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	552 # duplicated entry and successors set that are strict subset of
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	553 # another one.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	554 succssets = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	555 for mark in sorted(succmarkers[current]):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	556 # successors sets contributed by this marker
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	557 base = _succs()
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	558 base.markers.add(mark)
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	559 markss = [base]
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	560 for suc in mark[1]:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	561 # cardinal product with previous successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	562 productresult = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	563 for prefix in markss:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	564 for suffix in cache[suc]:
33928 dba493981284 obsolete: add an explicit '_succs.copy()' method Boris Feld <boris.feld@octobus.net> parents: 33927 diff changeset	565 newss = prefix.copy()
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	566 newss.markers.update(suffix.markers)
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	567 for part in suffix:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	568 # do not duplicated entry in successors set
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	569 # first entry wins.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	570 if part not in newss:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	571 newss.append(part)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	572 productresult.append(newss)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	573 markss = productresult
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	574 succssets.extend(markss)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	575 # remove duplicated and subset
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	576 seen = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	577 final = []
33960 54c21114e41d obsolete: fix old typo Boris Feld <boris.feld@octobus.net> parents: 33959 diff changeset	578 candidates = sorted((s for s in succssets if s),
54c21114e41d obsolete: fix old typo Boris Feld <boris.feld@octobus.net> parents: 33959 diff changeset	579 key=len, reverse=True)
54c21114e41d obsolete: fix old typo Boris Feld <boris.feld@octobus.net> parents: 33959 diff changeset	580 for cand in candidates:
33959 c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	581 for seensuccs in seen:
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	582 if cand.canmerge(seensuccs):
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	583 seensuccs.markers.update(cand.markers)
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	584 break
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	585 else:
33959 c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	586 final.append(cand)
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	587 seen.append(cand)
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	588 final.reverse() # put small successors set first
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	589 cache[current] = final
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	590 return cache[initialnode]
33930 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	591
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	592 def successorsandmarkers(repo, ctx):
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	593 """compute the raw data needed for computing obsfate
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	594 Returns a list of dict, one dict per successors set
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	595 """
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	596 if not ctx.obsolete():
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	597 return None
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	598
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	599 ssets = successorssets(repo, ctx.node(), closest=True)
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	600
34014 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	601 # closestsuccessors returns an empty list for pruned revisions, remap it
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	602 # into a list containing an empty list for future processing
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	603 if ssets == []:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	604 ssets = [[]]
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	605
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	606 # Try to recover pruned markers
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	607 succsmap = repo.obsstore.successors
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	608 fullsuccessorsets = [] # successor set + markers
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	609 for sset in ssets:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	610 if sset:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	611 fullsuccessorsets.append(sset)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	612 else:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	613 # successorsset return an empty set() when ctx or one of its
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	614 # successors is pruned.
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	615 # In this case, walk the obs-markers tree again starting with ctx
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	616 # and find the relevant pruning obs-makers, the ones without
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	617 # successors.
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	618 # Having these markers allow us to compute some information about
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	619 # its fate, like who pruned this changeset and when.
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	620
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	621 # XXX we do not catch all prune markers (eg rewritten then pruned)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	622 # (fix me later)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	623 foundany = False
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	624 for mark in succsmap.get(ctx.node(), ()):
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	625 if not mark[1]:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	626 foundany = True
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	627 sset = _succs()
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	628 sset.markers.add(mark)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	629 fullsuccessorsets.append(sset)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	630 if not foundany:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	631 fullsuccessorsets.append(_succs())
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	632
33930 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	633 values = []
34014 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	634 for sset in fullsuccessorsets:
33930 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	635 values.append({'successors': sset, 'markers': sset.markers})
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	636
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	637 return values
34011 3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	638
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	639 def successorsetverb(successorset):
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	640 """ Return the verb summarizing the successorset
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	641 """
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	642 if not successorset:
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	643 verb = 'pruned'
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	644 elif len(successorset) == 1:
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	645 verb = 'rewritten'
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	646 else:
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	647 verb = 'split'
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	648 return verb
34012 38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	649
34013 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	650 def markersdates(markers):
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	651 """returns the list of dates for a list of markers
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	652 """
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	653 return [m[4] for m in markers]
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	654
34012 38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	655 def markersusers(markers):
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	656 """ Returns a sorted list of markers users without duplicates
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	657 """
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	658 markersmeta = [dict(m[3]) for m in markers]
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	659 users = set(meta.get('user') for meta in markersmeta if meta.get('user'))
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	660
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	661 return sorted(users)
34294 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	662
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	663 def markersoperations(markers):
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	664 """ Returns a sorted list of markers operations without duplicates
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	665 """
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	666 markersmeta = [dict(m[3]) for m in markers]
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	667 operations = set(meta.get('operation') for meta in markersmeta
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	668 if meta.get('operation'))
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	669
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	670 return sorted(operations)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/obsutil.py @ 34414:014d467f9d08