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

annotate mercurial/obsolete.py @ 22325:3363f2d36015

obsstore: have the `mergemarkers` method return the number of new markers The mergemarkers function now returns the number of unknown markers in the stream that have been added to the obsstore. This is similar to what `obsstore.add` already does. The method gains a docstring in the process.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Thu, 21 Aug 2014 17:42:50 -0700
parents	a65697c3f20e
children	370b71622670

rev	line source
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	1 # obsolete.py - obsolete markers handling
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	2 #
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	3 # Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	4 # Logilab SA <contact@logilab.fr>
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	5 #
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	6 # This software may be used and distributed according to the terms of the
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	7 # GNU General Public License version 2 or any later version.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	8
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	9 """Obsolete marker handling
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	10
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	11 An obsolete marker maps an old changeset to a list of new
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	12 changesets. If the list of new changesets is empty, the old changeset
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	13 is said to be "killed". Otherwise, the old changeset is being
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	14 "replaced" by the new changesets.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	15
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	16 Obsolete markers can be used to record and distribute changeset graph
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	17 transformations performed by history rewrite operations, and help
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	18 building new tools to reconcile conflicting rewrite actions. To
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	19 facilitate conflict resolution, markers include various annotations
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	20 besides old and news changeset identifiers, such as creation date or
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	21 author name.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	22
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	23 The old obsoleted changeset is called a "precursor" and possible
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	24 replacements are called "successors". Markers that used changeset X as
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	25 a precursor are called "successor markers of X" because they hold
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	26 information about the successors of X. Markers that use changeset Y as
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	27 a successors are call "precursor markers of Y" because they hold
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	28 information about the precursors of Y.
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	29
17775 13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	30 Examples:
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	31
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	32 - When changeset A is replaced by changeset A', one marker is stored:
17775 13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	33
21166 bf2891877378 obsolete: fix one-element tuple in module docstring Martin Geisler <martin@geisler.net> parents: 21165 diff changeset	34 (A, (A',))
17775 13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	35
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	36 - When changesets A and B are folded into a new changeset C, two markers are
17775 13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	37 stored:
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	38
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	39 (A, (C,)) and (B, (C,))
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	40
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	41 - When changeset A is simply "pruned" from the graph, a marker is created:
17775 13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	42
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	43 (A, ())
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	44
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	45 - When changeset A is split into B and C, a single marker are used:
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	46
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	47 (A, (C, C))
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	48
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	49 We use a single marker to distinguish the "split" case from the "divergence"
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	50 case. If two independent operations rewrite the same changeset A in to A' and
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	51 A'', we have an error case: divergent rewriting. We can detect it because
17775 13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	52 two markers will be created independently:
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	53
13744acc4ad7 obsolete: add example of marker usage in the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17774 diff changeset	54 (A, (B,)) and (A, (C,))
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	55
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	56 Format
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	57 ------
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	58
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	59 Markers are stored in an append-only file stored in
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	60 '.hg/store/obsstore'.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	61
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	62 The file starts with a version header:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	63
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	64 - 1 unsigned byte: version number, starting at zero.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	65
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	66
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	67 The header is followed by the markers. Each marker is made of:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	68
21165 fde46c534935 obsolete: let N denote number of obsoleted changestes in a marker Martin Geisler <martin@geisler.net> parents: 21164 diff changeset	69 - 1 unsigned byte: number of new changesets "N", can be zero.
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	70
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	71 - 1 unsigned 32-bits integer: metadata size "M" in bytes.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	72
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	73 - 1 byte: a bit field. It is reserved for flags used in common
2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	74 obsolete marker operations, to avoid repeated decoding of metadata
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	75 entries.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	76
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	77 - 20 bytes: obsoleted changeset identifier.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	78
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	79 - N*20 bytes: new changesets identifiers.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	80
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	81 - M bytes: metadata as a sequence of nul-terminated strings. Each
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	82 string contains a key and a value, separated by a colon ':', without
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	83 additional encoding. Keys cannot contain '\0' or ':' and values
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	84 cannot contain '\0'.
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	85
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	86 """
17200 19f5dec2d61f obsolete: os.SEEK_END first appeared in Python 2.5 Adrian Buehlmann <adrian@cadifra.com> parents: 17195 diff changeset	87 import struct
17774 0496d4f73cf4 obsolete: cheap detection of nullid as successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17537 diff changeset	88 import util, base85, node
20207 cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	89 import phases
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	90 from i18n import _
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	91
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	92 _pack = struct.pack
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	93 _unpack = struct.unpack
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	94
17429 72fa4ef2245f declare local constants instead of using magic values and comments Mads Kiilerich <mads@kiilerich.com> parents: 17426 diff changeset	95 _SEEK_END = 2 # os.SEEK_END was introduced in Python 2.5
72fa4ef2245f declare local constants instead of using magic values and comments Mads Kiilerich <mads@kiilerich.com> parents: 17426 diff changeset	96
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17405 diff changeset	97 # the obsolete feature is not mature enough to be enabled by default.
17296 a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17295 diff changeset	98 # you have to rely on third party extension extension to enable this.
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17295 diff changeset	99 _enabled = False
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	100
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	101 # data used for parsing and writing
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	102 _fmversion = 0
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	103 _fmfixed = '>BIB20s'
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	104 _fmnode = '20s'
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	105 _fmfsize = struct.calcsize(_fmfixed)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	106 _fnodesize = struct.calcsize(_fmnode)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	107
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	108 ### obsolescence marker flag
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	109
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	110 ## bumpedfix flag
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	111 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	112 # When a changeset A' succeed to a changeset A which became public, we call A'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	113 # "bumped" because it's a successors of a public changesets
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	114 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	115 # o A' (bumped)
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	116 # \|`:
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	117 # \| o A
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	118 # \|/
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	119 # o Z
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	120 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	121 # The way to solve this situation is to create a new changeset Ad as children
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	122 # of A. This changeset have the same content than A'. So the diff from A to A'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	123 # is the same than the diff from A to Ad. Ad is marked as a successors of A'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	124 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	125 # o Ad
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	126 # \|`:
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	127 # \| x A'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	128 # \|'\|
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	129 # o \| A
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	130 # \|/
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	131 # o Z
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	132 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	133 # But by transitivity Ad is also a successors of A. To avoid having Ad marked
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	134 # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>.
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18365 diff changeset	135 # This flag mean that the successors express the changes between the public and
3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18365 diff changeset	136 # bumped version and fix the situation, breaking the transitivity of
3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18365 diff changeset	137 # "bumped" here.
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	138 bumpedfix = 1
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	139
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	140 def _readmarkers(data):
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	141 """Read and enumerate markers from raw data"""
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	142 off = 0
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	143 diskversion = _unpack('>B', data[off:off + 1])[0]
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	144 off += 1
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	145 if diskversion != _fmversion:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	146 raise util.Abort(_('parsing obsolete marker: unknown version %r')
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	147 % diskversion)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	148
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	149 # Loop on markers
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	150 l = len(data)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	151 while off + _fmfsize <= l:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	152 # read fixed part
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	153 cur = data[off:off + _fmfsize]
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	154 off += _fmfsize
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	155 nbsuc, mdsize, flags, pre = _unpack(_fmfixed, cur)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	156 # read replacement
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	157 sucs = ()
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	158 if nbsuc:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	159 s = (_fnodesize * nbsuc)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	160 cur = data[off:off + s]
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	161 sucs = _unpack(_fmnode * nbsuc, cur)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	162 off += s
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	163 # read metadata
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	164 # (metadata will be decoded on demand)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	165 metadata = data[off:off + mdsize]
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	166 if len(metadata) != mdsize:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	167 raise util.Abort(_('parsing obsolete marker: metadata is too '
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	168 'short, %d bytes expected, got %d')
17253 67f56ff5afcd obsolete: fix decoding error message arguments Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17220 diff changeset	169 % (mdsize, len(metadata)))
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	170 off += mdsize
22257 4bc96685a40c obsstore: drop 'date' from the metadata dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22256 diff changeset	171 meta = decodemeta(metadata)
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	172 try:
22309 a65697c3f20e obsolete: avoid slow, generic date parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 22274 diff changeset	173 when, offset = decodemeta(metadata).pop('date', '0 0').split(' ')
a65697c3f20e obsolete: avoid slow, generic date parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 22274 diff changeset	174 date = float(when), int(offset)
a65697c3f20e obsolete: avoid slow, generic date parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 22274 diff changeset	175 except ValueError:
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	176 date = (0., 0)
22258 cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	177 parents = None
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	178 if 'p2' in meta:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	179 parents = (meta.pop('p1', None), meta.pop('p2', None))
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	180 elif 'p1' in meta:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	181 parents = (meta.pop('p1', None),)
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	182 elif 'p0' in meta:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	183 parents = ()
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	184 if parents is not None:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	185 try:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	186 parents = tuple(node.bin(p) for p in parents)
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	187 # if parent content is not a nodeid, drop the data
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	188 for p in parents:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	189 if len(p) != 20:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	190 parents = None
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	191 break
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	192 except TypeError:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	193 # if content cannot be translated to nodeid drop the data.
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	194 parents = None
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	195
22257 4bc96685a40c obsstore: drop 'date' from the metadata dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 22256 diff changeset	196 metadata = encodemeta(meta)
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	197
22258 cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	198 yield (pre, sucs, flags, metadata, date, parents)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	199
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	200 def encodemeta(meta):
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	201 """Return encoded metadata string to string mapping.
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	202
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	203 Assume no ':' in key and no '\0' in both key and value."""
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	204 for key, value in meta.iteritems():
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	205 if ':' in key or '\0' in key:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	206 raise ValueError("':' and '\0' are forbidden in metadata key'")
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	207 if '\0' in value:
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	208 raise ValueError("':' is forbidden in metadata value'")
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	209 return '\0'.join(['%s:%s' % (k, meta[k]) for k in sorted(meta)])
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	210
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	211 def decodemeta(data):
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	212 """Return string to string dictionary from encoded version."""
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	213 d = {}
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	214 for l in data.split('\0'):
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	215 if l:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	216 key, value = l.split(':')
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	217 d[key] = value
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	218 return d
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	219
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	220 class marker(object):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	221 """Wrap obsolete marker raw data"""
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	222
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	223 def __init__(self, repo, data):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	224 # the repo argument will be used to create changectx in later version
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	225 self._repo = repo
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	226 self._data = data
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	227 self._decodedmeta = None
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	228
20031 6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	229 def __hash__(self):
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	230 return hash(self._data)
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	231
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	232 def __eq__(self, other):
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	233 if type(other) != type(self):
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	234 return False
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	235 return self._data == other._data
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	236
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	237 def precnode(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	238 """Precursor changeset node identifier"""
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	239 return self._data[0]
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	240
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	241 def succnodes(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	242 """List of successor changesets node identifiers"""
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	243 return self._data[1]
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	244
22259 2e6f03a193f9 obsmarkers: add a `parentnodes` method to retrieve parent information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22258 diff changeset	245 def parentnodes(self):
2e6f03a193f9 obsmarkers: add a `parentnodes` method to retrieve parent information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22258 diff changeset	246 """Parents of the precursors (None if not recorded)"""
2e6f03a193f9 obsmarkers: add a `parentnodes` method to retrieve parent information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22258 diff changeset	247 return self._data[5]
2e6f03a193f9 obsmarkers: add a `parentnodes` method to retrieve parent information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22258 diff changeset	248
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	249 def metadata(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	250 """Decoded metadata dictionary"""
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	251 if self._decodedmeta is None:
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	252 self._decodedmeta = decodemeta(self._data[3])
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	253 return self._decodedmeta
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	254
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	255 def date(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	256 """Creation date as (unixtime, offset)"""
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	257 return self._data[4]
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	258
22215 525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	259 def flags(self):
525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	260 """The flags field of the marker"""
525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	261 return self._data[2]
525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	262
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	263 class obsstore(object):
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	264 """Store obsolete markers
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	265
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	266 Markers can be accessed with two mappings:
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	267 - precursors[x] -> set(markers on precursors edges of x)
072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	268 - successors[x] -> set(markers on successors edges of x)
22270 e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	269 - children[x] -> set(markers on precursors edges of children(x)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	270 """
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	271
22254 b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	272 fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents')
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	273 # prec: nodeid, precursor changesets
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	274 # succs: tuple of nodeid, successor changesets (0-N length)
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	275 # flag: integer, flag field carrying modifier for the markers (see doc)
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	276 # meta: binary blob, encoded metadata dictionary
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	277 # date: (float, int) tuple, date of marker creation
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	278 # parents: (tuple of nodeid) or None, parents of precursors
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	279 # None is used when no data has been recorded
22221 e75b1a3c1dbc obsstore: add fields attribute to track each field in a marker Pierre-Yves David <pierre-yves.david@fb.com> parents: 22219 diff changeset	280
17124 f1b7683f3f95 obsolete: move obsolete markers read/write logic to obsstore object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17117 diff changeset	281 def __init__(self, sopener):
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	282 # caches for various obsolescence related cache
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	283 self.caches = {}
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	284 self._all = []
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	285 self.precursors = {}
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	286 self.successors = {}
22270 e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	287 self.children = {}
17124 f1b7683f3f95 obsolete: move obsolete markers read/write logic to obsstore object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17117 diff changeset	288 self.sopener = sopener
f1b7683f3f95 obsolete: move obsolete markers read/write logic to obsstore object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17117 diff changeset	289 data = sopener.tryread('obsstore')
f1b7683f3f95 obsolete: move obsolete markers read/write logic to obsstore object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17117 diff changeset	290 if data:
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	291 self._load(_readmarkers(data))
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	292
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	293 def __iter__(self):
3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	294 return iter(self._all)
3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	295
20585 f3c8db3d6d66 obsstore: add a __len__ method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20584 diff changeset	296 def __len__(self):
f3c8db3d6d66 obsstore: add a __len__ method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20584 diff changeset	297 return len(self._all)
f3c8db3d6d66 obsstore: add a __len__ method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20584 diff changeset	298
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	299 def __nonzero__(self):
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	300 return bool(self._all)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	301
22255 adb3798dce49 obsstore: add a `parents` argument to obsstore.create Pierre-Yves David <pierre-yves.david@fb.com> parents: 22254 diff changeset	302 def create(self, transaction, prec, succs=(), flag=0, parents=None,
adb3798dce49 obsstore: add a `parents` argument to obsstore.create Pierre-Yves David <pierre-yves.david@fb.com> parents: 22254 diff changeset	303 date=None, metadata=None):
17071 11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	304 """obsolete: add a new obsolete marker
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	305
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	306 * ensuring it is hashable
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	307 * check mandatory metadata
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	308 * encode metadata
20516 3af218cf2007 obsstore: update create docstring to point to the coder friendly function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	309
3af218cf2007 obsstore: update create docstring to point to the coder friendly function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	310 If you are a human writing code creating marker you want to use the
3af218cf2007 obsstore: update create docstring to point to the coder friendly function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	311 `createmarkers` function in this module instead.
20584 224a058f7cd1 obsstore: `create` method return True if a marker is actually added Pierre-Yves David <pierre-yves.david@fb.com> parents: 20549 diff changeset	312
224a058f7cd1 obsstore: `create` method return True if a marker is actually added Pierre-Yves David <pierre-yves.david@fb.com> parents: 20549 diff changeset	313 return True if a new marker have been added, False if the markers
224a058f7cd1 obsstore: `create` method return True if a marker is actually added Pierre-Yves David <pierre-yves.david@fb.com> parents: 20549 diff changeset	314 already existed (no op).
17071 11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	315 """
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	316 if metadata is None:
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	317 metadata = {}
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	318 if date is None:
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	319 if 'date' in metadata:
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	320 # as a courtesy for out-of-tree extensions
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	321 date = util.parsedate(metadata.pop('date'))
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	322 else:
22217 570f87422f54 obsstore: add an explicit `date` argument to obsstore.create Pierre-Yves David <pierre-yves.david@fb.com> parents: 22216 diff changeset	323 date = util.makedate()
17071 11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	324 if len(prec) != 20:
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	325 raise ValueError(prec)
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	326 for succ in succs:
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	327 if len(succ) != 20:
17117 217bfb10e6db obsolete: fix error message at marker creation Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17076 diff changeset	328 raise ValueError(succ)
22177 a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 21166 diff changeset	329 if prec in succs:
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 21166 diff changeset	330 raise ValueError(_('in-marker cycle with %s') % node.hex(prec))
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	331 marker = (str(prec), tuple(succs), int(flag), encodemeta(metadata),
22255 adb3798dce49 obsstore: add a `parents` argument to obsstore.create Pierre-Yves David <pierre-yves.david@fb.com> parents: 22254 diff changeset	332 date, parents)
20584 224a058f7cd1 obsstore: `create` method return True if a marker is actually added Pierre-Yves David <pierre-yves.david@fb.com> parents: 20549 diff changeset	333 return bool(self.add(transaction, [marker]))
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	334
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	335 def add(self, transaction, markers):
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	336 """Add new markers to the store
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	337
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	338 Take care of filtering duplicate.
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	339 Return the number of new marker."""
17296 a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17295 diff changeset	340 if not _enabled:
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17295 diff changeset	341 raise util.Abort('obsolete feature is not enabled on this repo')
20028 28445179df90 obsolete: stop doing membership test on list Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19951 diff changeset	342 known = set(self._all)
20030 5931489b65e0 obsolete: do not accept duplicated marker during exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20028 diff changeset	343 new = []
5931489b65e0 obsolete: do not accept duplicated marker during exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20028 diff changeset	344 for m in markers:
5931489b65e0 obsolete: do not accept duplicated marker during exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20028 diff changeset	345 if m not in known:
5931489b65e0 obsolete: do not accept duplicated marker during exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20028 diff changeset	346 known.add(m)
5931489b65e0 obsolete: do not accept duplicated marker during exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20028 diff changeset	347 new.append(m)
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	348 if new:
17125 95d785ccb4e5 obsolete: append new markers to obsstore file instead of rewriting everything Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17124 diff changeset	349 f = self.sopener('obsstore', 'ab')
17124 f1b7683f3f95 obsolete: move obsolete markers read/write logic to obsstore object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17117 diff changeset	350 try:
17195 48c232873a54 obsolete: add seek to end of file before calling tell (issue3543) Adrian Buehlmann <adrian@cadifra.com> parents: 17126 diff changeset	351 # Whether the file's current position is at the begin or at
48c232873a54 obsolete: add seek to end of file before calling tell (issue3543) Adrian Buehlmann <adrian@cadifra.com> parents: 17126 diff changeset	352 # the end after opening a file for appending is implementation
48c232873a54 obsolete: add seek to end of file before calling tell (issue3543) Adrian Buehlmann <adrian@cadifra.com> parents: 17126 diff changeset	353 # defined. So we must seek to the end before calling tell(),
48c232873a54 obsolete: add seek to end of file before calling tell (issue3543) Adrian Buehlmann <adrian@cadifra.com> parents: 17126 diff changeset	354 # or we may get a zero offset for non-zero sized files on
48c232873a54 obsolete: add seek to end of file before calling tell (issue3543) Adrian Buehlmann <adrian@cadifra.com> parents: 17126 diff changeset	355 # some platforms (issue3543).
17429 72fa4ef2245f declare local constants instead of using magic values and comments Mads Kiilerich <mads@kiilerich.com> parents: 17426 diff changeset	356 f.seek(0, _SEEK_END)
17126 8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	357 offset = f.tell()
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	358 transaction.add('obsstore', offset)
17219 494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	359 # offset == 0: new file - add the version header
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	360 for bytes in _encodemarkers(new, offset == 0):
17219 494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	361 f.write(bytes)
17126 8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	362 finally:
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	363 # XXX: f.close() == filecache invalidation == obsstore rebuilt.
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	364 # call 'filecacheentry.refresh()' here
17124 f1b7683f3f95 obsolete: move obsolete markers read/write logic to obsstore object Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17117 diff changeset	365 f.close()
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	366 self._load(new)
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	367 # new marker may have changed several set. invalidate the cache.
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	368 self.caches.clear()
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	369 return len(new)
17126 8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	370
17524 a736e1e15e46 spelling: transaction timeless@mozdev.org parents: 17516 diff changeset	371 def mergemarkers(self, transaction, data):
22325 3363f2d36015 obsstore: have the `mergemarkers` method return the number of new markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22309 diff changeset	372 """merge a binary stream of markers inside the obsstore
3363f2d36015 obsstore: have the `mergemarkers` method return the number of new markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22309 diff changeset	373
3363f2d36015 obsstore: have the `mergemarkers` method return the number of new markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22309 diff changeset	374 Returns the number of new markers added."""
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	375 markers = _readmarkers(data)
22325 3363f2d36015 obsstore: have the `mergemarkers` method return the number of new markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22309 diff changeset	376 return self.add(transaction, markers)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	377
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	378 def _load(self, markers):
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	379 for mark in markers:
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	380 self._all.append(mark)
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	381 pre, sucs = mark[:2]
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	382 self.successors.setdefault(pre, set()).add(mark)
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	383 for suc in sucs:
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	384 self.precursors.setdefault(suc, set()).add(mark)
22270 e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	385 parents = mark[5]
e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	386 if parents is not None:
e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	387 for p in parents:
e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	388 self.children.setdefault(p, set()).add(mark)
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	389 if node.nullid in self.precursors:
17774 0496d4f73cf4 obsolete: cheap detection of nullid as successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17537 diff changeset	390 raise util.Abort(_('bad obsolescence marker detected: '
0496d4f73cf4 obsolete: cheap detection of nullid as successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17537 diff changeset	391 'invalid successors nullid'))
22271 8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	392 def relevantmarkers(self, nodes):
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	393 """return a set of all obsolescence markers relevant to a set of nodes.
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	394
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	395 "relevant" to a set of nodes mean:
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	396
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	397 - marker that use this changeset as successor
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	398 - prune marker of direct children on this changeset
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	399 - recursive application of the two rules on precursors of these markers
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	400
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	401 It is a set so you cannot rely on order."""
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	402
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	403 pendingnodes = set(nodes)
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	404 seenmarkers = set()
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	405 seennodes = set(pendingnodes)
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	406 precursorsmarkers = self.precursors
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	407 children = self.children
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	408 while pendingnodes:
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	409 direct = set()
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	410 for current in pendingnodes:
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	411 direct.update(precursorsmarkers.get(current, ()))
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	412 pruned = [m for m in children.get(current, ()) if not m[1]]
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	413 direct.update(pruned)
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	414 direct -= seenmarkers
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	415 pendingnodes = set([m[0] for m in direct])
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	416 seenmarkers \|= direct
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	417 pendingnodes -= seennodes
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	418 seennodes \|= pendingnodes
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	419 return seenmarkers
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	420
17219 494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	421 def _encodemarkers(markers, addheader=False):
17125 95d785ccb4e5 obsolete: append new markers to obsstore file instead of rewriting everything Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17124 diff changeset	422 # Kept separate from flushmarkers(), it will be reused for
95d785ccb4e5 obsolete: append new markers to obsstore file instead of rewriting everything Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17124 diff changeset	423 # markers exchange.
17219 494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	424 if addheader:
494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	425 yield _pack('>B', _fmversion)
17125 95d785ccb4e5 obsolete: append new markers to obsstore file instead of rewriting everything Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17124 diff changeset	426 for marker in markers:
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	427 yield _encodeonemarker(marker)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	428
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	429
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	430 def _encodeonemarker(marker):
22254 b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	431 pre, sucs, flags, metadata, date, parents = marker
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	432 metadata = decodemeta(metadata)
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	433 metadata['date'] = '%d %i' % date
22258 cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	434 if parents is not None:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	435 if not parents:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	436 # mark that we explicitly recorded no parents
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	437 metadata['p0'] = ''
22262 10880c8aad85 obsolete: avoid 2-argument form of enumerate, which was new in Python 2.6 Augie Fackler <raf@durin42.com> parents: 22259 diff changeset	438 for i, p in enumerate(parents):
10880c8aad85 obsolete: avoid 2-argument form of enumerate, which was new in Python 2.6 Augie Fackler <raf@durin42.com> parents: 22259 diff changeset	439 metadata['p%i' % (i + 1)] = node.hex(p)
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	440 metadata = encodemeta(metadata)
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	441 nbsuc = len(sucs)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	442 format = _fmfixed + (_fmnode * nbsuc)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	443 data = [nbsuc, len(metadata), flags, pre]
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	444 data.extend(sucs)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	445 return _pack(format, *data) + metadata
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	446
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	447 # arbitrary picked to fit into 8K limit from HTTP server
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	448 # you have to take in account:
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	449 # - the version header
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	450 # - the base85 encoding
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	451 _maxpayload = 5300
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	452
20599 dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	453 def _pushkeyescape(markers):
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	454 """encode markers into a dict suitable for pushkey exchange
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	455
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	456 - binary data is base85 encoded
7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	457 - split in chunks smaller than 5300 bytes"""
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	458 keys = {}
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	459 parts = []
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	460 currentlen = _maxpayload * 2 # ensure we create a new part
20599 dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	461 for marker in markers:
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	462 nextdata = _encodeonemarker(marker)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	463 if (len(nextdata) + currentlen > _maxpayload):
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	464 currentpart = []
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	465 currentlen = 0
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	466 parts.append(currentpart)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	467 currentpart.append(nextdata)
17304 0368fc55d572 obsolete: properly increment currentlen when building pushkey payload Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17298 diff changeset	468 currentlen += len(nextdata)
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	469 for idx, part in enumerate(reversed(parts)):
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	470 data = ''.join([_pack('>B', _fmversion)] + part)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	471 keys['dump%i' % idx] = base85.b85encode(data)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	472 return keys
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	473
20599 dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	474 def listmarkers(repo):
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	475 """List markers over pushkey"""
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	476 if not repo.obsstore:
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	477 return {}
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	478 return _pushkeyescape(repo.obsstore)
dad29624b056 obsolete: extract encoding of marker for pushkey from the list key function Pierre-Yves David <pierre-yves.david@fb.com> parents: 20585 diff changeset	479
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	480 def pushmarker(repo, key, old, new):
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	481 """Push markers over pushkey"""
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	482 if not key.startswith('dump'):
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	483 repo.ui.warn(_('unknown key: %r') % key)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	484 return 0
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	485 if old:
21098 399d7770eef2 obsolete: add '%' specifier to the format string to avoid TypeError at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21024 diff changeset	486 repo.ui.warn(_('unexpected old value for %r') % key)
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	487 return 0
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	488 data = base85.b85decode(new)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	489 lock = repo.lock()
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	490 try:
17126 8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	491 tr = repo.transaction('pushkey: obsolete markers')
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	492 try:
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	493 repo.obsstore.mergemarkers(tr, data)
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	494 tr.close()
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	495 return 1
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	496 finally:
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	497 tr.release()
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	498 finally:
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	499 lock.release()
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	500
22274 10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	501 def getmarkers(repo, nodes=None):
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	502 """returns markers known in a repository
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	503
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	504 If <nodes> is specified, only markers "relevant" to those nodes are are
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	505 returned"""
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	506 if nodes is None:
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	507 rawmarkers = repo.obsstore
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	508 else:
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	509 rawmarkers = repo.obsstore.relevantmarkers(nodes)
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	510
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	511 for markerdata in rawmarkers:
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	512 yield marker(repo, markerdata)
3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	513
22274 10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	514 def relevantmarkers(repo, node):
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	515 """all obsolete markers relevant to some revision"""
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	516 for markerdata in repo.obsstore.relevantmarkers(node):
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	517 yield marker(repo, markerdata)
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	518
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	519
17076 75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	520 def precursormarkers(ctx):
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	521 """obsolete marker marking this changeset as a successors"""
17076 75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	522 for data in ctx._repo.obsstore.precursors.get(ctx.node(), ()):
75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	523 yield marker(ctx._repo, data)
75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	524
75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	525 def successormarkers(ctx):
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	526 """obsolete marker making this changeset obsolete"""
17076 75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	527 for data in ctx._repo.obsstore.successors.get(ctx.node(), ()):
75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	528 yield marker(ctx._repo, data)
75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	529
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	530 def allsuccessors(obsstore, nodes, ignoreflags=0):
17827 612db9d7e76a obsolete: have `allsuccessors` takes a list of nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17826 diff changeset	531 """Yield node for every successor of <nodes>.
612db9d7e76a obsolete: have `allsuccessors` takes a list of nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17826 diff changeset	532
612db9d7e76a obsolete: have `allsuccessors` takes a list of nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17826 diff changeset	533 Some successors may be unknown locally.
17213 7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	534
20204 b0c14c5d44b1 obsolete: improve allsuccessors doc string Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20203 diff changeset	535 This is a linear yield unsuited to detecting split changesets. It includes
b0c14c5d44b1 obsolete: improve allsuccessors doc string Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20203 diff changeset	536 initial nodes too."""
17827 612db9d7e76a obsolete: have `allsuccessors` takes a list of nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17826 diff changeset	537 remaining = set(nodes)
17213 7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	538 seen = set(remaining)
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	539 while remaining:
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	540 current = remaining.pop()
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	541 yield current
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	542 for mark in obsstore.successors.get(current, ()):
20203 509768fc7542 obsolete: fix bad comment Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20031 diff changeset	543 # ignore marker flagged with specified flag
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	544 if mark[2] & ignoreflags:
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	545 continue
17213 7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	546 for suc in mark[1]:
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	547 if suc not in seen:
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	548 seen.add(suc)
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	549 remaining.add(suc)
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	550
20206 cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	551 def allprecursors(obsstore, nodes, ignoreflags=0):
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	552 """Yield node for every precursors of <nodes>.
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	553
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	554 Some precursors may be unknown locally.
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	555
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	556 This is a linear yield unsuited to detecting folded changesets. It includes
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	557 initial nodes too."""
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	558
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	559 remaining = set(nodes)
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	560 seen = set(remaining)
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	561 while remaining:
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	562 current = remaining.pop()
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	563 yield current
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	564 for mark in obsstore.precursors.get(current, ()):
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	565 # ignore marker flagged with specified flag
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	566 if mark[2] & ignoreflags:
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	567 continue
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	568 suc = mark[0]
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	569 if suc not in seen:
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	570 seen.add(suc)
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	571 remaining.add(suc)
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	572
18984 efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	573 def foreground(repo, nodes):
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	574 """return all nodes in the "foreground" of other node
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	575
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	576 The foreground of a revision is anything reachable using parent -> children
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19618 diff changeset	577 or precursor -> successor relation. It is very similar to "descendant" but
18984 efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	578 augmented with obsolescence information.
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	579
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19618 diff changeset	580 Beware that possible obsolescence cycle may result if complex situation.
18984 efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	581 """
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	582 repo = repo.unfiltered()
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	583 foreground = set(repo.set('%ln::', nodes))
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	584 if repo.obsstore:
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	585 # We only need this complicated logic if there is obsolescence
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	586 # XXX will probably deserve an optimised revset.
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	587 nm = repo.changelog.nodemap
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	588 plen = -1
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	589 # compute the whole set of successors or descendants
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	590 while len(foreground) != plen:
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	591 plen = len(foreground)
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	592 succs = set(c.node() for c in foreground)
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	593 mutable = [c.node() for c in foreground if c.mutable()]
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	594 succs.update(allsuccessors(repo.obsstore, mutable))
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	595 known = (n for n in succs if n in nm)
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	596 foreground = set(repo.set('%ln::', known))
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	597 return set(c.node() for c in foreground)
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	598
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	599
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	600 def successorssets(repo, initialnode, cache=None):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	601 """Return all set of successors of initial nodes
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	602
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	603 The successors set of a changeset A are a group of revisions that succeed
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	604 A. It succeeds A as a consistent whole, each revision being only a partial
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	605 replacement. The successors set contains non-obsolete changesets only.
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	606
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	607 This function returns the full list of successor sets which is why it
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	608 returns a list of tuples and not just a single tuple. Each tuple is a valid
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	609 successors set. Not that (A,) may be a valid successors set for changeset A
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	610 (see below).
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	611
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	612 In most cases, a changeset A will have a single element (e.g. the changeset
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	613 A is replaced by A') in its successors set. Though, it is also common for a
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	614 changeset A to have no elements in its successor set (e.g. the changeset
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	615 has been pruned). Therefore, the returned list of successors sets will be
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	616 [(A',)] or [], respectively.
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	617
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	618 When a changeset A is split into A' and B', however, it will result in a
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	619 successors set containing more than a single element, i.e. [(A',B')].
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	620 Divergent changesets will result in multiple successors sets, i.e. [(A',),
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	621 (A'')].
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	622
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	623 If a changeset A is not obsolete, then it will conceptually have no
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	624 successors set. To distinguish this from a pruned changeset, the successor
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	625 set will only contain itself, i.e. [(A,)].
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	626
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	627 Finally, successors unknown locally are considered to be pruned (obsoleted
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	628 without any successors).
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	629
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	630 The optional `cache` parameter is a dictionary that may contain precomputed
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	631 successors sets. It is meant to reuse the computation of a previous call to
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	632 `successorssets` when multiple calls are made at the same time. The cache
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	633 dictionary is updated in place. The caller is responsible for its live
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	634 spawn. Code that makes multiple calls to `successorssets` must use this
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	635 cache mechanism or suffer terrible performances.
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	636
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	637 """
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	638
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	639 succmarkers = repo.obsstore.successors
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	640
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	641 # Stack of nodes we search successors sets for
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	642 toproceed = [initialnode]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	643 # set version of above list for fast loop detection
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	644 # element added to "toproceed" must be added here
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	645 stackedset = set(toproceed)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	646 if cache is None:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	647 cache = {}
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	648
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	649 # This while loop is the flattened version of a recursive search for
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	650 # successors sets
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	651 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	652 # def successorssets(x):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	653 # successors = directsuccessors(x)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	654 # ss = [[]]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	655 # for succ in directsuccessors(x):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	656 # # product as in itertools cartesian product
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	657 # ss = product(ss, successorssets(succ))
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	658 # return ss
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	659 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	660 # But we can not use plain recursive calls here:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	661 # - that would blow the python call stack
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	662 # - obsolescence markers may have cycles, we need to handle them.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	663 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	664 # The `toproceed` list act as our call stack. Every node we search
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	665 # successors set for are stacked there.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	666 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	667 # The `stackedset` is set version of this stack used to check if a node is
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	668 # already stacked. This check is used to detect cycles and prevent infinite
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	669 # loop.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	670 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	671 # successors set of all nodes are stored in the `cache` dictionary.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	672 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	673 # After this while loop ends we use the cache to return the successors sets
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	674 # for the node requested by the caller.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	675 while toproceed:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	676 # Every iteration tries to compute the successors sets of the topmost
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	677 # node of the stack: CURRENT.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	678 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	679 # There are four possible outcomes:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	680 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	681 # 1) We already know the successors sets of CURRENT:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	682 # -> mission accomplished, pop it from the stack.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	683 # 2) Node is not obsolete:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	684 # -> the node is its own successors sets. Add it to the cache.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	685 # 3) We do not know successors set of direct successors of CURRENT:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	686 # -> We add those successors to the stack.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	687 # 4) We know successors sets of all direct successors of CURRENT:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	688 # -> We can compute CURRENT successors set and add it to the
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	689 # cache.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	690 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	691 current = toproceed[-1]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	692 if current in cache:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	693 # case (1): We already know the successors sets
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	694 stackedset.remove(toproceed.pop())
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	695 elif current not in succmarkers:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	696 # case (2): The node is not obsolete.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	697 if current in repo:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	698 # We have a valid last successors.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	699 cache[current] = [(current,)]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	700 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	701 # Final obsolete version is unknown locally.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	702 # Do not count that as a valid successors
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	703 cache[current] = []
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	704 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	705 # cases (3) and (4)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	706 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	707 # We proceed in two phases. Phase 1 aims to distinguish case (3)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	708 # from case (4):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	709 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	710 # For each direct successors of CURRENT, we check whether its
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	711 # successors sets are known. If they are not, we stack the
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	712 # unknown node and proceed to the next iteration of the while
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	713 # loop. (case 3)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	714 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	715 # During this step, we may detect obsolescence cycles: a node
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	716 # with unknown successors sets but already in the call stack.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	717 # In such a situation, we arbitrary set the successors sets of
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	718 # the node to nothing (node pruned) to break the cycle.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	719 #
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18365 diff changeset	720 # If no break was encountered we proceed to phase 2.
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	721 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	722 # Phase 2 computes successors sets of CURRENT (case 4); see details
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	723 # in phase 2 itself.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	724 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	725 # Note the two levels of iteration in each phase.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	726 # - The first one handles obsolescence markers using CURRENT as
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	727 # precursor (successors markers of CURRENT).
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	728 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	729 # Having multiple entry here means divergence.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	730 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	731 # - The second one handles successors defined in each marker.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	732 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	733 # Having none means pruned node, multiple successors means split,
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	734 # single successors are standard replacement.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	735 #
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18277 diff changeset	736 for mark in sorted(succmarkers[current]):
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	737 for suc in mark[1]:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	738 if suc not in cache:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	739 if suc in stackedset:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	740 # cycle breaking
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	741 cache[suc] = []
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	742 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	743 # case (3) If we have not computed successors sets
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	744 # of one of those successors we add it to the
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	745 # `toproceed` stack and stop all work for this
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	746 # iteration.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	747 toproceed.append(suc)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	748 stackedset.add(suc)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	749 break
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	750 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	751 continue
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	752 break
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	753 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	754 # case (4): we know all successors sets of all direct
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	755 # successors
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	756 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	757 # Successors set contributed by each marker depends on the
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	758 # successors sets of all its "successors" node.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	759 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	760 # Each different marker is a divergence in the obsolescence
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18365 diff changeset	761 # history. It contributes successors sets distinct from other
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	762 # markers.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	763 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	764 # Within a marker, a successor may have divergent successors
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	765 # sets. In such a case, the marker will contribute multiple
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	766 # divergent successors sets. If multiple successors have
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	767 # divergent successors sets, a Cartesian product is used.
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	768 #
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	769 # At the end we post-process successors sets to remove
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	770 # duplicated entry and successors set that are strict subset of
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	771 # another one.
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	772 succssets = []
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18277 diff changeset	773 for mark in sorted(succmarkers[current]):
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	774 # successors sets contributed by this marker
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	775 markss = [[]]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	776 for suc in mark[1]:
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	777 # cardinal product with previous successors
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	778 productresult = []
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	779 for prefix in markss:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	780 for suffix in cache[suc]:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	781 newss = list(prefix)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	782 for part in suffix:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	783 # do not duplicated entry in successors set
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	784 # first entry wins.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	785 if part not in newss:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	786 newss.append(part)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	787 productresult.append(newss)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	788 markss = productresult
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	789 succssets.extend(markss)
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	790 # remove duplicated and subset
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	791 seen = []
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	792 final = []
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	793 candidate = sorted(((set(s), s) for s in succssets if s),
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	794 key=lambda x: len(x[1]), reverse=True)
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	795 for setversion, listversion in candidate:
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	796 for seenset in seen:
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	797 if setversion.issubset(seenset):
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	798 break
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	799 else:
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	800 final.append(listversion)
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	801 seen.append(setversion)
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	802 final.reverse() # put small successors set first
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	803 cache[current] = final
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	804 return cache[initialnode]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	805
17828 9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	806 def _knownrevs(repo, nodes):
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	807 """yield revision numbers of known nodes passed in parameters
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	808
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	809 Unknown revisions are silently ignored."""
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	810 torev = repo.changelog.nodemap.get
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	811 for n in nodes:
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	812 rev = torev(n)
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	813 if rev is not None:
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	814 yield rev
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	815
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	816 # mapping of 'set-name' -> <function to compute this set>
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	817 cachefuncs = {}
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	818 def cachefor(name):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	819 """Decorator to register a function as computing the cache for a set"""
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	820 def decorator(func):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	821 assert name not in cachefuncs
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	822 cachefuncs[name] = func
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	823 return func
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	824 return decorator
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	825
17825 3cc06457f15e obsolete: rename `getobscache` into `getrevs` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17776 diff changeset	826 def getrevs(repo, name):
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	827 """Return the set of revision that belong to the <name> set
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	828
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	829 Such access may compute the set and cache it for future use"""
18001 e02feadd15ea clfilter: unfilter computation of obsolescence related computation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17831 diff changeset	830 repo = repo.unfiltered()
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	831 if not repo.obsstore:
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	832 return ()
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	833 if name not in repo.obsstore.caches:
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	834 repo.obsstore.caches[name] = cachefuncs[name](repo)
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	835 return repo.obsstore.caches[name]
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	836
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	837 # To be simple we need to invalidate obsolescence cache when:
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	838 #
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	839 # - new changeset is added:
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	840 # - public phase is changed
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	841 # - obsolescence marker are added
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	842 # - strip is used a repo
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	843 def clearobscaches(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	844 """Remove all obsolescence related cache from a repo
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	845
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	846 This remove all cache in obsstore is the obsstore already exist on the
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	847 repo.
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	848
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	849 (We could be smarter here given the exact event that trigger the cache
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	850 clearing)"""
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	851 # only clear cache is there is obsstore data in this repo
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	852 if 'obsstore' in repo._filecache:
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	853 repo.obsstore.caches.clear()
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	854
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	855 @cachefor('obsolete')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	856 def _computeobsoleteset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	857 """the set of obsolete revisions"""
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	858 obs = set()
18271 67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	859 getrev = repo.changelog.nodemap.get
67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	860 getphase = repo._phasecache.phase
22200 b27c3beaaf30 cleanup: avoid local vars shadowing imports Mads Kiilerich <madski@unity3d.com> parents: 21166 diff changeset	861 for n in repo.obsstore.successors:
b27c3beaaf30 cleanup: avoid local vars shadowing imports Mads Kiilerich <madski@unity3d.com> parents: 21166 diff changeset	862 rev = getrev(n)
18271 67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	863 if rev is not None and getphase(repo, rev):
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	864 obs.add(rev)
18271 67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	865 return obs
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	866
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	867 @cachefor('unstable')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	868 def _computeunstableset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	869 """the set of non obsolete revisions with obsolete parents"""
18275 9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	870 # revset is not efficient enough here
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	871 # we do (obsolete()::) - obsolete() by hand
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	872 obs = getrevs(repo, 'obsolete')
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	873 if not obs:
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	874 return set()
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	875 cl = repo.changelog
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	876 return set(r for r in cl.descendants(obs) if r not in obs)
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	877
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	878 @cachefor('suspended')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	879 def _computesuspendedset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	880 """the set of obsolete parents with non obsolete descendants"""
18276 834ef7e70d0f performance: speedup computation of suspended revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18275 diff changeset	881 suspended = repo.changelog.ancestors(getrevs(repo, 'unstable'))
834ef7e70d0f performance: speedup computation of suspended revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18275 diff changeset	882 return set(r for r in getrevs(repo, 'obsolete') if r in suspended)
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	883
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	884 @cachefor('extinct')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	885 def _computeextinctset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	886 """the set of obsolete parents without non obsolete descendants"""
18277 a58260bc101f performance: speedup computation of extinct revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18276 diff changeset	887 return getrevs(repo, 'obsolete') - getrevs(repo, 'suspended')
17474 f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	888
17828 9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	889
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	890 @cachefor('bumped')
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	891 def _computebumpedset(repo):
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	892 """the set of revs trying to obsolete public revisions"""
20207 cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	893 bumped = set()
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	894 # util function (avoid attribute lookup in the loop)
20207 cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	895 phase = repo._phasecache.phase # would be faster to grab the full list
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	896 public = phases.public
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	897 cl = repo.changelog
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	898 torev = cl.nodemap.get
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	899 obs = getrevs(repo, 'obsolete')
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	900 for rev in repo:
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	901 # We only evaluate mutable, non-obsolete revision
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	902 if (public < phase(repo, rev)) and (rev not in obs):
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	903 node = cl.node(rev)
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	904 # (future) A cache of precursors may worth if split is very common
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	905 for pnode in allprecursors(repo.obsstore, [node],
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	906 ignoreflags=bumpedfix):
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	907 prev = torev(pnode) # unfiltered! but so is phasecache
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	908 if (prev is not None) and (phase(repo, prev) <= public):
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	909 # we have a public precursors
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	910 bumped.add(rev)
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	911 break # Next draft!
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	912 return bumped
17828 9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	913
18070 af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	914 @cachefor('divergent')
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	915 def _computedivergentset(repo):
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	916 """the set of rev that compete to be the final successors of some revision.
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	917 """
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	918 divergent = set()
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	919 obsstore = repo.obsstore
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	920 newermap = {}
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	921 for ctx in repo.set('(not public()) - obsolete()'):
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	922 mark = obsstore.precursors.get(ctx.node(), ())
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	923 toprocess = set(mark)
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	924 while toprocess:
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	925 prec = toprocess.pop()[0]
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	926 if prec not in newermap:
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	927 successorssets(repo, prec, newermap)
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	928 newer = [n for n in newermap[prec] if n]
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	929 if len(newer) > 1:
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	930 divergent.add(ctx.rev())
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	931 break
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	932 toprocess.update(obsstore.precursors.get(prec, ()))
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	933 return divergent
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	934
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	935
22219 79c686267486 obsolete: add a date argument to the `createmarkers` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22217 diff changeset	936 def createmarkers(repo, relations, flag=0, date=None, metadata=None):
17474 f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	937 """Add obsolete markers between changesets in a repo
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	938
20517 2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	939 <relations> must be an iterable of (<old>, (<new>, ...)[,{metadata}])
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	940 tuple. `old` and `news` are changectx. metadata is an optional dictionary
20517 2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	941 containing metadata for this marker only. It is merged with the global
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	942 metadata specified through the `metadata` argument of this function,
17474 f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	943
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	944 Trying to obsolete a public changeset will raise an exception.
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	945
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	946 Current user and date are used except if specified otherwise in the
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	947 metadata attribute.
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	948
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	949 This function operates within a transaction of its own, but does
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	950 not take any lock on the repo.
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	951 """
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	952 # prepare metadata
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	953 if metadata is None:
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	954 metadata = {}
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	955 if 'user' not in metadata:
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	956 metadata['user'] = repo.ui.username()
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	957 tr = repo.transaction('add-obsolescence-marker')
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	958 try:
20517 2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	959 for rel in relations:
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	960 prec = rel[0]
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	961 sucs = rel[1]
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	962 localmetadata = metadata.copy()
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	963 if 2 < len(rel):
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	964 localmetadata.update(rel[2])
2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	965
17474 f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	966 if not prec.mutable():
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	967 raise util.Abort("cannot obsolete immutable changeset: %s"
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	968 % prec)
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	969 nprec = prec.node()
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	970 nsucs = tuple(s.node() for s in sucs)
22256 3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	971 npare = None
3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	972 if not nsucs:
3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	973 npare = tuple(p.node() for p in prec.parents())
17474 f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	974 if nprec in nsucs:
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	975 raise util.Abort("changeset %s cannot obsolete itself" % prec)
22256 3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	976 repo.obsstore.create(tr, nprec, nsucs, flag, parents=npare,
3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	977 date=date, metadata=localmetadata)
18101 a464deecc9dd clfilter: add a cache on repo for set of revision to filter for a given set. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18070 diff changeset	978 repo.filteredrevcache.clear()
17474 f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	979 tr.close()
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	980 finally:
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	981 tr.release()

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/obsolete.py @ 22325:3363f2d36015