mercurial-scm/hg-stable: mercurial/pure/parsers.py annotate

annotate mercurial/pure/parsers.py @ 48200:77fc340acad7

dirstate-v2: Document flags/mode/size/mtime fields of tree nodes This file format modification was previously left incomplete because of planned upcoming changes. Not all of these changes have been made yet, but documenting what exists today will help talking more widely about it. Differential Revision: https://phab.mercurial-scm.org/D11625

author	Simon Sapin <simon.sapin@octobus.net>
date	Mon, 11 Oct 2021 18:23:17 +0200
parents	1ab4523afe12
children	a32a96079e2d

rev	line source
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	1 # parsers.py - Python implementation of parsers.c
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	2 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46730 diff changeset	3 # Copyright 2009 Olivia Mackall <olivia@selenic.com> and others
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7945 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 8225 diff changeset	6 # GNU General Public License version 2 or any later version.
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	7
27339 6ab8c6511a6a parsers: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24634 diff changeset	8 from __future__ import absolute_import
6ab8c6511a6a parsers: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24634 diff changeset	9
6ab8c6511a6a parsers: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24634 diff changeset	10 import struct
6ab8c6511a6a parsers: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24634 diff changeset	11 import zlib
6ab8c6511a6a parsers: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24634 diff changeset	12
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46974 diff changeset	13 from ..node import (
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46974 diff changeset	14 nullrev,
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46974 diff changeset	15 sha1nodeconstants,
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46974 diff changeset	16 )
47566 3df817387ea3 parsers: move DirstateItem to attr.s Augie Fackler <augie@google.com> parents: 47540 diff changeset	17 from ..thirdparty import attr
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	18 from .. import (
47246 6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	19 error,
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	20 pycompat,
47400 ac60a1366a49 revlog: move `offset_type` to `revlogutils` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47281 diff changeset	21 revlogutils,
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	22 util,
845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	23 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	24
44035 ab595920de0e revlogutils: move the NodeMap class in a dedicated nodemap module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43663 diff changeset	25 from ..revlogutils import nodemap as nodemaputil
46857 cc65cea90edb revlog: move the details of revlog "v1" index inside revlog.utils.constants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	26 from ..revlogutils import constants as revlog_constants
44035 ab595920de0e revlogutils: move the NodeMap class in a dedicated nodemap module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43663 diff changeset	27
36964 644a02f6b34f util: prefer "bytesio" to "stringio" Gregory Szorc <gregory.szorc@gmail.com> parents: 34338 diff changeset	28 stringio = pycompat.bytesio
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	29
31230 37596c980662 parsers: alias long to int on Python 3 Pulkit Goyal <7895pulkit@gmail.com> parents: 29133 diff changeset	30
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	31 _pack = struct.pack
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	32 _unpack = struct.unpack
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	33 _compress = zlib.compress
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	34 _decompress = zlib.decompress
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	35
47507 d4c795576aeb dirstate-entry: turn dirstate tuple into a real object (like in C) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47495 diff changeset	36
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	37 # a special value used internally for `size` if the file come from the other parent
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	38 FROM_P2 = -2
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	39
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	40 # a special value used internally for `size` if the file is modified/merged/added
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	41 NONNORMAL = -1
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	42
47540 1a6302427eb9 dirstate-item: use need_delay when packing dirstate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	43 # a special value used internally for `time` if the time is ambigeous
1a6302427eb9 dirstate-item: use need_delay when packing dirstate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	44 AMBIGUOUS_TIME = -1
1a6302427eb9 dirstate-item: use need_delay when packing dirstate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	45
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	46
47664 119b9c8db94d dirstate-item: use an explicit __init__ function instead of the attrs one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47569 diff changeset	47 @attr.s(slots=True, init=False)
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	48 class DirstateItem(object):
47507 d4c795576aeb dirstate-entry: turn dirstate tuple into a real object (like in C) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47495 diff changeset	49 """represent a dirstate entry
d4c795576aeb dirstate-entry: turn dirstate tuple into a real object (like in C) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47495 diff changeset	50
48124 fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	51 It hold multiple attributes
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	52
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	53 # about file tracking
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	54 - wc_tracked: is the file tracked by the working copy
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	55 - p1_tracked: is the file tracked in working copy first parent
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	56 - p2_info: the file has been involved in some merge operation. Either
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	57 because it was actually merged, or because the p2 version was
48200 77fc340acad7 dirstate-v2: Document flags/mode/size/mtime fields of tree nodes Simon Sapin <simon.sapin@octobus.net> parents: 48176 diff changeset	58 ahead, or because some rename moved it there. In either case
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	59 `hg status` will want it displayed as modified.
48124 fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	60
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	61 # about the file state expected from p1 manifest:
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	62 - mode: the file mode in p1
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	63 - size: the file size in p1
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	64
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	65 These value can be set to None, which mean we don't have a meaningful value
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	66 to compare with. Either because we don't really care about them as there
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	67 `status` is known without having to look at the disk or because we don't
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	68 know these right now and a full comparison will be needed to find out if
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	69 the file is clean.
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	70
48124 fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	71 # about the file state on disk last time we saw it:
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	72 - mtime: the last known clean mtime for the file.
fabf687df0ff dirstate-item: update the attribute documentation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	73
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	74 This value can be set to None if no cachable state exist. Either because we
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	75 do not care (see previous section) or because we could not cache something
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	76 yet.
47495 084ed6a7c6fd dirstate: document the dirstatetuple content Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47400 diff changeset	77 """
084ed6a7c6fd dirstate: document the dirstatetuple content Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47400 diff changeset	78
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	79 _wc_tracked = attr.ib()
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	80 _p1_tracked = attr.ib()
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	81 _p2_info = attr.ib()
47566 3df817387ea3 parsers: move DirstateItem to attr.s Augie Fackler <augie@google.com> parents: 47540 diff changeset	82 _mode = attr.ib()
3df817387ea3 parsers: move DirstateItem to attr.s Augie Fackler <augie@google.com> parents: 47540 diff changeset	83 _size = attr.ib()
3df817387ea3 parsers: move DirstateItem to attr.s Augie Fackler <augie@google.com> parents: 47540 diff changeset	84 _mtime = attr.ib()
47507 d4c795576aeb dirstate-entry: turn dirstate tuple into a real object (like in C) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47495 diff changeset	85
47926 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	86 def __init__(
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	87 self,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	88 wc_tracked=False,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	89 p1_tracked=False,
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	90 p2_info=False,
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	91 has_meaningful_data=True,
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	92 has_meaningful_mtime=True,
47926 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	93 parentfiledata=None,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	94 ):
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	95 self._wc_tracked = wc_tracked
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	96 self._p1_tracked = p1_tracked
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	97 self._p2_info = p2_info
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	98
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	99 self._mode = None
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	100 self._size = None
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	101 self._mtime = None
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	102 if parentfiledata is None:
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	103 has_meaningful_mtime = False
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	104 has_meaningful_data = False
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	105 if has_meaningful_data:
47926 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	106 self._mode = parentfiledata[0]
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	107 self._size = parentfiledata[1]
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	108 if has_meaningful_mtime:
47926 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47921 diff changeset	109 self._mtime = parentfiledata[2]
47664 119b9c8db94d dirstate-item: use an explicit __init__ function instead of the attrs one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47569 diff changeset	110
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	111 @classmethod
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	112 def from_v1_data(cls, state, mode, size, mtime):
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	113 """Build a new DirstateItem object from V1 data
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	114
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	115 Since the dirstate-v1 format is frozen, the signature of this function
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	116 is not expected to change, unlike the __init__ one.
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	117 """
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	118 if state == b'm':
48166 7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48165 diff changeset	119 return cls(wc_tracked=True, p1_tracked=True, p2_info=True)
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	120 elif state == b'a':
48168 d342815ff827 dirstate-item: replace call to new_added Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48167 diff changeset	121 return cls(wc_tracked=True)
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	122 elif state == b'r':
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	123 if size == NONNORMAL:
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	124 p1_tracked = True
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	125 p2_info = True
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	126 elif size == FROM_P2:
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	127 p1_tracked = False
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	128 p2_info = True
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	129 else:
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	130 p1_tracked = True
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	131 p2_info = False
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	132 return cls(p1_tracked=p1_tracked, p2_info=p2_info)
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	133 elif state == b'n':
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	134 if size == FROM_P2:
48170 da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48169 diff changeset	135 return cls(wc_tracked=True, p2_info=True)
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	136 elif size == NONNORMAL:
48172 898de425bcd6 dirstate-item: replace call to new_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48171 diff changeset	137 return cls(wc_tracked=True, p1_tracked=True)
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	138 elif mtime == AMBIGUOUS_TIME:
48174 79ebbe19d9e3 dirstate-item: replace a call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48173 diff changeset	139 return cls(
79ebbe19d9e3 dirstate-item: replace a call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48173 diff changeset	140 wc_tracked=True,
79ebbe19d9e3 dirstate-item: replace a call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48173 diff changeset	141 p1_tracked=True,
79ebbe19d9e3 dirstate-item: replace a call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48173 diff changeset	142 has_meaningful_mtime=False,
79ebbe19d9e3 dirstate-item: replace a call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48173 diff changeset	143 parentfiledata=(mode, size, 42),
79ebbe19d9e3 dirstate-item: replace a call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48173 diff changeset	144 )
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	145 else:
48175 d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48174 diff changeset	146 return cls(
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48174 diff changeset	147 wc_tracked=True,
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48174 diff changeset	148 p1_tracked=True,
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48174 diff changeset	149 parentfiledata=(mode, size, mtime),
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48174 diff changeset	150 )
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	151 else:
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	152 raise RuntimeError(b'unknown state: %s' % state)
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	153
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	154 def set_possibly_dirty(self):
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	155 """Mark a file as "possibly dirty"
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	156
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	157 This means the next status call will have to actually check its content
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	158 to make sure it is correct.
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	159 """
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	160 self._mtime = None
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	161
48002 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	162 def set_clean(self, mode, size, mtime):
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	163 """mark a file as "clean" cancelling potential "possibly dirty call"
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	164
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	165 Note: this function is a descendant of `dirstate.normal` and is
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	166 currently expected to be call on "normal" entry only. There are not
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	167 reason for this to not change in the future as long as the ccode is
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	168 updated to preserve the proper state of the non-normal files.
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	169 """
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	170 self._wc_tracked = True
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	171 self._p1_tracked = True
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	172 self._mode = mode
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	173 self._size = size
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	174 self._mtime = mtime
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47969 diff changeset	175
48014 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	176 def set_tracked(self):
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	177 """mark a file as tracked in the working copy
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	178
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	179 This will ultimately be called by command like `hg add`.
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	180 """
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	181 self._wc_tracked = True
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	182 # `set_tracked` is replacing various `normallookup` call. So we mark
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	183 # the files as needing lookup
48014 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	184 #
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	185 # Consider dropping this in the future in favor of something less broad.
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	186 self._mtime = None
48014 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48002 diff changeset	187
47921 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	188 def set_untracked(self):
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	189 """mark a file as untracked in the working copy
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	190
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	191 This will ultimately be called by command like `hg remove`.
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	192 """
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	193 self._wc_tracked = False
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	194 self._mode = None
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	195 self._size = None
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	196 self._mtime = None
47921 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	197
48075 a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48014 diff changeset	198 def drop_merge_data(self):
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48014 diff changeset	199 """remove all "merge-only" from a DirstateItem
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48014 diff changeset	200
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48014 diff changeset	201 This is to be call by the dirstatemap code when the second parent is dropped
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48014 diff changeset	202 """
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	203 if self._p2_info:
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	204 self._p2_info = False
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	205 self._mode = None
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	206 self._size = None
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	207 self._mtime = None
48075 a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48014 diff changeset	208
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	209 @property
47536 8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	210 def mode(self):
47957 05f2be3affe3 dirstate-item: have all the logic go through the v1_ accessors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47956 diff changeset	211 return self.v1_mode()
47536 8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	212
8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	213 @property
47537 0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	214 def size(self):
47957 05f2be3affe3 dirstate-item: have all the logic go through the v1_ accessors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47956 diff changeset	215 return self.v1_size()
47537 0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	216
0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	217 @property
47538 77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	218 def mtime(self):
47957 05f2be3affe3 dirstate-item: have all the logic go through the v1_ accessors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47956 diff changeset	219 return self.v1_mtime()
47538 77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	220
77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	221 @property
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	222 def state(self):
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	223 """
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	224 States are:
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	225 n normal
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	226 m needs merging
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	227 r marked for removal
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	228 a marked for addition
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	229
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	230 XXX This "state" is a bit obscure and mostly a direct expression of the
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	231 dirstatev1 format. It would make sense to ultimately deprecate it in
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	232 favor of the more "semantic" attributes.
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	233 """
48123 d73b42f905f8 dirstate-item: use `any_tracked` more Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	234 if not self.any_tracked:
48100 418611f18fd8 dirstate-entry: use `?` for the state of entry without any tracking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48099 diff changeset	235 return b'?'
47957 05f2be3affe3 dirstate-item: have all the logic go through the v1_ accessors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47956 diff changeset	236 return self.v1_state()
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	237
47513 10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	238 @property
47531 f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	239 def tracked(self):
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	240 """True is the file is tracked in the working copy"""
47959 f1033c2d9b66 dirstate-item: implement `tracked` in a simpler way Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47958 diff changeset	241 return self._wc_tracked
47531 f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	242
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	243 @property
48099 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48098 diff changeset	244 def any_tracked(self):
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48098 diff changeset	245 """True is the file is tracked anywhere (wc or parents)"""
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	246 return self._wc_tracked or self._p1_tracked or self._p2_info
48099 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48098 diff changeset	247
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48098 diff changeset	248 @property
47526 8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	249 def added(self):
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	250 """True if the file has been added"""
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	251 return self._wc_tracked and not (self._p1_tracked or self._p2_info)
47526 8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	252
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	253 @property
48098 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	254 def maybe_clean(self):
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	255 """True if the file has a chance to be in the "clean" state"""
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	256 if not self._wc_tracked:
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	257 return False
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	258 elif not self._p1_tracked:
48098 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	259 return False
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	260 elif self._p2_info:
48098 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	261 return False
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	262 return True
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	263
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48082 diff changeset	264 @property
48155 21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48154 diff changeset	265 def p1_tracked(self):
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48154 diff changeset	266 """True if the file is tracked in the first parent manifest"""
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48154 diff changeset	267 return self._p1_tracked
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48154 diff changeset	268
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48154 diff changeset	269 @property
48154 fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	270 def p2_info(self):
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	271 """True if the file needed to merge or apply any input from p2
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	272
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	273 See the class documentation for details.
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	274 """
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	275 return self._wc_tracked and self._p2_info
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	276
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	277 @property
47515 c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	278 def removed(self):
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	279 """True if the file has been removed"""
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	280 return not self._wc_tracked and (self._p1_tracked or self._p2_info)
47515 c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	281
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	282 def v1_state(self):
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	283 """return a "state" suitable for v1 serialization"""
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	284 if not self.any_tracked:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	285 # the object has no state to record, this is -currently-
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	286 # unsupported
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	287 raise RuntimeError('untracked item')
47967 0d185f73c619 dirstate-item: implement v1_state with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47966 diff changeset	288 elif self.removed:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	289 return b'r'
48164 8f88307f8e07 dirstate-item: replace another usage of `merged` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48162 diff changeset	290 elif self._p1_tracked and self._p2_info:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	291 return b'm'
47967 0d185f73c619 dirstate-item: implement v1_state with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47966 diff changeset	292 elif self.added:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	293 return b'a'
47967 0d185f73c619 dirstate-item: implement v1_state with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47966 diff changeset	294 else:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	295 return b'n'
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	296
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	297 def v1_mode(self):
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	298 """return a "mode" suitable for v1 serialization"""
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	299 return self._mode if self._mode is not None else 0
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	300
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	301 def v1_size(self):
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	302 """return a "size" suitable for v1 serialization"""
48123 d73b42f905f8 dirstate-item: use `any_tracked` more Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	303 if not self.any_tracked:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	304 # the object has no state to record, this is -currently-
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	305 # unsupported
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	306 raise RuntimeError('untracked item')
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	307 elif self.removed and self._p1_tracked and self._p2_info:
47968 dbf2d03850a2 dirstate-item: implement `v1_size` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47967 diff changeset	308 return NONNORMAL
48161 6ac2b417d5d7 dirstate-item: directly use `p2_info` in `v1_size` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48155 diff changeset	309 elif self._p2_info:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	310 return FROM_P2
47968 dbf2d03850a2 dirstate-item: implement `v1_size` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47967 diff changeset	311 elif self.removed:
dbf2d03850a2 dirstate-item: implement `v1_size` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47967 diff changeset	312 return 0
dbf2d03850a2 dirstate-item: implement `v1_size` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47967 diff changeset	313 elif self.added:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	314 return NONNORMAL
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	315 elif self._size is None:
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	316 return NONNORMAL
47968 dbf2d03850a2 dirstate-item: implement `v1_size` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47967 diff changeset	317 else:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	318 return self._size
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	319
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	320 def v1_mtime(self):
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	321 """return a "mtime" suitable for v1 serialization"""
48123 d73b42f905f8 dirstate-item: use `any_tracked` more Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	322 if not self.any_tracked:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	323 # the object has no state to record, this is -currently-
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	324 # unsupported
b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	325 raise RuntimeError('untracked item')
47969 508394e38580 dirstate-item: implement `v1_mtime` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47968 diff changeset	326 elif self.removed:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	327 return 0
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	328 elif self._mtime is None:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	329 return AMBIGUOUS_TIME
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	330 elif self._p2_info:
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	331 return AMBIGUOUS_TIME
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	332 elif not self._p1_tracked:
47969 508394e38580 dirstate-item: implement `v1_mtime` with higher level block Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47968 diff changeset	333 return AMBIGUOUS_TIME
47958 b81f52ca8075 dirstate-item: keep the full information in memory (for pure form) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47957 diff changeset	334 else:
48150 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	335 return self._mtime
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	336
47532 ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	337 def need_delay(self, now):
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	338 """True if the stored mtime would be ambiguous with the current time"""
47957 05f2be3affe3 dirstate-item: have all the logic go through the v1_ accessors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47956 diff changeset	339 return self.v1_state() == b'n' and self.v1_mtime() == now
47532 ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	340
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	341
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	342 def gettype(q):
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	343 return int(q & 0xFFFF)
7945 94d7e14cfa42 pure/parsers: fix circular imports, import mercurial modules properly Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	344
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	345
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	346 class BaseIndexObject(object):
47279 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47278 diff changeset	347 # Can I be passed to an algorithme implemented in Rust ?
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47278 diff changeset	348 rust_ext_compat = 0
46674 e83327af26f1 pure-parsers: document index class constants Rapha?l Gom?s <rgomes@octobus.net> parents: 46479 diff changeset	349 # Format of an index entry according to Python's `struct` language
46860 1dc86c2a43ce revlog: directly use the Struct object for related operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46858 diff changeset	350 index_format = revlog_constants.INDEX_ENTRY_V1
46674 e83327af26f1 pure-parsers: document index class constants Rapha?l Gom?s <rgomes@octobus.net> parents: 46479 diff changeset	351 # Size of a C unsigned long long int, platform independent
e83327af26f1 pure-parsers: document index class constants Rapha?l Gom?s <rgomes@octobus.net> parents: 46479 diff changeset	352 big_int_size = struct.calcsize(b'>Q')
e83327af26f1 pure-parsers: document index class constants Rapha?l Gom?s <rgomes@octobus.net> parents: 46479 diff changeset	353 # Size of a C long int, platform independent
e83327af26f1 pure-parsers: document index class constants Rapha?l Gom?s <rgomes@octobus.net> parents: 46479 diff changeset	354 int_size = struct.calcsize(b'>i')
e83327af26f1 pure-parsers: document index class constants Rapha?l Gom?s <rgomes@octobus.net> parents: 46479 diff changeset	355 # An empty index entry, used as a default value to be overridden, or nullrev
47260 130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	356 null_item = (
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	357 0,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	358 0,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	359 0,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	360 -1,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	361 -1,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	362 -1,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	363 -1,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	364 sha1nodeconstants.nullid,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	365 0,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	366 0,
130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	367 revlog_constants.COMP_MODE_INLINE,
47267 2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	368 revlog_constants.COMP_MODE_INLINE,
47260 130c9f7ed914 revlog: add a "data compression mode" entry in the index tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47255 diff changeset	369 )
46479 095fa99ae5f5 revlog: prepare pure parser for being overloaded Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	370
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	371 @util.propertycache
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	372 def entry_size(self):
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	373 return self.index_format.size
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	374
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	375 @property
02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	376 def nodemap(self):
43663 c207c46a86b9 py3: pass a bytes value for "msg" to nouideprecwarn() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43622 diff changeset	377 msg = b"index.nodemap is deprecated, use index.[has_node\|rev\|get_rev]"
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	378 util.nouideprecwarn(msg, b'5.3', stacklevel=2)
02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	379 return self._nodemap
02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	380
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	381 @util.propertycache
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	382 def _nodemap(self):
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46974 diff changeset	383 nodemap = nodemaputil.NodeMap({sha1nodeconstants.nullid: nullrev})
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	384 for r in range(0, len(self)):
845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	385 n = self[r][7]
845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	386 nodemap[n] = r
845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	387 return nodemap
845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	388
43582 0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43581 diff changeset	389 def has_node(self, node):
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43581 diff changeset	390 """return True if the node exist in the index"""
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	391 return node in self._nodemap
43582 0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43581 diff changeset	392
43600 bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43582 diff changeset	393 def rev(self, node):
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43582 diff changeset	394 """return a revision for a node
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43582 diff changeset	395
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43582 diff changeset	396 If the node is unknown, raise a RevlogError"""
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	397 return self._nodemap[node]
43600 bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43582 diff changeset	398
43602 b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43600 diff changeset	399 def get_rev(self, node):
b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43600 diff changeset	400 """return a revision for a node
b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43600 diff changeset	401
b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43600 diff changeset	402 If the node is unknown, return None"""
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	403 return self._nodemap.get(node)
43602 b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43600 diff changeset	404
43581 642433629e20 revlog: deal with nodemap deletion within the index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43579 diff changeset	405 def _stripnodes(self, start):
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	406 if '_nodemap' in vars(self):
43581 642433629e20 revlog: deal with nodemap deletion within the index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43579 diff changeset	407 for r in range(start, len(self)):
642433629e20 revlog: deal with nodemap deletion within the index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43579 diff changeset	408 n = self[r][7]
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	409 del self._nodemap[n]
43581 642433629e20 revlog: deal with nodemap deletion within the index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43579 diff changeset	410
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	411 def clearcaches(self):
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	412 self.__dict__.pop('_nodemap', None)
43573 845e5b313783 revlog: move the nodemap into the index object (for pure) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43106 diff changeset	413
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	414 def __len__(self):
38890 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38889 diff changeset	415 return self._lgt + len(self._extra)
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	416
38889 6104b203bec8 index: replace insert(-1, e) method by append(e) method Martin von Zweigbergk <martinvonz@google.com> parents: 38887 diff changeset	417 def append(self, tup):
43622 02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	418 if '_nodemap' in vars(self):
02802fa87b74 revlog: deprecate direct `nodemap` access Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43602 diff changeset	419 self._nodemap[tup[7]] = len(self)
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	420 data = self._pack_entry(len(self), tup)
45951 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45647 diff changeset	421 self._extra.append(data)
7945 94d7e14cfa42 pure/parsers: fix circular imports, import mercurial modules properly Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	422
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	423 def _pack_entry(self, rev, entry):
47157 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47156 diff changeset	424 assert entry[8] == 0
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47156 diff changeset	425 assert entry[9] == 0
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47156 diff changeset	426 return self.index_format.pack(*entry[:8])
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47156 diff changeset	427
39245 5961517fd2a8 index: rename _fix_index() since it no longer fixes the index Martin von Zweigbergk <martinvonz@google.com> parents: 39244 diff changeset	428 def _check_index(self, i):
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	429 if not isinstance(i, int):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	430 raise TypeError(b"expecting int indexes")
39244 ec6d5a9d1631 index: don't include nullid in boundary check in pure code Martin von Zweigbergk <martinvonz@google.com> parents: 39084 diff changeset	431 if i < 0 or i >= len(self):
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	432 raise IndexError
7945 94d7e14cfa42 pure/parsers: fix circular imports, import mercurial modules properly Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	433
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	434 def __getitem__(self, i):
39084 a1f934573c0b parsers: adjust pure-python version to mimic a3dacabd476b Augie Fackler <augie@google.com> parents: 38890 diff changeset	435 if i == -1:
46479 095fa99ae5f5 revlog: prepare pure parser for being overloaded Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	436 return self.null_item
39245 5961517fd2a8 index: rename _fix_index() since it no longer fixes the index Martin von Zweigbergk <martinvonz@google.com> parents: 39244 diff changeset	437 self._check_index(i)
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	438 if i >= self._lgt:
45951 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45647 diff changeset	439 data = self._extra[i - self._lgt]
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45647 diff changeset	440 else:
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45647 diff changeset	441 index = self._calculate_index(i)
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	442 data = self._data[index : index + self.entry_size]
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	443 r = self._unpack_entry(i, data)
45951 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45647 diff changeset	444 if self._lgt and i == 0:
47400 ac60a1366a49 revlog: move `offset_type` to `revlogutils` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47281 diff changeset	445 offset = revlogutils.offset_type(0, gettype(r[0]))
ac60a1366a49 revlog: move `offset_type` to `revlogutils` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47281 diff changeset	446 r = (offset,) + r[1:]
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	447 return r
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	448
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	449 def _unpack_entry(self, rev, data):
47156 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47095 diff changeset	450 r = self.index_format.unpack(data)
47267 2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	451 r = r + (
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	452 0,
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	453 0,
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	454 revlog_constants.COMP_MODE_INLINE,
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	455 revlog_constants.COMP_MODE_INLINE,
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	456 )
47156 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47095 diff changeset	457 return r
4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47095 diff changeset	458
47078 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	459 def pack_header(self, header):
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	460 """pack header information as binary"""
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	461 v_fmt = revlog_constants.INDEX_HEADER
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	462 return v_fmt.pack(header)
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	463
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	464 def entry_binary(self, rev):
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	465 """return the raw binary string representing a revision"""
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	466 entry = self[rev]
47156 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47095 diff changeset	467 p = revlog_constants.INDEX_ENTRY_V1.pack(*entry[:8])
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	468 if rev == 0:
47078 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	469 p = p[revlog_constants.INDEX_HEADER.size :]
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	470 return p
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	471
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	472
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	473 class IndexObject(BaseIndexObject):
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	474 def __init__(self, data):
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	475 assert len(data) % self.entry_size == 0, (
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	476 len(data),
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	477 self.entry_size,
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	478 len(data) % self.entry_size,
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	479 )
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	480 self._data = data
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	481 self._lgt = len(data) // self.entry_size
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	482 self._extra = []
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	483
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	484 def _calculate_index(self, i):
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	485 return i * self.entry_size
13253 61c9bc3da402 revlog: remove lazy index Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	486
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	487 def __delitem__(self, i):
34338 531332502568 style: always use `x is not None` instead of `not x is None` Alex Gaynor <agaynor@mozilla.com> parents: 32411 diff changeset	488 if not isinstance(i, slice) or not i.stop == -1 or i.step is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	489 raise ValueError(b"deleting slices only supports a:-1 with step 1")
39245 5961517fd2a8 index: rename _fix_index() since it no longer fixes the index Martin von Zweigbergk <martinvonz@google.com> parents: 39244 diff changeset	490 i = i.start
5961517fd2a8 index: rename _fix_index() since it no longer fixes the index Martin von Zweigbergk <martinvonz@google.com> parents: 39244 diff changeset	491 self._check_index(i)
43581 642433629e20 revlog: deal with nodemap deletion within the index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43579 diff changeset	492 self._stripnodes(i)
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	493 if i < self._lgt:
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	494 self._data = self._data[: i * self.entry_size]
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	495 self._lgt = i
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	496 self._extra = []
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	497 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	498 self._extra = self._extra[: i - self._lgt]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	499
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	500
44356 6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	501 class PersistentNodeMapIndexObject(IndexObject):
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	502 """a Debug oriented class to test persistent nodemap
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	503
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	504 We need a simple python object to test API and higher level behavior. See
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	505 the Rust implementation for more serious usage. This should be used only
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	506 through the dedicated `devel.persistent-nodemap` config.
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	507 """
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	508
44357 7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	509 def nodemap_data_all(self):
7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	510 """Return bytes containing a full serialization of a nodemap
7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	511
7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	512 The nodemap should be valid for the full set of revisions in the
7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	513 index."""
7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	514 return nodemaputil.persistent_data(self)
7f4f7ef3133e nodemap: add a optional `nodemap_add_full` method on indexes Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44356 diff changeset	515
44367 50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	516 def nodemap_data_incremental(self):
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	517 """Return bytes containing a incremental update to persistent nodemap
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	518
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	519 This containst the data for an append-only update of the data provided
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	520 in the last call to `update_nodemap_data`.
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	521 """
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	522 if self._nm_root is None:
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	523 return None
44371 1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	524 docket = self._nm_docket
44370 8374b69aef75 nodemap: track the total and unused amount of data in the rawdata file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44369 diff changeset	525 changed, data = nodemaputil.update_persistent_data(
44371 1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	526 self, self._nm_root, self._nm_max_idx, self._nm_docket.tip_rev
44367 50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	527 )
44371 1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	528
1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	529 self._nm_root = self._nm_max_idx = self._nm_docket = None
1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	530 return docket, changed, data
44367 50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	531
44369 e41a164db7a9 nodemap: track the maximum revision tracked in the nodemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44367 diff changeset	532 def update_nodemap_data(self, docket, nm_data):
e41a164db7a9 nodemap: track the maximum revision tracked in the nodemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44367 diff changeset	533 """provide full block of persisted binary data for a nodemap
44363 671f9479af0e nodemap: provide the on disk data to indexes who support it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44357 diff changeset	534
671f9479af0e nodemap: provide the on disk data to indexes who support it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44357 diff changeset	535 The data are expected to come from disk. See `nodemap_data_all` for a
671f9479af0e nodemap: provide the on disk data to indexes who support it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44357 diff changeset	536 produceur of such data."""
671f9479af0e nodemap: provide the on disk data to indexes who support it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44357 diff changeset	537 if nm_data is not None:
44367 50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	538 self._nm_root, self._nm_max_idx = nodemaputil.parse_data(nm_data)
50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	539 if self._nm_root:
44371 1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	540 self._nm_docket = docket
44367 50ad851efd9b nodemap: introduce append-only incremental update of the persistent data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44363 diff changeset	541 else:
44371 1d2b37def017 nodemap: double check the source docket when doing incremental update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44370 diff changeset	542 self._nm_root = self._nm_max_idx = self._nm_docket = None
44363 671f9479af0e nodemap: provide the on disk data to indexes who support it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44357 diff changeset	543
44356 6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	544
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	545 class InlinedIndexObject(BaseIndexObject):
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	546 def __init__(self, data, inline=0):
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	547 self._data = data
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	548 self._lgt = self._inline_scan(None)
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	549 self._inline_scan(self._lgt)
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	550 self._extra = []
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	551
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	552 def _inline_scan(self, lgt):
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	553 off = 0
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	554 if lgt is not None:
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	555 self._offsets = [0] * lgt
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	556 count = 0
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	557 while off <= len(self._data) - self.entry_size:
46479 095fa99ae5f5 revlog: prepare pure parser for being overloaded Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	558 start = off + self.big_int_size
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	559 (s,) = struct.unpack(
46479 095fa99ae5f5 revlog: prepare pure parser for being overloaded Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	560 b'>i',
095fa99ae5f5 revlog: prepare pure parser for being overloaded Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	561 self._data[start : start + self.int_size],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	562 )
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	563 if lgt is not None:
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	564 self._offsets[count] = off
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	565 count += 1
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46860 diff changeset	566 off += self.entry_size + s
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	567 if off != len(self._data):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	568 raise ValueError(b"corrupted data")
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	569 return count
14421 639f26cab2f5 pure parsers: properly detect corrupt index files Augie Fackler <durin42@gmail.com> parents: 14064 diff changeset	570
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	571 def __delitem__(self, i):
34338 531332502568 style: always use `x is not None` instead of `not x is None` Alex Gaynor <agaynor@mozilla.com> parents: 32411 diff changeset	572 if not isinstance(i, slice) or not i.stop == -1 or i.step is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	573 raise ValueError(b"deleting slices only supports a:-1 with step 1")
39245 5961517fd2a8 index: rename _fix_index() since it no longer fixes the index Martin von Zweigbergk <martinvonz@google.com> parents: 39244 diff changeset	574 i = i.start
5961517fd2a8 index: rename _fix_index() since it no longer fixes the index Martin von Zweigbergk <martinvonz@google.com> parents: 39244 diff changeset	575 self._check_index(i)
43581 642433629e20 revlog: deal with nodemap deletion within the index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43579 diff changeset	576 self._stripnodes(i)
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	577 if i < self._lgt:
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	578 self._offsets = self._offsets[:i]
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	579 self._lgt = i
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	580 self._extra = []
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	581 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	582 self._extra = self._extra[: i - self._lgt]
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	583
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	584 def _calculate_index(self, i):
255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	585 return self._offsets[i]
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	586
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	587
46717 913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	588 def parse_index2(data, inline, revlogv2=False):
29133 255274719dc1 pure: write a really lazy version of pure indexObject Maciej Fijalkowski <fijall@gmail.com> parents: 28861 diff changeset	589 if not inline:
46717 913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	590 cls = IndexObject2 if revlogv2 else IndexObject
913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	591 return cls(data), None
47273 468e451fc0de revlogv2: drop the code related to inlined revlogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47270 diff changeset	592 cls = InlinedIndexObject
46717 913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	593 return cls(data, inline), (0, data)
913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	594
913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	595
47281 25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	596 def parse_index_cl_v2(data):
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	597 return IndexChangelogV2(data), None
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	598
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	599
47273 468e451fc0de revlogv2: drop the code related to inlined revlogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47270 diff changeset	600 class IndexObject2(IndexObject):
46860 1dc86c2a43ce revlog: directly use the Struct object for related operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46858 diff changeset	601 index_format = revlog_constants.INDEX_ENTRY_V2
46717 913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	602
47095 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47078 diff changeset	603 def replace_sidedata_info(
47270 07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	604 self,
07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	605 rev,
07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	606 sidedata_offset,
07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	607 sidedata_length,
07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	608 offset_flags,
07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	609 compression_mode,
47095 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47078 diff changeset	610 ):
46730 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	611 """
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	612 Replace an existing index entry's sidedata offset and length with new
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	613 ones.
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	614 This cannot be used outside of the context of sidedata rewriting,
47254 3b04cf976c67 revlog: use `rev` instead of `i` in replace_sidedata_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47246 diff changeset	615 inside the transaction that creates the revision `rev`.
46730 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	616 """
47254 3b04cf976c67 revlog: use `rev` instead of `i` in replace_sidedata_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47246 diff changeset	617 if rev < 0:
46730 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	618 raise KeyError
47254 3b04cf976c67 revlog: use `rev` instead of `i` in replace_sidedata_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47246 diff changeset	619 self._check_index(rev)
47255 78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	620 if rev < self._lgt:
46730 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	621 msg = b"cannot rewrite entries outside of this transaction"
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	622 raise KeyError(msg)
47255 78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	623 else:
78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	624 entry = list(self[rev])
78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	625 entry[0] = offset_flags
78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	626 entry[8] = sidedata_offset
78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	627 entry[9] = sidedata_length
47270 07641bafa646 revlog: compress sidedata when doing "post-pull" sidedata update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47267 diff changeset	628 entry[11] = compression_mode
47255 78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	629 entry = tuple(entry)
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	630 new = self._pack_entry(rev, entry)
47255 78230d036e5d revlog: simplify the replace_sidedata_info code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47254 diff changeset	631 self._extra[rev - self._lgt] = new
46730 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	632
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	633 def _unpack_entry(self, rev, data):
47267 2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	634 data = self.index_format.unpack(data)
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	635 entry = data[:10]
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	636 data_comp = data[10] & 3
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	637 sidedata_comp = (data[10] & (3 << 2)) >> 2
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	638 return entry + (data_comp, sidedata_comp)
47156 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47095 diff changeset	639
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	640 def _pack_entry(self, rev, entry):
47267 2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	641 data = entry[:10]
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	642 data_comp = entry[10] & 3
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	643 sidedata_comp = (entry[11] & 3) << 2
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	644 data += (data_comp \| sidedata_comp,)
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	645
2b69555e4875 revlog: introduce a compression mode for sidedata in the revlog index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47262 diff changeset	646 return self.index_format.pack(*data)
47157 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47156 diff changeset	647
47078 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	648 def entry_binary(self, rev):
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	649 """return the raw binary string representing a revision"""
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	650 entry = self[rev]
47278 55d280bc59fa revlog: pass around the `rev` we deal with when packing/unpacking entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47273 diff changeset	651 return self._pack_entry(rev, entry)
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47055 diff changeset	652
47246 6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	653 def pack_header(self, header):
6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	654 """pack header information as binary"""
6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	655 msg = 'version header should go in the docket, not the index: %d'
6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	656 msg %= header
6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	657 raise error.ProgrammingError(msg)
6b1eae313b2f revlogv2: store version information in the docket only Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47157 diff changeset	658
46717 913485776542 revlog: introduce v2 format Rapha?l Gom?s <rgomes@octobus.net> parents: 46674 diff changeset	659
47281 25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	660 class IndexChangelogV2(IndexObject2):
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	661 index_format = revlog_constants.INDEX_ENTRY_CL_V2
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	662
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	663 def _unpack_entry(self, rev, data, r=True):
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	664 items = self.index_format.unpack(data)
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	665 entry = items[:3] + (rev, rev) + items[3:8]
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	666 data_comp = items[8] & 3
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	667 sidedata_comp = (items[8] >> 2) & 3
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	668 return entry + (data_comp, sidedata_comp)
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	669
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	670 def _pack_entry(self, rev, entry):
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	671 assert entry[3] == rev, entry[3]
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	672 assert entry[4] == rev, entry[4]
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	673 data = entry[:3] + entry[5:10]
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	674 data_comp = entry[10] & 3
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	675 sidedata_comp = (entry[11] & 3) << 2
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	676 data += (data_comp \| sidedata_comp,)
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	677 return self.index_format.pack(*data)
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	678
25ce16bf724b changelogv2: use a dedicated on disk format for changelogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47279 diff changeset	679
44356 6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	680 def parse_index_devel_nodemap(data, inline):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45951 diff changeset	681 """like parse_index2, but alway return a PersistentNodeMapIndexObject"""
44356 6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	682 return PersistentNodeMapIndexObject(data), None
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	683
6f9e8e142cea nodemap: add a (python) index class for persistent nodemap testing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44035 diff changeset	684
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	685 def parse_dirstate(dmap, copymap, st):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	686 parents = [st[:20], st[20:40]]
17425 e95ec38f86b0 fix wording and not-completely-trivial spelling errors and bad docstrings Mads Kiilerich <mads@kiilerich.com> parents: 14995 diff changeset	687 # dereference fields so they will be local in loop
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	688 format = b">cllll"
7945 94d7e14cfa42 pure/parsers: fix circular imports, import mercurial modules properly Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	689 e_size = struct.calcsize(format)
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	690 pos1 = 40
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	691 l = len(st)
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	692
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	693 # the inner loop
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	694 while pos1 < l:
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	695 pos2 = pos1 + e_size
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	696 e = _unpack(b">cllll", st[pos1:pos2]) # a literal here is faster
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	697 pos1 = pos2 + e[4]
f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	698 f = st[pos2:pos1]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	699 if b'\0' in f:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	700 f, c = f.split(b'\0')
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	701 copymap[f] = c
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47664 diff changeset	702 dmap[f] = DirstateItem.from_v1_data(*e[:4])
7700 f410c552fa15 pure Python implementation of parsers.c Martin Geisler <mg@daimi.au.dk> parents: diff changeset	703 return parents
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	704
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39245 diff changeset	705
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	706 def pack_dirstate(dmap, copymap, pl, now):
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	707 now = int(now)
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 27339 diff changeset	708 cs = stringio()
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	709 write = cs.write
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	710 write(b"".join(pl))
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	711 for f, e in pycompat.iteritems(dmap):
47540 1a6302427eb9 dirstate-item: use need_delay when packing dirstate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	712 if e.need_delay(now):
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	713 # The file was last modified "simultaneously" with the current
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	714 # write to dirstate (i.e. within the same second for file-
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	715 # systems with a granularity of 1 sec). This commonly happens
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	716 # for at least a couple of files on 'update'.
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	717 # The user could change the file without changing its size
19652 187bf2dde7c1 pack_dirstate: only invalidate mtime for files written in the last second Siddharth Agarwal <sid0@fb.com> parents: 18567 diff changeset	718 # within the same second. Invalidate the file's mtime in
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	719 # dirstate, forcing future 'status' calls to compare the
19652 187bf2dde7c1 pack_dirstate: only invalidate mtime for files written in the last second Siddharth Agarwal <sid0@fb.com> parents: 18567 diff changeset	720 # contents of the file if the size is the same. This prevents
187bf2dde7c1 pack_dirstate: only invalidate mtime for files written in the last second Siddharth Agarwal <sid0@fb.com> parents: 18567 diff changeset	721 # mistakenly treating such files as clean.
47667 d06ced90c80f dirstate-item: use `set_possibly_dirty` in `pure.pack_dirstate` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	722 e.set_possibly_dirty()
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	723
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	724 if f in copymap:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	725 f = b"%s\0%s" % (f, copymap[f])
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	726 e = _pack(
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	727 b">cllll",
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	728 e.v1_state(),
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	729 e.v1_mode(),
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	730 e.v1_size(),
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	731 e.v1_mtime(),
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	732 len(f),
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47508 diff changeset	733 )
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	734 write(e)
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	735 write(f)
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 17425 diff changeset	736 return cs.getvalue()

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/pure/parsers.py @ 48200:77fc340acad7