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

annotate mercurial/obsutil.py @ 38525:c1a7bbf9984d

context: also accept diff option directly For now we accept both diff option and dictionary. This will let us upgrade internal users gradually before we drop the old API at the end of this series.

author	Boris Feld <boris.feld@octobus.net>
date	Sat, 23 Jun 2018 13:19:03 +0100
parents	4455e5d4d59c
children	f65e6095c5ac

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
34421 95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	10 import re
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	11
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	12 from .i18n import _
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 from . import (
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	14 node as nodemod,
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	15 phases,
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	16 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	17 )
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 35933 diff changeset	18 from .utils import dateutil
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	19
36959 b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	20 ### obsolescence marker flag
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	21
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	22 ## bumpedfix flag
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	23 #
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	24 # When a changeset A' succeed to a changeset A which became public, we call A'
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	25 # "bumped" because it's a successors of a public changesets
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	26 #
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	27 # o A' (bumped)
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	28 # \|`:
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	29 # \| o A
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	30 # \|/
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	31 # o Z
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	32 #
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	33 # The way to solve this situation is to create a new changeset Ad as children
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	34 # of A. This changeset have the same content than A'. So the diff from A to A'
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	35 # is the same than the diff from A to Ad. Ad is marked as a successors of A'
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	36 #
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	37 # o Ad
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	38 # \|`:
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	39 # \| x A'
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	40 # \|'\|
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	41 # o \| A
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	42 # \|/
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	43 # o Z
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	44 #
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	45 # But by transitivity Ad is also a successors of A. To avoid having Ad marked
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	46 # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>.
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	47 # This flag mean that the successors express the changes between the public and
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	48 # bumped version and fix the situation, breaking the transitivity of
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	49 # "bumped" here.
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	50 bumpedfix = 1
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	51 usingsha256 = 2
b9bbcf9ffac1 obsolete: move marker flags to obsutil Anton Shestakov <av6@dwimlabs.net> parents: 36636 diff changeset	52
33154 4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	53 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	54 """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	55
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	56 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	57 # 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	58 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	59 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	60 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	61
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	62 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	63 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	64
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	65 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	66 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	67 return False
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	68 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	69
33757 2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	70 def prednode(self):
2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	71 """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	72 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	73
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	74 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	75 """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	76 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	77
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	78 def parentnodes(self):
33757 2cb442bc1a76 obsmarker: rename precnode into prednode Boris Feld <boris.feld@octobus.net> parents: 33739 diff changeset	79 """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	80 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	81
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	82 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	83 """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	84 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	85
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	86 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	87 """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	88 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	89
4e30168d7939 obsutil: move the 'marker' class to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33152 diff changeset	90 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	91 """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	92 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	93
33155 a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	94 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	95 """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	96
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	97 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	98 returned"""
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	99 if nodes is None:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	100 rawmarkers = repo.obsstore
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	101 elif exclusive:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	102 rawmarkers = exclusivemarkers(repo, nodes)
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	103 else:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	104 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	105
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	106 for markerdata in rawmarkers:
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	107 yield marker(repo, markerdata)
a14e2e7f7d1f obsutil: move 'getmarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33154 diff changeset	108
32897 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	109 def closestpredecessors(repo, nodeid):
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	110 """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	111
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	112 This function respect the repoview filtering, filtered revision will be
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	113 considered missing.
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	114 """
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	115
33759 d5acd967f95a obsstore: rename precursors into predecessors Boris Feld <boris.feld@octobus.net> parents: 33757 diff changeset	116 precursors = repo.obsstore.predecessors
32897 1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	117 stack = [nodeid]
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	118 seen = set(stack)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	119
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	120 while stack:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	121 current = stack.pop()
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	122 currentpreccs = precursors.get(current, ())
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	123
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	124 for prec in currentpreccs:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	125 precnodeid = prec[0]
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	126
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	127 # Basic cycle protection
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	128 if precnodeid in seen:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	129 continue
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	130 seen.add(precnodeid)
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	131
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	132 if precnodeid in repo:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	133 yield precnodeid
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	134 else:
1858fc2327ef template: add predecessors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	135 stack.append(precnodeid)
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	136
33761 e6d8ee3c9ec3 obsutil: rename allprecursors into allpredecessors Boris Feld <boris.feld@octobus.net> parents: 33759 diff changeset	137 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	138 """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	139
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	140 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	141
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	142 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	143 initial nodes too."""
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	144
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	145 remaining = set(nodes)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	146 seen = set(remaining)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	147 while remaining:
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	148 current = remaining.pop()
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	149 yield current
33759 d5acd967f95a obsstore: rename precursors into predecessors Boris Feld <boris.feld@octobus.net> parents: 33757 diff changeset	150 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	151 # 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	152 if mark[2] & ignoreflags:
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	153 continue
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	154 suc = mark[0]
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	155 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	156 seen.add(suc)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	157 remaining.add(suc)
d0e5bf12f314 obsutil: move 'allprecursors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33149 diff changeset	158
33151 0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	159 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	160 """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	161
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	162 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	163
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	164 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	165 initial nodes too."""
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	166 remaining = set(nodes)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	167 seen = set(remaining)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	168 while remaining:
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	169 current = remaining.pop()
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	170 yield current
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	171 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	172 # 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	173 if mark[2] & ignoreflags:
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	174 continue
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	175 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	176 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	177 seen.add(suc)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	178 remaining.add(suc)
0a370b93cca2 obsutil: move 'allsuccessors' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33150 diff changeset	179
33149 d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	180 def _filterprunes(markers):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	181 """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	182 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	183
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	184 def exclusivemarkers(repo, nodes):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	185 """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	186
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	187 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	188 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	189 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	190 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	191 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	192
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	193 For example:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	194
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	195 # (A0 rewritten as A1)
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 # 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	198
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	199 or
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	200
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	201 # (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	202 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	203 # <-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	204
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	205 or
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	206
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	207 # (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	208 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	209 # <-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	210 # /
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	211 # <-1- A0
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 # <-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	214 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	215 # in addition:
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 # 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	218 # 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	219
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	220 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	221
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	222 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	223 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	224 "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	225 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	226
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	227 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	228 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	229 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	230 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	231 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	232 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	233 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	234 the pruned changesets.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	235 """
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	236 # 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	237 # 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	238 unfi = repo.unfiltered()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	239
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	240 # 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	241 nm = unfi.changelog.nodemap
33759 d5acd967f95a obsstore: rename precursors into predecessors Boris Feld <boris.feld@octobus.net> parents: 33757 diff changeset	242 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	243 successormarkers = unfi.obsstore.successors
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	244 childrenmarkers = unfi.obsstore.children
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	245
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	246 # 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	247 exclmarkers = set()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	248 # 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	249 nodes = set(nodes)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	250 # 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	251 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	252 # 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	253 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	254 stack.sort()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	255 # nodes already stacked
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	256 seennodes = set(stack)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	257 while stack:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	258 current = stack.pop()
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	259 # fetch precursors markers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	260 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	261 # 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	262 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	263 if not mark[1]:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	264 markers.append(mark)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	265 # 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	266 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	267 if not mark[1]:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	268 markers.append(mark)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	269 # traverse the markers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	270 for mark in markers:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	271 if mark in exclmarkers:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	272 # markers already selected
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	273 continue
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	274
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	275 # 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	276 #
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	277 # (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	278 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	279 exclmarkers.add(mark)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	280
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	281 # 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	282 prec = mark[0]
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	283
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	284 # 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	285 if prec in seennodes:
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	286 continue
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	287
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	288 # 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	289 known = prec in nm
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	290 # 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	291 # stop here.
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	292 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	293 continue
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	294
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	295 # 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	296 # 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	297 # 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	298 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	299 if precmarkers.issubset(exclmarkers):
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	300 seennodes.add(prec)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	301 stack.append(prec)
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	302
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	303 return exclmarkers
d09ae850296d obsutil: move 'exclusivemarkers' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33148 diff changeset	304
33152 7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	305 def foreground(repo, nodes):
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	306 """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	307
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	308 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	309 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	310 augmented with obsolescence information.
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	311
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	312 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	313 """
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	314 repo = repo.unfiltered()
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	315 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	316 if repo.obsstore:
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	317 # 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	318 # 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	319 nm = repo.changelog.nodemap
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	320 plen = -1
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	321 # 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	322 while len(foreground) != plen:
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	323 plen = len(foreground)
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33151 diff changeset	324 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	325 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	326 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	327 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	328 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	329 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	330
34423 2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	331 # effectflag field
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	332 #
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	333 # Effect-flag is a 1-byte bit field used to store what changed between a
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	334 # changeset and its successor(s).
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	335 #
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	336 # The effect flag is stored in obs-markers metadata while we iterate on the
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	337 # information design. That's why we have the EFFECTFLAGFIELD. If we come up
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	338 # with an incompatible design for effect flag, we can store a new design under
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	339 # another field name so we don't break readers. We plan to extend the existing
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	340 # obsmarkers bit-field when the effect flag design will be stabilized.
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	341 #
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	342 # The effect-flag is placed behind an experimental flag
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	343 # `effect-flags` set to off by default.
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	344 #
2fd06499dc8e effectflag: document effect flag Boris Feld <boris.feld@octobus.net> parents: 34422 diff changeset	345
34414 014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	346 EFFECTFLAGFIELD = "ef1"
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	347
34416 51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	348 DESCCHANGED = 1 << 0 # action changed the description
34421 95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	349 METACHANGED = 1 << 1 # action change the meta
34422 187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	350 DIFFCHANGED = 1 << 3 # action change diff introduced by the changeset
34420 fa26f5891e68 effectflag: detect when parents changed Boris Feld <boris.feld@octobus.net> parents: 34419 diff changeset	351 PARENTCHANGED = 1 << 2 # action change the parent
34417 55ef17ec8e59 effectflag: detect when user changed Boris Feld <boris.feld@octobus.net> parents: 34416 diff changeset	352 USERCHANGED = 1 << 4 # the user changed
34418 54af8de9bd09 effectflag: detect when date changed Boris Feld <boris.feld@octobus.net> parents: 34417 diff changeset	353 DATECHANGED = 1 << 5 # the date changed
34419 57980af73cfa effectflag: detect when branch changed Boris Feld <boris.feld@octobus.net> parents: 34418 diff changeset	354 BRANCHCHANGED = 1 << 6 # the branch changed
34416 51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	355
34421 95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	356 METABLACKLIST = [
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	357 re.compile('^branch$'),
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	358 re.compile('^.*-source$'),
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	359 re.compile('^.*_source$'),
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	360 re.compile('^source$'),
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	361 ]
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	362
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	363 def metanotblacklisted(metaitem):
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	364 """ Check that the key of a meta item (extrakey, extravalue) does not
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	365 match at least one of the blacklist pattern
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	366 """
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	367 metakey = metaitem[0]
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	368
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	369 return not any(pattern.match(metakey) for pattern in METABLACKLIST)
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	370
34422 187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	371 def _prepare_hunk(hunk):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	372 """Drop all information but the username and patch"""
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	373 cleanhunk = []
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	374 for line in hunk.splitlines():
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	375 if line.startswith(b'# User') or not line.startswith(b'#'):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	376 if line.startswith(b'@@'):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	377 line = b'@@\n'
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	378 cleanhunk.append(line)
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	379 return cleanhunk
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	380
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	381 def _getdifflines(iterdiff):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	382 """return a cleaned up lines"""
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	383 lines = next(iterdiff, None)
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	384
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	385 if lines is None:
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	386 return lines
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	387
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	388 return _prepare_hunk(lines)
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	389
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	390 def _cmpdiff(leftctx, rightctx):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	391 """return True if both ctx introduce the "same diff"
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	392
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	393 This is a first and basic implementation, with many shortcoming.
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	394 """
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	395
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	396 # Leftctx or right ctx might be filtered, so we need to use the contexts
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	397 # with an unfiltered repository to safely compute the diff
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	398 leftunfi = leftctx._repo.unfiltered()[leftctx.rev()]
38523 4455e5d4d59c context: explicitly take diffopts in `context.diff` (API) Boris Feld <boris.feld@octobus.net> parents: 37328 diff changeset	399 leftdiff = leftunfi.diff(opts={'git': True})
34422 187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	400 rightunfi = rightctx._repo.unfiltered()[rightctx.rev()]
38523 4455e5d4d59c context: explicitly take diffopts in `context.diff` (API) Boris Feld <boris.feld@octobus.net> parents: 37328 diff changeset	401 rightdiff = rightunfi.diff(opts={'git': True})
34422 187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	402
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	403 left, right = (0, 0)
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	404 while None not in (left, right):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	405 left = _getdifflines(leftdiff)
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	406 right = _getdifflines(rightdiff)
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	407
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	408 if left != right:
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	409 return False
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	410 return True
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	411
34414 014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	412 def geteffectflag(relation):
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	413 """ 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	414 predecessor and the successor.
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	415 """
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	416 effects = 0
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	417
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	418 source = relation[0]
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	419
34416 51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	420 for changectx in relation[1]:
51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	421 # Check if description has changed
51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	422 if changectx.description() != source.description():
51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	423 effects \|= DESCCHANGED
51aadc0d0da2 effectflag: detect when description changed Boris Feld <boris.feld@octobus.net> parents: 34414 diff changeset	424
34417 55ef17ec8e59 effectflag: detect when user changed Boris Feld <boris.feld@octobus.net> parents: 34416 diff changeset	425 # Check if user has changed
55ef17ec8e59 effectflag: detect when user changed Boris Feld <boris.feld@octobus.net> parents: 34416 diff changeset	426 if changectx.user() != source.user():
55ef17ec8e59 effectflag: detect when user changed Boris Feld <boris.feld@octobus.net> parents: 34416 diff changeset	427 effects \|= USERCHANGED
55ef17ec8e59 effectflag: detect when user changed Boris Feld <boris.feld@octobus.net> parents: 34416 diff changeset	428
34418 54af8de9bd09 effectflag: detect when date changed Boris Feld <boris.feld@octobus.net> parents: 34417 diff changeset	429 # Check if date has changed
54af8de9bd09 effectflag: detect when date changed Boris Feld <boris.feld@octobus.net> parents: 34417 diff changeset	430 if changectx.date() != source.date():
54af8de9bd09 effectflag: detect when date changed Boris Feld <boris.feld@octobus.net> parents: 34417 diff changeset	431 effects \|= DATECHANGED
54af8de9bd09 effectflag: detect when date changed Boris Feld <boris.feld@octobus.net> parents: 34417 diff changeset	432
34419 57980af73cfa effectflag: detect when branch changed Boris Feld <boris.feld@octobus.net> parents: 34418 diff changeset	433 # Check if branch has changed
57980af73cfa effectflag: detect when branch changed Boris Feld <boris.feld@octobus.net> parents: 34418 diff changeset	434 if changectx.branch() != source.branch():
57980af73cfa effectflag: detect when branch changed Boris Feld <boris.feld@octobus.net> parents: 34418 diff changeset	435 effects \|= BRANCHCHANGED
57980af73cfa effectflag: detect when branch changed Boris Feld <boris.feld@octobus.net> parents: 34418 diff changeset	436
34420 fa26f5891e68 effectflag: detect when parents changed Boris Feld <boris.feld@octobus.net> parents: 34419 diff changeset	437 # Check if at least one of the parent has changed
fa26f5891e68 effectflag: detect when parents changed Boris Feld <boris.feld@octobus.net> parents: 34419 diff changeset	438 if changectx.parents() != source.parents():
fa26f5891e68 effectflag: detect when parents changed Boris Feld <boris.feld@octobus.net> parents: 34419 diff changeset	439 effects \|= PARENTCHANGED
fa26f5891e68 effectflag: detect when parents changed Boris Feld <boris.feld@octobus.net> parents: 34419 diff changeset	440
34421 95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	441 # Check if other meta has changed
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	442 changeextra = changectx.extra().items()
35915 c0a6733f7e7a obsutil: work around filter() being a generator in Python 3 Augie Fackler <augie@google.com> parents: 35610 diff changeset	443 ctxmeta = list(filter(metanotblacklisted, changeextra))
34421 95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	444
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	445 sourceextra = source.extra().items()
35915 c0a6733f7e7a obsutil: work around filter() being a generator in Python 3 Augie Fackler <augie@google.com> parents: 35610 diff changeset	446 srcmeta = list(filter(metanotblacklisted, sourceextra))
34421 95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	447
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	448 if ctxmeta != srcmeta:
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	449 effects \|= METACHANGED
95759620d492 effectflag: detect when meta changed Boris Feld <boris.feld@octobus.net> parents: 34420 diff changeset	450
34422 187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	451 # Check if the diff has changed
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	452 if not _cmpdiff(source, changectx):
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	453 effects \|= DIFFCHANGED
187bc224554a effectflag: detect when diff changed Boris Feld <boris.feld@octobus.net> parents: 34421 diff changeset	454
34414 014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	455 return effects
014d467f9d08 effectflag: store an empty effect flag for the moment Boris Feld <boris.feld@octobus.net> parents: 34294 diff changeset	456
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	457 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	458 """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	459 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	460 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	461 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	462 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	463 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	464 addedrevs = tr.changes.get('revs')
35317 137a08d82232 transaction: build changes['revs'] as range instead of a set Joerg Sonnenberger <joerg@bec.de> parents: 35049 diff changeset	465 seenrevs = set()
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	466 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	467 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	468 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	469 rev = torev(node)
35317 137a08d82232 transaction: build changes['revs'] as range instead of a set Joerg Sonnenberger <joerg@bec.de> parents: 35049 diff changeset	470 if rev is None or rev in seenrevs or rev in addedrevs:
33252 53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	471 continue
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33155 diff changeset	472 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	473 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	474 continue
33739 888f24810ea2 obsutil: defend against succsmarkers() returning None Augie Fackler <augie@google.com> parents: 33274 diff changeset	475 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	476 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	477 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	478
33927 84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	479 class _succs(list):
84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	480 """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	481
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	482 def __init__(self, args, *kwargs):
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	483 super(_succs, self).__init__(args, *kwargs)
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	484 self.markers = set()
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	485
33928 dba493981284 obsolete: add an explicit '_succs.copy()' method Boris Feld <boris.feld@octobus.net> parents: 33927 diff changeset	486 def copy(self):
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	487 new = _succs(self)
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	488 new.markers = self.markers.copy()
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	489 return new
33928 dba493981284 obsolete: add an explicit '_succs.copy()' method Boris Feld <boris.feld@octobus.net> parents: 33927 diff changeset	490
33959 c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	491 @util.propertycache
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	492 def _set(self):
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	493 # immutable
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	494 return set(self)
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	495
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	496 def canmerge(self, other):
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	497 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	498
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	499 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	500 """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	501
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	502 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	503 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	504 replacement. By default, the successors set contains non-obsolete
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	505 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	506 '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	507 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	508
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	509 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	510 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	511 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	512 (see below).
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	513
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	514 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	515 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	516 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	517 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	518 [(A',)] or [], respectively.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	519
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	520 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	521 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	522 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	523 (A'')].
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	524
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	525 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	526 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	527 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	528
33272 df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	529 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	530 (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	531 by markers).
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	532
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	533 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	534 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	535 filter it will stop on visible changesets).
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	536
33272 df90f4d6c609 obsolete: small doc update for 'successorssets' Boris Feld <boris.feld@octobus.net> parents: 33252 diff changeset	537 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	538 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	539 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	540 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	541 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	542 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	543
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	544 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	545 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	546 """
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	547
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	548 succmarkers = repo.obsstore.successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	549
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	550 # 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	551 toproceed = [initialnode]
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	552 # 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	553 # 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	554 stackedset = set(toproceed)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	555 if cache is None:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	556 cache = {}
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	557
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	558 # 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	559 # successors sets
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	560 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	561 # def successorssets(x):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	562 # successors = directsuccessors(x)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	563 # ss = [[]]
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	564 # 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	565 # # 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	566 # 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	567 # return ss
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	568 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	569 # 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	570 # - 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	571 # - 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	572 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	573 # 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	574 # 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	575 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	576 # 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	577 # 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	578 # loop.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	579 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	580 # 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	581 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	582 # 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	583 # 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	584 while toproceed:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	585 # 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	586 # 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	587 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	588 # 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	589 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	590 # 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	591 # -> mission accomplished, pop it from the stack.
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	592 # 2) Stop the walk:
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	593 # default case: Node is not obsolete
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	594 # 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	595 # -> 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	596 # 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	597 # -> 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	598 # 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	599 # -> 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	600 # cache.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	601 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	602 current = toproceed[-1]
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	603
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	604 # 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	605 # we compute it on its own
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	606 case2condition = ((current not in succmarkers)
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	607 or (closest and current != initialnode
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	608 and current in repo))
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	609
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	610 if current in cache:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	611 # 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	612 stackedset.remove(toproceed.pop())
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	613 elif case2condition:
68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	614 # 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	615 if current in repo:
33274 68f3e819d41d obsolete: closest divergent support Boris Feld <boris.feld@octobus.net> parents: 33272 diff changeset	616 # We have a valid successors.
33927 84f72072bde6 obsolete: introduce a _succs class Boris Feld <boris.feld@octobus.net> parents: 33878 diff changeset	617 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	618 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	619 # 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	620 # 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	621 cache[current] = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	622 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	623 # cases (3) and (4)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	624 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	625 # 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	626 # from case (4):
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	627 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	628 # 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	629 # 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	630 # 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	631 # loop. (case 3)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	632 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	633 # 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	634 # 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	635 # 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	636 # 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	637 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	638 # 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	639 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	640 # 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	641 # in phase 2 itself.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	642 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	643 # 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	644 # - 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	645 # 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	646 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	647 # 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	648 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	649 # - 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	650 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	651 # 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	652 # 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	653 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	654 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	655 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	656 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	657 if suc in stackedset:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	658 # cycle breaking
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	659 cache[suc] = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	660 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	661 # 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	662 # 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	663 # `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	664 # iteration.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	665 toproceed.append(suc)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	666 stackedset.add(suc)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	667 break
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	668 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	669 continue
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	670 break
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	671 else:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	672 # 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	673 # successors
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	674 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	675 # 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	676 # 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	677 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	678 # 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	679 # 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	680 # markers.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	681 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	682 # 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	683 # 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	684 # 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	685 # 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	686 #
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	687 # 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	688 # 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	689 # another one.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	690 succssets = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	691 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	692 # successors sets contributed by this marker
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	693 base = _succs()
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	694 base.markers.add(mark)
34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	695 markss = [base]
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	696 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	697 # 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	698 productresult = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	699 for prefix in markss:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	700 for suffix in cache[suc]:
33928 dba493981284 obsolete: add an explicit '_succs.copy()' method Boris Feld <boris.feld@octobus.net> parents: 33927 diff changeset	701 newss = prefix.copy()
33929 34e10e09afa5 obsolete: track markers in _succs Boris Feld <boris.feld@octobus.net> parents: 33928 diff changeset	702 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	703 for part in suffix:
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	704 # 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	705 # first entry wins.
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	706 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	707 newss.append(part)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	708 productresult.append(newss)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	709 markss = productresult
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	710 succssets.extend(markss)
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	711 # remove duplicated and subset
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	712 seen = []
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	713 final = []
33960 54c21114e41d obsolete: fix old typo Boris Feld <boris.feld@octobus.net> parents: 33959 diff changeset	714 candidates = sorted((s for s in succssets if s),
54c21114e41d obsolete: fix old typo Boris Feld <boris.feld@octobus.net> parents: 33959 diff changeset	715 key=len, reverse=True)
54c21114e41d obsolete: fix old typo Boris Feld <boris.feld@octobus.net> parents: 33959 diff changeset	716 for cand in candidates:
33959 c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	717 for seensuccs in seen:
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	718 if cand.canmerge(seensuccs):
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	719 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	720 break
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	721 else:
33959 c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	722 final.append(cand)
c0bbaefc2c5a obsolete: move merge logic on the smaller object Boris Feld <boris.feld@octobus.net> parents: 33930 diff changeset	723 seen.append(cand)
33148 4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	724 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	725 cache[current] = final
4f49810a1011 obsutil: move 'successorssets' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32897 diff changeset	726 return cache[initialnode]
33930 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	727
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	728 def successorsandmarkers(repo, ctx):
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	729 """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	730 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	731 """
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	732 if not ctx.obsolete():
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	733 return None
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	734
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	735 ssets = successorssets(repo, ctx.node(), closest=True)
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	736
34014 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	737 # 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	738 # 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	739 if ssets == []:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	740 ssets = [[]]
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	741
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	742 # Try to recover pruned markers
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	743 succsmap = repo.obsstore.successors
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	744 fullsuccessorsets = [] # successor set + markers
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	745 for sset in ssets:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	746 if sset:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	747 fullsuccessorsets.append(sset)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	748 else:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	749 # 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	750 # successors is pruned.
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	751 # 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	752 # 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	753 # successors.
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	754 # 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	755 # 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	756
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	757 # 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	758 # (fix me later)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	759 foundany = False
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	760 for mark in succsmap.get(ctx.node(), ()):
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	761 if not mark[1]:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	762 foundany = True
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	763 sset = _succs()
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	764 sset.markers.add(mark)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	765 fullsuccessorsets.append(sset)
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	766 if not foundany:
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	767 fullsuccessorsets.append(_succs())
98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	768
33930 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	769 values = []
34014 98fa777cd7a1 template: better prune support in obsfate Boris Feld <boris.feld@octobus.net> parents: 34013 diff changeset	770 for sset in fullsuccessorsets:
33930 e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	771 values.append({'successors': sset, 'markers': sset.markers})
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	772
e278d6d2d7d2 template: add minimal obsfate template function Boris Feld <boris.feld@octobus.net> parents: 33929 diff changeset	773 return values
34011 3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	774
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	775 def _getobsfate(successorssets):
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	776 """ Compute a changeset obsolescence fate based on its successorssets.
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	777 Successors can be the tipmost ones or the immediate ones. This function
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	778 return values are not meant to be shown directly to users, it is meant to
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	779 be used by internal functions only.
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	780 Returns one fate from the following values:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	781 - pruned
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	782 - diverged
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	783 - superseded
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	784 - superseded_split
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	785 """
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	786
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	787 if len(successorssets) == 0:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	788 # The commit has been pruned
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	789 return 'pruned'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	790 elif len(successorssets) > 1:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	791 return 'diverged'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	792 else:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	793 # No divergence, only one set of successors
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	794 successors = successorssets[0]
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	795
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	796 if len(successors) == 1:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	797 return 'superseded'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	798 else:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	799 return 'superseded_split'
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	800
35049 b81ad5b78a81 obsfate: makes successorsetverb takes the markers as argument Boris Feld <boris.feld@octobus.net> parents: 34873 diff changeset	801 def obsfateverb(successorset, markers):
b81ad5b78a81 obsfate: makes successorsetverb takes the markers as argument Boris Feld <boris.feld@octobus.net> parents: 34873 diff changeset	802 """ Return the verb summarizing the successorset and potentially using
b81ad5b78a81 obsfate: makes successorsetverb takes the markers as argument Boris Feld <boris.feld@octobus.net> parents: 34873 diff changeset	803 information from the markers
34011 3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	804 """
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	805 if not successorset:
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	806 verb = 'pruned'
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	807 elif len(successorset) == 1:
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	808 verb = 'rewritten'
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	809 else:
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	810 verb = 'split'
3d0f8918351b template: compute verb in obsfateverb Boris Feld <boris.feld@octobus.net> parents: 33960 diff changeset	811 return verb
34012 38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	812
34013 c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	813 def markersdates(markers):
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	814 """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	815 """
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	816 return [m[4] for m in markers]
c35c0f54f420 template: compute dates in obsfatedate Boris Feld <boris.feld@octobus.net> parents: 34012 diff changeset	817
34012 38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	818 def markersusers(markers):
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	819 """ 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	820 """
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	821 markersmeta = [dict(m[3]) for m in markers]
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	822 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	823
38f08eaba6b0 template: compute user in obsfateusers Boris Feld <boris.feld@octobus.net> parents: 34011 diff changeset	824 return sorted(users)
34294 7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	825
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	826 def markersoperations(markers):
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	827 """ 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	828 """
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	829 markersmeta = [dict(m[3]) for m in markers]
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	830 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	831 if meta.get('operation'))
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	832
7cdc8c5a481a templates: introduce a obsfateoperation() function Martin von Zweigbergk <martinvonz@google.com> parents: 34014 diff changeset	833 return sorted(operations)
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	834
37328 11d51e518808 obsutil: make obsfateprinter() less dependent on templater Yuya Nishihara <yuya@tcha.org> parents: 36960 diff changeset	835 def obsfateprinter(ui, repo, successors, markers, formatctx):
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	836 """ Build a obsfate string for a single successorset using all obsfate
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	837 related function defined in obsutil
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	838 """
34850 62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	839 quiet = ui.quiet
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	840 verbose = ui.verbose
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	841 normal = not verbose and not quiet
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	842
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	843 line = []
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	844
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	845 # Verb
35049 b81ad5b78a81 obsfate: makes successorsetverb takes the markers as argument Boris Feld <boris.feld@octobus.net> parents: 34873 diff changeset	846 line.append(obsfateverb(successors, markers))
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	847
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	848 # Operations
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	849 operations = markersoperations(markers)
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	850 if operations:
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	851 line.append(" using %s" % ", ".join(operations))
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	852
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	853 # Successors
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	854 if successors:
37328 11d51e518808 obsutil: make obsfateprinter() less dependent on templater Yuya Nishihara <yuya@tcha.org> parents: 36960 diff changeset	855 fmtsuccessors = [formatctx(repo[succ]) for succ in successors]
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	856 line.append(" as %s" % ", ".join(fmtsuccessors))
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	857
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	858 # Users
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	859 users = markersusers(markers)
34850 62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	860 # Filter out current user in not verbose mode to reduce amount of
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	861 # information
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	862 if not verbose:
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	863 currentuser = ui.username(acceptempty=True)
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	864 if len(users) == 1 and currentuser in users:
62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	865 users = None
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	866
34850 62a4ccf9784a obsfate: filter out current user if not in verbose Boris Feld <boris.feld@octobus.net> parents: 34847 diff changeset	867 if (verbose or normal) and users:
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	868 line.append(" by %s" % ", ".join(users))
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	869
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	870 # Date
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	871 dates = markersdates(markers)
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	872
34873 aa849cf5d089 obsfate: fix obsfate_printer with empty date list Boris Feld <boris.feld@octobus.net> parents: 34851 diff changeset	873 if dates and verbose:
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	874 min_date = min(dates)
6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	875 max_date = max(dates)
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	876
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	877 if min_date == max_date:
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 35933 diff changeset	878 fmtmin_date = dateutil.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	879 line.append(" (at %s)" % fmtmin_date)
6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	880 else:
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 35933 diff changeset	881 fmtmin_date = dateutil.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 35933 diff changeset	882 fmtmax_date = dateutil.datestr(max_date, '%Y-%m-%d %H:%M %1%2')
34851 6f53a53245a2 obsfate: only display date in verbose mode Boris Feld <boris.feld@octobus.net> parents: 34850 diff changeset	883 line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))
34847 e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	884
e27f1f04c2cf templatekw: introduce obsfate keyword Boris Feld <boris.feld@octobus.net> parents: 34423 diff changeset	885 return "".join(line)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	886
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	887
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	888 filteredmsgtable = {
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	889 "pruned": _("hidden revision '%s' is pruned"),
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	890 "diverged": _("hidden revision '%s' has diverged"),
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	891 "superseded": _("hidden revision '%s' was rewritten as: %s"),
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	892 "superseded_split": _("hidden revision '%s' was split as: %s"),
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	893 "superseded_split_several": _("hidden revision '%s' was split as: %s and "
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	894 "%d more"),
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	895 }
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	896
35610 22c42bfbe7ab visibility: pass a normal repo to _getfilteredreason Boris Feld <boris.feld@octobus.net> parents: 35609 diff changeset	897 def _getfilteredreason(repo, changeid, ctx):
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	898 """return a human-friendly string on why a obsolete changeset is hidden
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	899 """
35610 22c42bfbe7ab visibility: pass a normal repo to _getfilteredreason Boris Feld <boris.feld@octobus.net> parents: 35609 diff changeset	900 successors = successorssets(repo, ctx.node())
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	901 fate = _getobsfate(successors)
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	902
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	903 # Be more precise in case the revision is superseded
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	904 if fate == 'pruned':
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	905 return filteredmsgtable['pruned'] % changeid
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	906 elif fate == 'diverged':
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	907 return filteredmsgtable['diverged'] % changeid
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	908 elif fate == 'superseded':
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	909 single_successor = nodemod.short(successors[0][0])
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	910 return filteredmsgtable['superseded'] % (changeid, single_successor)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	911 elif fate == 'superseded_split':
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	912
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	913 succs = []
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	914 for node_id in successors[0]:
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	915 succs.append(nodemod.short(node_id))
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	916
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	917 if len(succs) <= 2:
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	918 fmtsuccs = ', '.join(succs)
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	919 return filteredmsgtable['superseded_split'] % (changeid, fmtsuccs)
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	920 else:
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	921 firstsuccessors = ', '.join(succs[:2])
35571 265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	922 remainingnumber = len(succs) - 2
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev Boris Feld <boris.feld@octobus.net> parents: 35317 diff changeset	923
35609 c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	924 args = (changeid, firstsuccessors, remainingnumber)
c026547454dd visibility: make the filtered message translatable Boris Feld <boris.feld@octobus.net> parents: 35571 diff changeset	925 return filteredmsgtable['superseded_split_several'] % args
36960 efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	926
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	927 def divergentsets(repo, ctx):
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	928 """Compute sets of commits divergent with a given one"""
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	929 cache = {}
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	930 base = {}
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	931 for n in allpredecessors(repo.obsstore, [ctx.node()]):
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	932 if n == ctx.node():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	933 # a node can't be a base for divergence with itself
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	934 continue
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	935 nsuccsets = successorssets(repo, n, cache)
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	936 for nsuccset in nsuccsets:
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	937 if ctx.node() in nsuccset:
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	938 # we are only interested in other successor sets
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	939 continue
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	940 if tuple(nsuccset) in base:
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	941 # we already know the latest base for this divergency
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	942 continue
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	943 base[tuple(nsuccset)] = n
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	944 return [{'divergentnodes': divset, 'commonpredecessor': b}
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	945 for divset, b in base.iteritems()]
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	946
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	947 def whyunstable(repo, ctx):
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	948 result = []
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	949 if ctx.orphan():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	950 for parent in ctx.parents():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	951 kind = None
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	952 if parent.orphan():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	953 kind = 'orphan'
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	954 elif parent.obsolete():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	955 kind = 'obsolete'
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	956 if kind is not None:
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	957 result.append({'instability': 'orphan',
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	958 'reason': '%s parent' % kind,
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	959 'node': parent.hex()})
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	960 if ctx.phasedivergent():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	961 predecessors = allpredecessors(repo.obsstore, [ctx.node()],
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	962 ignoreflags=bumpedfix)
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	963 immutable = [repo[p] for p in predecessors
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	964 if p in repo and not repo[p].mutable()]
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	965 for predecessor in immutable:
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	966 result.append({'instability': 'phase-divergent',
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	967 'reason': 'immutable predecessor',
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	968 'node': predecessor.hex()})
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	969 if ctx.contentdivergent():
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	970 dsets = divergentsets(repo, ctx)
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	971 for dset in dsets:
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	972 divnodes = [repo[n] for n in dset['divergentnodes']]
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	973 result.append({'instability': 'content-divergent',
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	974 'divergentnodes': divnodes,
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	975 'reason': 'predecessor',
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	976 'node': nodemod.hex(dset['commonpredecessor'])})
efc4fb344c05 debug: add debugwhyunstable that explains instabilities Anton Shestakov <av6@dwimlabs.net> parents: 36959 diff changeset	977 return result

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/obsutil.py @ 38525:c1a7bbf9984d