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

annotate mercurial/obsolete.py @ 22850:b078e4dc9f9a

obsstore: add a flag for sha256 hashes We add flag to inform that the marker is using sha256 hashes. As format 0 is not able to handle sha256 hashes (32 bytes long), we plain crash if we even attempt to encode a sha256 with it.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Fri, 10 Oct 2014 16:43:04 -0500
parents	fd759142c6e5
children	974389427e5f

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
22612 fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	66 The header is followed by the markers. Marker format depend of the version. See
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	67 comment associated with each format for details.
21164 2efcef493aa2 obsolete: fix language and grammar in module docstring Martin Geisler <martin@geisler.net> parents: 21098 diff changeset	68
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	69 """
17200 19f5dec2d61f obsolete: os.SEEK_END first appeared in Python 2.5 Adrian Buehlmann <adrian@cadifra.com> parents: 17195 diff changeset	70 import struct
17774 0496d4f73cf4 obsolete: cheap detection of nullid as successors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17537 diff changeset	71 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	72 import phases
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	73 from i18n import _
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	74
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	75 _pack = struct.pack
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	76 _unpack = struct.unpack
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	77
17429 72fa4ef2245f declare local constants instead of using magic values and comments Mads Kiilerich <mads@kiilerich.com> parents: 17426 diff changeset	78 _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	79
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17405 diff changeset	80 # 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	81 # 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	82 _enabled = False
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	83
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	84 ### 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	85
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	86 ## bumpedfix flag
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	87 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	88 # 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	89 # "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	90 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	91 # 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	92 # \|`:
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	93 # \| o A
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	94 # \|/
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	95 # o Z
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	96 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	97 # 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	98 # 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	99 # 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	100 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	101 # o Ad
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	102 # \|`:
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	103 # \| x A'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	104 # \|'\|
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	105 # o \| A
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	106 # \|/
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	107 # o Z
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	108 #
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	109 # 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	110 # 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	111 # 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	112 # 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	113 # "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	114 bumpedfix = 1
22850 b078e4dc9f9a obsstore: add a flag for sha256 hashes Pierre-Yves David <pierre-yves.david@fb.com> parents: 22849 diff changeset	115 usingsha256 = 2
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	116
22612 fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	117 ## Parsing and writing of version "0"
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	118 #
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	119 # The header is followed by the markers. Each marker is made of:
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	120 #
22849 fd759142c6e5 obsolete: use uint## in the format documention Pierre-Yves David <pierre-yves.david@fb.com> parents: 22848 diff changeset	121 # - 1 uint8 : number of new changesets "N", can be zero.
22612 fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	122 #
22849 fd759142c6e5 obsolete: use uint## in the format documention Pierre-Yves David <pierre-yves.david@fb.com> parents: 22848 diff changeset	123 # - 1 uint32: metadata size "M" in bytes.
22612 fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	124 #
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	125 # - 1 byte: a bit field. It is reserved for flags used in common
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	126 # obsolete marker operations, to avoid repeated decoding of metadata
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	127 # entries.
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	128 #
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	129 # - 20 bytes: obsoleted changeset identifier.
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	130 #
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	131 # - N*20 bytes: new changesets identifiers.
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	132 #
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	133 # - M bytes: metadata as a sequence of nul-terminated strings. Each
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	134 # string contains a key and a value, separated by a colon ':', without
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	135 # additional encoding. Keys cannot contain '\0' or ':' and values
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	136 # cannot contain '\0'.
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	137 _fm0version = 0
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	138 _fm0fixed = '>BIB20s'
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	139 _fm0node = '20s'
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	140 _fm0fsize = struct.calcsize(_fm0fixed)
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	141 _fm0fnodesize = struct.calcsize(_fm0node)
22334 f2c3cfc30e9c obsolete: move _encodemarkers next to _readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22333 diff changeset	142
22328 fba8c1a4ce21 obsolete: extract the part of _readmarkers specific to format version 0 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22327 diff changeset	143 def _fm0readmarkers(data, off=0):
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	144 # Loop on markers
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	145 l = len(data)
22327 f737631a9f0a obsolete: rename all _fm to _fm0 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22326 diff changeset	146 while off + _fm0fsize <= l:
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	147 # read fixed part
22327 f737631a9f0a obsolete: rename all _fm to _fm0 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22326 diff changeset	148 cur = data[off:off + _fm0fsize]
f737631a9f0a obsolete: rename all _fm to _fm0 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22326 diff changeset	149 off += _fm0fsize
22685 753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	150 numsuc, mdsize, flags, pre = _unpack(_fm0fixed, cur)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	151 # read replacement
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	152 sucs = ()
22685 753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	153 if numsuc:
753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	154 s = (_fm0fnodesize * numsuc)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	155 cur = data[off:off + s]
22685 753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	156 sucs = _unpack(_fm0node * numsuc, cur)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	157 off += s
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	158 # read metadata
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	159 # (metadata will be decoded on demand)
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	160 metadata = data[off:off + mdsize]
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	161 if len(metadata) != mdsize:
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	162 raise util.Abort(_('parsing obsolete marker: metadata is too '
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	163 '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	164 % (mdsize, len(metadata)))
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	165 off += mdsize
22847 37460ee2003c obsolete: _rename decodemeta to _fm0decodemeta Pierre-Yves David <pierre-yves.david@fb.com> parents: 22846 diff changeset	166 metadata = _fm0decodemeta(metadata)
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	167 try:
22845 ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	168 when, offset = metadata.pop('date', '0 0').split(' ')
22309 a65697c3f20e obsolete: avoid slow, generic date parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 22274 diff changeset	169 date = float(when), int(offset)
a65697c3f20e obsolete: avoid slow, generic date parsing Gregory Szorc <gregory.szorc@gmail.com> parents: 22274 diff changeset	170 except ValueError:
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	171 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	172 parents = None
22845 ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	173 if 'p2' in metadata:
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	174 parents = (metadata.pop('p1', None), metadata.pop('p2', None))
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	175 elif 'p1' in metadata:
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	176 parents = (metadata.pop('p1', None),)
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	177 elif 'p0' in metadata:
22258 cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	178 parents = ()
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	179 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	180 try:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	181 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	182 # 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	183 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	184 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	185 parents = None
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	186 break
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	187 except TypeError:
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	188 # 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	189 parents = None
cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	190
22845 ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	191 metadata = tuple(sorted(metadata.iteritems()))
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	192
22258 cf414981978a obsstore: also store the 'parents' field on disk Pierre-Yves David <pierre-yves.david@fb.com> parents: 22257 diff changeset	193 yield (pre, sucs, flags, metadata, date, parents)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	194
22330 e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	195 def _fm0encodeonemarker(marker):
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	196 pre, sucs, flags, metadata, date, parents = marker
22850 b078e4dc9f9a obsstore: add a flag for sha256 hashes Pierre-Yves David <pierre-yves.david@fb.com> parents: 22849 diff changeset	197 if flags & usingsha256:
b078e4dc9f9a obsstore: add a flag for sha256 hashes Pierre-Yves David <pierre-yves.david@fb.com> parents: 22849 diff changeset	198 raise util.Abort(_('cannot handle sha256 with old obsstore format'))
22845 ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	199 metadata = dict(metadata)
22330 e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	200 metadata['date'] = '%d %i' % date
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	201 if parents is not None:
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	202 if not parents:
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	203 # mark that we explicitly recorded no parents
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	204 metadata['p0'] = ''
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	205 for i, p in enumerate(parents):
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	206 metadata['p%i' % (i + 1)] = node.hex(p)
22846 b1efc4893da4 obsolete: _rename encodemeta to _fm0encodemeta Pierre-Yves David <pierre-yves.david@fb.com> parents: 22845 diff changeset	207 metadata = _fm0encodemeta(metadata)
22685 753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	208 numsuc = len(sucs)
753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	209 format = _fm0fixed + (_fm0node * numsuc)
753515d9e274 obsolete: replace "nb" notation with "num" (for "number") Pierre-Yves David <pierre-yves.david@fb.com> parents: 22614 diff changeset	210 data = [numsuc, len(metadata), flags, pre]
22330 e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	211 data.extend(sucs)
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	212 return _pack(format, *data) + metadata
e74f8a65252d obsolete: move _fm0encodeonemarker next to _fm0readmarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22329 diff changeset	213
22848 72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	214 def _fm0encodemeta(meta):
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	215 """Return encoded metadata string to string mapping.
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	216
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	217 Assume no ':' in key and no '\0' in both key and value."""
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	218 for key, value in meta.iteritems():
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	219 if ':' in key or '\0' in key:
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	220 raise ValueError("':' and '\0' are forbidden in metadata key'")
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	221 if '\0' in value:
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	222 raise ValueError("':' is forbidden in metadata value'")
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	223 return '\0'.join(['%s:%s' % (k, meta[k]) for k in sorted(meta)])
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	224
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	225 def _fm0decodemeta(data):
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	226 """Return string to string dictionary from encoded version."""
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	227 d = {}
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	228 for l in data.split('\0'):
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	229 if l:
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	230 key, value = l.split(':')
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	231 d[key] = value
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	232 return d
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	233
72100c1d53d4 obsolete: gather _fm0 meta encoding with other _fm0 code Pierre-Yves David <pierre-yves.david@fb.com> parents: 22847 diff changeset	234
22331 b130b241718e obsolete: support for any known obsstore format when reading or writing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22330 diff changeset	235 # mapping to read/write various marker formats
b130b241718e obsolete: support for any known obsstore format when reading or writing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22330 diff changeset	236 # <version> -> (decoder, encoder)
22614 e69a199bb127 obsolete: use version constants in the format mapping Pierre-Yves David <pierre-yves.david@fb.com> parents: 22613 diff changeset	237 formats = {_fm0version: (_fm0readmarkers, _fm0encodeonemarker)}
22331 b130b241718e obsolete: support for any known obsstore format when reading or writing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22330 diff changeset	238
22612 fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	239 def _readmarkers(data):
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	240 """Read and enumerate markers from raw data"""
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	241 off = 0
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	242 diskversion = _unpack('>B', data[off:off + 1])[0]
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	243 off += 1
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	244 if diskversion not in formats:
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	245 raise util.Abort(_('parsing obsolete marker: unknown version %r')
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	246 % diskversion)
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	247 return diskversion, formats[diskversion][0](data, off)
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	248
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	249 def encodemarkers(markers, addheader=False, version=_fm0version):
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	250 # Kept separate from flushmarkers(), it will be reused for
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	251 # markers exchange.
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	252 encodeone = formats[version][1]
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	253 if addheader:
22613 e623898b80f5 obsolete: use the `version` argument in encodemarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22612 diff changeset	254 yield _pack('>B', version)
22612 fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	255 for marker in markers:
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	256 yield encodeone(marker)
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	257
fdfa40ee75cf obsolete: gather all contents related to format version 0 in a single place Pierre-Yves David <pierre-yves.david@fb.com> parents: 22507 diff changeset	258
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	259 class marker(object):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	260 """Wrap obsolete marker raw data"""
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	261
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	262 def __init__(self, repo, data):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	263 # 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	264 self._repo = repo
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	265 self._data = data
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	266 self._decodedmeta = None
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	267
20031 6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	268 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	269 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	270
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	271 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	272 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	273 return False
6c1adf2067bb obsolete: add __eq__ and __hash__ to marker to make set() deduplication work Augie Fackler <raf@durin42.com> parents: 20030 diff changeset	274 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	275
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	276 def precnode(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	277 """Precursor changeset node identifier"""
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	278 return self._data[0]
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	279
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	280 def succnodes(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	281 """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	282 return self._data[1]
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	283
22259 2e6f03a193f9 obsmarkers: add a `parentnodes` method to retrieve parent information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22258 diff changeset	284 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	285 """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	286 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	287
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	288 def metadata(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	289 """Decoded metadata dictionary"""
22845 ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	290 return dict(self._data[3])
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	291
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	292 def date(self):
517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	293 """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	294 return self._data[4]
17072 517af63ba382 obsolete: helper class to access obsolete marker data Pierre-Yves.David@ens-lyon.org parents: 17071 diff changeset	295
22215 525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	296 def flags(self):
525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	297 """The flags field of the marker"""
525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	298 return self._data[2]
525cde5d954d obsmarker: add a `flags` method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22207 diff changeset	299
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	300 class obsstore(object):
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	301 """Store obsolete markers
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	302
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	303 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	304 - 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	305 - 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	306 - 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	307 """
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	308
22254 b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	309 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	310 # prec: nodeid, precursor changesets
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	311 # 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	312 # 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	313 # meta: binary blob, encoded metadata dictionary
b8a0e8176693 obsstore: add a `parents` field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22253 diff changeset	314 # 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	315 # 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	316 # 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	317
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	318 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	319 # 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	320 self.caches = {}
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	321 self._all = []
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	322 self.precursors = {}
ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	323 self.successors = {}
22270 e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	324 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	325 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	326 data = sopener.tryread('obsstore')
22333 5bf18f8ca89d obsstore: store and preserve ondisk version Pierre-Yves David <pierre-yves.david@fb.com> parents: 22332 diff changeset	327 self._version = _fm0version
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	328 if data:
22333 5bf18f8ca89d obsstore: store and preserve ondisk version Pierre-Yves David <pierre-yves.david@fb.com> parents: 22332 diff changeset	329 self._version, markers = _readmarkers(data)
22332 13e22358e9d2 obsolete: have _readmarkers return the format version Pierre-Yves David <pierre-yves.david@fb.com> parents: 22331 diff changeset	330 self._load(markers)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	331
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	332 def __iter__(self):
3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	333 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	334
20585 f3c8db3d6d66 obsstore: add a __len__ method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20584 diff changeset	335 def __len__(self):
f3c8db3d6d66 obsstore: add a __len__ method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20584 diff changeset	336 return len(self._all)
f3c8db3d6d66 obsstore: add a __len__ method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20584 diff changeset	337
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	338 def __nonzero__(self):
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	339 return bool(self._all)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	340
22255 adb3798dce49 obsstore: add a `parents` argument to obsstore.create Pierre-Yves David <pierre-yves.david@fb.com> parents: 22254 diff changeset	341 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	342 date=None, metadata=None):
17071 11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	343 """obsolete: add a new obsolete marker
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	344
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	345 * ensuring it is hashable
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	346 * check mandatory metadata
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	347 * 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	348
3af218cf2007 obsstore: update create docstring to point to the coder friendly function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20476 diff changeset	349 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	350 `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	351
224a058f7cd1 obsstore: `create` method return True if a marker is actually added Pierre-Yves David <pierre-yves.david@fb.com> parents: 20549 diff changeset	352 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	353 already existed (no op).
17071 11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	354 """
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	355 if metadata is None:
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	356 metadata = {}
22222 883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	357 if date is None:
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	358 if 'date' in metadata:
883e8b6bd461 obsmarker: add `date` as an explicit field Pierre-Yves David <pierre-yves.david@fb.com> parents: 22221 diff changeset	359 # 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	360 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	361 else:
22217 570f87422f54 obsstore: add an explicit `date` argument to obsstore.create Pierre-Yves David <pierre-yves.david@fb.com> parents: 22216 diff changeset	362 date = util.makedate()
17071 11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	363 if len(prec) != 20:
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	364 raise ValueError(prec)
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	365 for succ in succs:
11f26e2669aa command: creation of obsolete marker Pierre-Yves.David@ens-lyon.org parents: 17070 diff changeset	366 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	367 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	368 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	369 raise ValueError(_('in-marker cycle with %s') % node.hex(prec))
22845 ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	370
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	371 metadata = tuple(sorted(metadata.iteritems()))
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	372
ef880e28e56a obsolete: store metadata as a tuple of (key, value) pairs (API) Pierre-Yves David <pierre-yves.david@fb.com> parents: 22685 diff changeset	373 marker = (str(prec), tuple(succs), int(flag), metadata, 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	374 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	375
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	376 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	377 """Add new markers to the store
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	378
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	379 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	380 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	381 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	382 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	383 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	384 new = []
5931489b65e0 obsolete: do not accept duplicated marker during exchange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20028 diff changeset	385 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	386 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	387 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	388 new.append(m)
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	389 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	390 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	391 try:
17195 48c232873a54 obsolete: add seek to end of file before calling tell (issue3543) Adrian Buehlmann <adrian@cadifra.com> parents: 17126 diff changeset	392 # 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	393 # 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	394 # 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	395 # 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	396 # some platforms (issue3543).
17429 72fa4ef2245f declare local constants instead of using magic values and comments Mads Kiilerich <mads@kiilerich.com> parents: 17426 diff changeset	397 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	398 offset = f.tell()
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	399 transaction.add('obsstore', offset)
17219 494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	400 # offset == 0: new file - add the version header
22335 7c4c19dfd484 obsolete: make encodemarkers a public function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22334 diff changeset	401 for bytes in encodemarkers(new, offset == 0, self._version):
17219 494a970f68de obsolete: refactor writemarkers to only encode them Pierre-Yves.David@ens-lyon.org parents: 17213 diff changeset	402 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	403 finally:
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	404 # 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	405 # 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	406 f.close()
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	407 self._load(new)
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	408 # 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	409 self.caches.clear()
22339 9680da73cfe0 obsmarker: record the number of new markers in the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 22335 diff changeset	410 # records the number of new markers for the transaction hooks
9680da73cfe0 obsmarker: record the number of new markers in the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 22335 diff changeset	411 previous = int(transaction.hookargs.get('new_obsmarkers', '0'))
9680da73cfe0 obsmarker: record the number of new markers in the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 22335 diff changeset	412 transaction.hookargs['new_obsmarkers'] = str(previous + len(new))
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	413 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	414
17524 a736e1e15e46 spelling: transaction timeless@mozdev.org parents: 17516 diff changeset	415 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	416 """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	417
3363f2d36015 obsstore: have the `mergemarkers` method return the number of new markers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22309 diff changeset	418 Returns the number of new markers added."""
22332 13e22358e9d2 obsolete: have _readmarkers return the format version Pierre-Yves David <pierre-yves.david@fb.com> parents: 22331 diff changeset	419 version, 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	420 return self.add(transaction, markers)
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	421
17220 bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	422 def _load(self, markers):
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	423 for mark in markers:
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	424 self._all.append(mark)
bdac214a4705 obsolete: obsstore.add now takes a list of markers. Pierre-Yves.David@ens-lyon.org parents: 17219 diff changeset	425 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	426 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	427 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	428 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	429 parents = mark[5]
e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	430 if parents is not None:
e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	431 for p in parents:
e5adb6935239 obsstore: keep track of children information Pierre-Yves David <pierre-yves.david@fb.com> parents: 22268 diff changeset	432 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	433 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	434 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	435 'invalid successors nullid'))
22271 8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	436 def relevantmarkers(self, nodes):
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	437 """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	438
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	439 "relevant" to a set of nodes mean:
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	440
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	441 - marker that use this changeset as successor
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	442 - 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	443 - 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	444
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	445 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	446
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	447 pendingnodes = set(nodes)
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	448 seenmarkers = set()
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	449 seennodes = set(pendingnodes)
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	450 precursorsmarkers = self.precursors
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	451 children = self.children
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	452 while pendingnodes:
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	453 direct = set()
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	454 for current in pendingnodes:
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	455 direct.update(precursorsmarkers.get(current, ()))
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	456 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	457 direct.update(pruned)
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	458 direct -= seenmarkers
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	459 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	460 seenmarkers \|= direct
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	461 pendingnodes -= seennodes
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	462 seennodes \|= pendingnodes
8c69262df82d obsstore: add relevantmarkers method Pierre-Yves David <pierre-yves.david@fb.com> parents: 22270 diff changeset	463 return seenmarkers
17070 ad0d6c2b3279 obsolete: introduction of obsolete markers Pierre-Yves.David@ens-lyon.org parents: diff changeset	464
22345 cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	465 def commonversion(versions):
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	466 """Return the newest version listed in both versions and our local formats.
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	467
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	468 Returns None if no common version exists.
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	469 """
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	470 versions.sort(reverse=True)
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	471 # search for highest version known on both side
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	472 for v in versions:
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	473 if v in formats:
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	474 return v
cf7014c5f087 obsolete: add a `commonversion` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22339 diff changeset	475 return None
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	476
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	477 # 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	478 # 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	479 # - the version header
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	480 # - the base85 encoding
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	481 _maxpayload = 5300
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	482
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	483 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	484 """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	485
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	486 - binary data is base85 encoded
7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	487 - 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	488 keys = {}
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	489 parts = []
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	490 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	491 for marker in markers:
22329 ed37aa74d208 obsolete: rename _encodeonemarker to _fm0encodeonemarkers Pierre-Yves David <pierre-yves.david@fb.com> parents: 22328 diff changeset	492 nextdata = _fm0encodeonemarker(marker)
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	493 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	494 currentpart = []
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	495 currentlen = 0
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	496 parts.append(currentpart)
1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	497 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	498 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	499 for idx, part in enumerate(reversed(parts)):
22327 f737631a9f0a obsolete: rename all _fm to _fm0 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22326 diff changeset	500 data = ''.join([_pack('>B', _fm0version)] + part)
17295 1f08ecc7febb pushkey: splits obsolete marker exchange into multiple keys Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17253 diff changeset	501 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	502 return keys
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	503
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	504 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	505 """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	506 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	507 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	508 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	509
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	510 def pushmarker(repo, key, old, new):
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	511 """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	512 if not key.startswith('dump'):
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	513 repo.ui.warn(_('unknown key: %r') % key)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	514 return 0
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	515 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	516 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	517 return 0
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	518 data = base85.b85decode(new)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	519 lock = repo.lock()
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	520 try:
17126 8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	521 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	522 try:
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	523 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	524 tr.close()
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	525 return 1
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	526 finally:
8fa8717b47b6 obsolete: write obsolete marker inside a transaction Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17125 diff changeset	527 tr.release()
17075 28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	528 finally:
28ed1c4511ce obsolete: exchange obsolete marker over pushkey Pierre-Yves.David@ens-lyon.org parents: 17073 diff changeset	529 lock.release()
17073 3a79a5682af1 obsolete: add easy way to iterate over obsolete marker object Pierre-Yves.David@ens-lyon.org parents: 17072 diff changeset	530
22274 10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	531 def getmarkers(repo, nodes=None):
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	532 """returns markers known in a repository
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	533
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	534 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	535 returned"""
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	536 if nodes is None:
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	537 rawmarkers = repo.obsstore
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	538 else:
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	539 rawmarkers = repo.obsstore.relevantmarkers(nodes)
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	540
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	541 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	542 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	543
22274 10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	544 def relevantmarkers(repo, node):
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	545 """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	546 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	547 yield marker(repo, markerdata)
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	548
10e87c67f1c7 debugobsolete: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 22273 diff changeset	549
17076 75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	550 def precursormarkers(ctx):
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	551 """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	552 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	553 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	554
75f4180509a4 obsolete: function and method to access some obsolete data Pierre-Yves.David@ens-lyon.org parents: 17075 diff changeset	555 def successormarkers(ctx):
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	556 """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	557 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	558 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	559
17831 70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17828 diff changeset	560 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	561 """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	562
612db9d7e76a obsolete: have `allsuccessors` takes a list of nodes Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17826 diff changeset	563 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	564
20204 b0c14c5d44b1 obsolete: improve allsuccessors doc string Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20203 diff changeset	565 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	566 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	567 remaining = set(nodes)
17213 7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	568 seen = set(remaining)
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	569 while remaining:
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	570 current = remaining.pop()
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	571 yield current
17776 072812e9f570 obsolete: flip `obstore.successors` and `obsolete.precursors` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17775 diff changeset	572 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	573 # 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	574 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	575 continue
17213 7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	576 for suc in mark[1]:
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	577 if suc not in seen:
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	578 seen.add(suc)
7eb5aa1f83fd obsolete: add an any successors function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17200 diff changeset	579 remaining.add(suc)
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	580
20206 cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	581 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	582 """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	583
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	584 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	585
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	586 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	587 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	588
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	589 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	590 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	591 while remaining:
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	592 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	593 yield current
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	594 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	595 # 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	596 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	597 continue
cdcbe103b69a obsolete: add an allprecursors method mirroring allsuccessors one. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20204 diff changeset	598 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	599 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	600 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	601 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	602
18984 efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	603 def foreground(repo, nodes):
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	604 """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	605
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	606 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	607 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	608 augmented with obsolescence information.
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	609
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19618 diff changeset	610 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	611 """
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	612 repo = repo.unfiltered()
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	613 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	614 if repo.obsstore:
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	615 # 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	616 # 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	617 nm = repo.changelog.nodemap
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	618 plen = -1
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	619 # 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	620 while len(foreground) != plen:
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	621 plen = len(foreground)
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	622 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	623 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	624 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	625 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	626 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	627 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	628
efef056b1ae9 obsolete: extract foreground computation from bookmark.validdest Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18904 diff changeset	629
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	630 def successorssets(repo, initialnode, cache=None):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	631 """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	632
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	633 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	634 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	635 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	636
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	637 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	638 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	639 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	640 (see below).
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	641
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	642 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	643 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	644 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	645 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	646 [(A',)] or [], respectively.
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	647
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	648 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	649 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	650 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	651 (A'')].
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	652
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	653 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	654 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	655 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	656
20277 c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	657 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	658 without any successors).
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	659
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	660 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	661 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	662 `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	663 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	664 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	665 cache mechanism or suffer terrible performances.
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	666
c05b968d05eb obsolete: clarify documentation for succcessorssets Sean Farley <sean.michael.farley@gmail.com> parents: 20207 diff changeset	667 """
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	668
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	669 succmarkers = repo.obsstore.successors
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 # 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	672 toproceed = [initialnode]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	673 # 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	674 # 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	675 stackedset = set(toproceed)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	676 if cache is None:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	677 cache = {}
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 # 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	680 # successors sets
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	681 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	682 # def successorssets(x):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	683 # successors = directsuccessors(x)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	684 # ss = [[]]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	685 # for succ in directsuccessors(x):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	686 # # product as in itertools cartesian product
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	687 # ss = product(ss, successorssets(succ))
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	688 # return ss
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	689 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	690 # 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	691 # - that would blow the python call stack
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	692 # - 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	693 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	694 # 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	695 # successors set for are stacked there.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	696 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	697 # 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	698 # 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	699 # loop.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	700 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	701 # 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	702 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	703 # 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	704 # for the node requested by the caller.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	705 while toproceed:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	706 # 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	707 # node of the stack: CURRENT.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	708 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	709 # There are four possible outcomes:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	710 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	711 # 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	712 # -> mission accomplished, pop it from the stack.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	713 # 2) Node is not obsolete:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	714 # -> 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	715 # 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	716 # -> We add those successors to the stack.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	717 # 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	718 # -> 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	719 # cache.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	720 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	721 current = toproceed[-1]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	722 if current in cache:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	723 # 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	724 stackedset.remove(toproceed.pop())
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	725 elif current not in succmarkers:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	726 # case (2): The node is not obsolete.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	727 if current in repo:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	728 # We have a valid last successors.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	729 cache[current] = [(current,)]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	730 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	731 # Final obsolete version is unknown locally.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	732 # 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	733 cache[current] = []
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	734 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	735 # cases (3) and (4)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	736 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	737 # 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	738 # from case (4):
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	739 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	740 # 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	741 # 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	742 # 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	743 # loop. (case 3)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	744 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	745 # 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	746 # 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	747 # 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	748 # 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	749 #
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18365 diff changeset	750 # 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	751 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	752 # 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	753 # in phase 2 itself.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	754 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	755 # 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	756 # - 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	757 # precursor (successors markers of CURRENT).
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	758 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	759 # Having multiple entry here means divergence.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	760 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	761 # - 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	762 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	763 # 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	764 # single successors are standard replacement.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	765 #
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18277 diff changeset	766 for mark in sorted(succmarkers[current]):
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	767 for suc in mark[1]:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	768 if suc not in cache:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	769 if suc in stackedset:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	770 # cycle breaking
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	771 cache[suc] = []
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	772 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	773 # 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	774 # 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	775 # `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	776 # iteration.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	777 toproceed.append(suc)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	778 stackedset.add(suc)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	779 break
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	780 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	781 continue
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	782 break
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	783 else:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	784 # 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	785 # successors
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	786 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	787 # 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	788 # successors sets of all its "successors" node.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	789 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	790 # 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	791 # 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	792 # markers.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	793 #
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	794 # 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	795 # 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	796 # divergent successors sets. If multiple successors have
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	797 # 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	798 #
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	799 # 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	800 # 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	801 # another one.
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	802 succssets = []
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18277 diff changeset	803 for mark in sorted(succmarkers[current]):
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	804 # successors sets contributed by this marker
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	805 markss = [[]]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	806 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	807 # cardinal product with previous successors
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	808 productresult = []
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	809 for prefix in markss:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	810 for suffix in cache[suc]:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	811 newss = list(prefix)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	812 for part in suffix:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	813 # do not duplicated entry in successors set
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	814 # first entry wins.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	815 if part not in newss:
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	816 newss.append(part)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	817 productresult.append(newss)
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	818 markss = productresult
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	819 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	820 # 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	821 seen = []
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	822 final = []
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	823 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	824 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	825 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	826 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	827 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	828 break
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	829 else:
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	830 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	831 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	832 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	833 cache[current] = final
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	834 return cache[initialnode]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18001 diff changeset	835
17828 9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	836 def _knownrevs(repo, nodes):
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	837 """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	838
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	839 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	840 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	841 for n in nodes:
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	842 rev = torev(n)
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	843 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	844 yield rev
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	845
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	846 # 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	847 cachefuncs = {}
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	848 def cachefor(name):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	849 """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	850 def decorator(func):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	851 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	852 cachefuncs[name] = func
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	853 return func
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	854 return decorator
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	855
17825 3cc06457f15e obsolete: rename `getobscache` into `getrevs` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17776 diff changeset	856 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	857 """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	858
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	859 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	860 repo = repo.unfiltered()
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	861 if not repo.obsstore:
22507 5c00c5298f98 obsolete: ensure that `getrevs` always return a set Pierre-Yves David <pierre-yves.david@fb.com> parents: 22394 diff changeset	862 return frozenset()
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	863 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	864 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	865 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	866
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	867 # 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	868 #
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	869 # - new changeset is added:
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	870 # - public phase is changed
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	871 # - obsolescence marker are added
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	872 # - 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	873 def clearobscaches(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	874 """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	875
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	876 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	877 repo.
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	878
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	879 (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	880 clearing)"""
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	881 # 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	882 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	883 repo.obsstore.caches.clear()
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	884
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	885 @cachefor('obsolete')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	886 def _computeobsoleteset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	887 """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	888 obs = set()
18271 67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	889 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	890 getphase = repo._phasecache.phase
22200 b27c3beaaf30 cleanup: avoid local vars shadowing imports Mads Kiilerich <madski@unity3d.com> parents: 21166 diff changeset	891 for n in repo.obsstore.successors:
b27c3beaaf30 cleanup: avoid local vars shadowing imports Mads Kiilerich <madski@unity3d.com> parents: 21166 diff changeset	892 rev = getrev(n)
18271 67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	893 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	894 obs.add(rev)
18271 67872e939945 performance: speedup computation of obsolete revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18101 diff changeset	895 return obs
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	896
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	897 @cachefor('unstable')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	898 def _computeunstableset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	899 """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	900 # 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	901 # 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	902 obs = getrevs(repo, 'obsolete')
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	903 if not obs:
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	904 return set()
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	905 cl = repo.changelog
9818f22785b7 performance: speedup computation of unstable revisions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18271 diff changeset	906 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	907
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	908 @cachefor('suspended')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	909 def _computesuspendedset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	910 """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	911 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	912 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	913
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	914 @cachefor('extinct')
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	915 def _computeextinctset(repo):
fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17429 diff changeset	916 """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	917 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	918
17828 9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	919
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	920 @cachefor('bumped')
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	921 def _computebumpedset(repo):
9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	922 """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	923 bumped = set()
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20599 diff changeset	924 # 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	925 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	926 public = phases.public
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	927 cl = repo.changelog
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	928 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	929 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	930 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	931 # 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	932 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	933 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	934 # (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	935 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	936 ignoreflags=bumpedfix):
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	937 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	938 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	939 # 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	940 bumped.add(rev)
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	941 break # Next draft!
cd62532c62a1 obsolete: order of magnitude speedup in _computebumpedset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 20206 diff changeset	942 return bumped
17828 9495be4126ef obsolete: add the detection of bumped changeset. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17827 diff changeset	943
18070 af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	944 @cachefor('divergent')
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	945 def _computedivergentset(repo):
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	946 """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	947 """
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	948 divergent = set()
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	949 obsstore = repo.obsstore
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	950 newermap = {}
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	951 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	952 mark = obsstore.precursors.get(ctx.node(), ())
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	953 toprocess = set(mark)
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	954 while toprocess:
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	955 prec = toprocess.pop()[0]
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	956 if prec not in newermap:
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	957 successorssets(repo, prec, newermap)
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	958 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	959 if len(newer) > 1:
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	960 divergent.add(ctx.rev())
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	961 break
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	962 toprocess.update(obsstore.precursors.get(prec, ()))
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	963 return divergent
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	964
af632936d3d9 obsolete: detect divergent changesets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18069 diff changeset	965
22219 79c686267486 obsolete: add a date argument to the `createmarkers` function Pierre-Yves David <pierre-yves.david@fb.com> parents: 22217 diff changeset	966 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	967 """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	968
20517 2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	969 <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	970 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	971 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	972 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	973
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 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	975
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	976 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	977 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	978
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 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	980 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	981 """
f85816af6294 obsolete: add a high level function to create an obsolete marker Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17469 diff changeset	982 # 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	983 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	984 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	985 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	986 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	987 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	988 try:
20517 2158e8f3cbd2 createmarkers: allow to pass metadata for a marker only Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 20516 diff changeset	989 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	990 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	991 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	992 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	993 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	994 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	995
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	996 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	997 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	998 % 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	999 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	1000 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	1001 npare = None
3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	1002 if not nsucs:
3ae6cc6173e3 createmarkers: automatically record the parent of pruned changesets Pierre-Yves David <pierre-yves.david@fb.com> parents: 22255 diff changeset	1003 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	1004 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	1005 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	1006 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	1007 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	1008 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	1009 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	1010 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	1011 tr.release()

Mercurial > public > mercurial-scm > hg

annotate mercurial/obsolete.py @ 22850:b078e4dc9f9a