##// END OF EJS Templates
dirstate: use a new `drop_merge_data` in `setparent`...
dirstate: use a new `drop_merge_data` in `setparent` What is happening in this `setparent` loop is that we remove all `merge` related information when the dirstate is moved out of a `merge` situation. So instead of shuffling state to get them where we want, we simply add a method on the DirstateItem to do drop the information we want dropped. Differential Revision: https://phab.mercurial-scm.org/D11506

File last commit:

r48874:a660d8a5 default
r48874:a660d8a5 default
Show More
parsers.py
840 lines | 25.7 KiB | text/x-python | PythonLexer
Martin Geisler
pure Python implementation of parsers.c
r7700 # parsers.py - Python implementation of parsers.c
#
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2009 Olivia Mackall <olivia@selenic.com> and others
Martin Geisler
pure Python implementation of parsers.c
r7700 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
pure Python implementation of parsers.c
r7700
Gregory Szorc
parsers: use absolute_import
r27339 from __future__ import absolute_import
import struct
import zlib
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 from ..node import (
nullrev,
sha1nodeconstants,
)
Augie Fackler
parsers: move DirstateItem to attr.s...
r48366 from ..thirdparty import attr
revlog: move the nodemap into the index object (for pure)...
r43925 from .. import (
revlogv2: store version information in the docket only...
r48009 error,
revlog: move the nodemap into the index object (for pure)...
r43925 pycompat,
revlog: move `offset_type` to `revlogutils`...
r48186 revlogutils,
revlog: move the nodemap into the index object (for pure)...
r43925 util,
)
Augie Fackler
formatting: blacken the codebase...
r43346
revlogutils: move the NodeMap class in a dedicated nodemap module...
r44486 from ..revlogutils import nodemap as nodemaputil
revlog: move the details of revlog "v1" index inside revlog.utils.constants...
r47616 from ..revlogutils import constants as revlog_constants
revlogutils: move the NodeMap class in a dedicated nodemap module...
r44486
Gregory Szorc
util: prefer "bytesio" to "stringio"...
r36976 stringio = pycompat.bytesio
Martin Geisler
pure Python implementation of parsers.c
r7700
Pulkit Goyal
parsers: alias long to int on Python 3
r31220
Martin Geisler
pure Python implementation of parsers.c
r7700 _pack = struct.pack
_unpack = struct.unpack
_compress = zlib.compress
_decompress = zlib.decompress
dirstate-entry: turn dirstate tuple into a real object (like in C)...
r48296
dirstate-entry: add a `from_p2` property...
r48303 # a special value used internally for `size` if the file come from the other parent
FROM_P2 = -2
dirstate-entry: `merged_removed` and `from_p2_removed` properties...
r48305 # a special value used internally for `size` if the file is modified/merged/added
NONNORMAL = -1
dirstate-item: use need_delay when packing dirstate...
r48329 # a special value used internally for `time` if the time is ambigeous
AMBIGUOUS_TIME = -1
dirstate-entry: add a `from_p2` property...
r48303
dirstate-item: use an explicit __init__ function instead of the attrs one...
r48464 @attr.s(slots=True, init=False)
dirstate-item: rename the class to DirstateItem...
r48328 class DirstateItem(object):
dirstate-entry: turn dirstate tuple into a real object (like in C)...
r48296 """represent a dirstate entry
It contains:
dirstate: document the dirstatetuple content...
r48284 - state (one of 'n', 'a', 'r', 'm')
- mode,
- size,
- mtime,
"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 _wc_tracked = attr.ib()
_p1_tracked = attr.ib()
_p2_tracked = attr.ib()
# the three item above should probably be combined
#
# However it is unclear if they properly cover some of the most advanced
# merge case. So we should probably wait on this to be settled.
_merged = attr.ib()
_clean_p1 = attr.ib()
_clean_p2 = attr.ib()
_possibly_dirty = attr.ib()
Augie Fackler
parsers: move DirstateItem to attr.s...
r48366 _mode = attr.ib()
_size = attr.ib()
_mtime = attr.ib()
dirstate-entry: turn dirstate tuple into a real object (like in C)...
r48296
dirstate-item: feed more information to `__init__`...
r48706 def __init__(
self,
wc_tracked=False,
p1_tracked=False,
p2_tracked=False,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
parentfiledata=None,
):
if merged and (clean_p1 or clean_p2):
msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
raise error.ProgrammingError(msg)
dirstate-item: keep the full information in memory (for pure form)...
r48739 self._wc_tracked = wc_tracked
self._p1_tracked = p1_tracked
self._p2_tracked = p2_tracked
self._merged = merged
self._clean_p1 = clean_p1
self._clean_p2 = clean_p2
self._possibly_dirty = possibly_dirty
if parentfiledata is None:
self._mode = None
self._size = None
self._mtime = None
else:
dirstate-item: feed more information to `__init__`...
r48706 self._mode = parentfiledata[0]
self._size = parentfiledata[1]
self._mtime = parentfiledata[2]
dirstate-item: use an explicit __init__ function instead of the attrs one...
r48464
dirstate-item: add a `from_v1_data` constructor...
r48465 @classmethod
dirstate-item: add dedicated "legacy" constructor for `addfile` case...
r48716 def new_added(cls):
"""constructor to help legacy API to build a new "added" item
Should eventually be removed
"""
instance = cls()
dirstate-item: keep the full information in memory (for pure form)...
r48739 instance._wc_tracked = True
instance._p1_tracked = False
instance._p2_tracked = False
dirstate-item: add dedicated "legacy" constructor for `addfile` case...
r48716 return instance
@classmethod
def new_merged(cls):
"""constructor to help legacy API to build a new "merged" item
Should eventually be removed
"""
instance = cls()
dirstate-item: keep the full information in memory (for pure form)...
r48739 instance._wc_tracked = True
instance._p1_tracked = True # might not be True because of rename ?
instance._p2_tracked = True # might not be True because of rename ?
instance._merged = True
dirstate-item: add dedicated "legacy" constructor for `addfile` case...
r48716 return instance
@classmethod
def new_from_p2(cls):
"""constructor to help legacy API to build a new "from_p2" item
Should eventually be removed
"""
instance = cls()
dirstate-item: keep the full information in memory (for pure form)...
r48739 instance._wc_tracked = True
instance._p1_tracked = False # might actually be True
instance._p2_tracked = True
instance._clean_p2 = True
dirstate-item: add dedicated "legacy" constructor for `addfile` case...
r48716 return instance
@classmethod
def new_possibly_dirty(cls):
"""constructor to help legacy API to build a new "possibly_dirty" item
Should eventually be removed
"""
instance = cls()
dirstate-item: keep the full information in memory (for pure form)...
r48739 instance._wc_tracked = True
instance._p1_tracked = True
instance._possibly_dirty = True
dirstate-item: add dedicated "legacy" constructor for `addfile` case...
r48716 return instance
@classmethod
def new_normal(cls, mode, size, mtime):
"""constructor to help legacy API to build a new "normal" item
Should eventually be removed
"""
assert size != FROM_P2
assert size != NONNORMAL
instance = cls()
dirstate-item: keep the full information in memory (for pure form)...
r48739 instance._wc_tracked = True
instance._p1_tracked = True
dirstate-item: add dedicated "legacy" constructor for `addfile` case...
r48716 instance._mode = mode
instance._size = size
instance._mtime = mtime
return instance
@classmethod
dirstate-item: add a `from_v1_data` constructor...
r48465 def from_v1_data(cls, state, mode, size, mtime):
"""Build a new DirstateItem object from V1 data
Since the dirstate-v1 format is frozen, the signature of this function
is not expected to change, unlike the __init__ one.
"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 if state == b'm':
return cls.new_merged()
elif state == b'a':
return cls.new_added()
elif state == b'r':
instance = cls()
instance._wc_tracked = False
if size == NONNORMAL:
instance._merged = True
instance._p1_tracked = (
True # might not be True because of rename ?
)
instance._p2_tracked = (
True # might not be True because of rename ?
)
elif size == FROM_P2:
instance._clean_p2 = True
instance._p1_tracked = (
False # We actually don't know (file history)
)
instance._p2_tracked = True
else:
instance._p1_tracked = True
return instance
elif state == b'n':
if size == FROM_P2:
return cls.new_from_p2()
elif size == NONNORMAL:
return cls.new_possibly_dirty()
elif mtime == AMBIGUOUS_TIME:
instance = cls.new_normal(mode, size, 42)
instance._mtime = None
instance._possibly_dirty = True
return instance
else:
return cls.new_normal(mode, size, mtime)
else:
raise RuntimeError(b'unknown state: %s' % state)
dirstate-item: add a `from_v1_data` constructor...
r48465
dirstate-item: add a `set_possibly_dirty` method...
r48466 def set_possibly_dirty(self):
"""Mark a file as "possibly dirty"
This means the next status call will have to actually check its content
to make sure it is correct.
"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 self._possibly_dirty = True
dirstate-item: add a `set_possibly_dirty` method...
r48466
dirstate: introduce a `set_clean` method on dirstate's map and items...
r48788 def set_clean(self, mode, size, mtime):
"""mark a file as "clean" cancelling potential "possibly dirty call"
Note: this function is a descendant of `dirstate.normal` and is
currently expected to be call on "normal" entry only. There are not
reason for this to not change in the future as long as the ccode is
updated to preserve the proper state of the non-normal files.
"""
self._wc_tracked = True
self._p1_tracked = True
self._p2_tracked = False # this might be wrong
self._merged = False
self._clean_p2 = False
self._possibly_dirty = False
self._mode = mode
self._size = size
self._mtime = mtime
dirstate: introduce a set_tracked method on "map" and "item"...
r48804 def set_tracked(self):
"""mark a file as tracked in the working copy
This will ultimately be called by command like `hg add`.
"""
self._wc_tracked = True
# `set_tracked` is replacing various `normallookup` call. So we set
# "possibly dirty" to stay on the safe side.
#
# Consider dropping this in the future in favor of something less broad.
self._possibly_dirty = True
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`...
r48701 def set_untracked(self):
"""mark a file as untracked in the working copy
This will ultimately be called by command like `hg remove`.
"""
# backup the previous state (useful for merge)
dirstate-item: keep the full information in memory (for pure form)...
r48739 self._wc_tracked = False
self._mode = None
self._size = None
self._mtime = None
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`...
r48701
dirstate: use a new `drop_merge_data` in `setparent`...
r48874 def drop_merge_data(self):
"""remove all "merge-only" from a DirstateItem
This is to be call by the dirstatemap code when the second parent is dropped
"""
if not (self.merged or self.from_p2):
return
self._p1_tracked = self.merged # why is this not already properly set ?
self._merged = False
self._clean_p1 = False
self._clean_p2 = False
self._p2_tracked = False
self._possibly_dirty = True
self._mode = None
self._size = None
self._mtime = None
dirstate-entry: add a `state` property (and use it)...
r48301 @property
dirstate-entry: add a `mode` property...
r48325 def mode(self):
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_mode()
dirstate-entry: add a `mode` property...
r48325
@property
dirstate-entry: add a `size` property...
r48326 def size(self):
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_size()
dirstate-entry: add a `size` property...
r48326
@property
dirstate-entry: add a `mtime` property...
r48327 def mtime(self):
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_mtime()
dirstate-entry: add a `mtime` property...
r48327
@property
dirstate-entry: add a `state` property (and use it)...
r48301 def state(self):
"""
States are:
n normal
m needs merging
r marked for removal
a marked for addition
XXX This "state" is a bit obscure and mostly a direct expression of the
dirstatev1 format. It would make sense to ultimately deprecate it in
favor of the more "semantic" attributes.
"""
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_state()
dirstate-entry: add a `state` property (and use it)...
r48301
dirstate-entry: add a `merged` property...
r48302 @property
dirstate-entry: add a `tracked` property...
r48320 def tracked(self):
"""True is the file is tracked in the working copy"""
dirstate-item: implement `tracked` in a simpler way...
r48740 return self._wc_tracked
dirstate-entry: add a `tracked` property...
r48320
@property
dirstate-entry: add a `added` property...
r48315 def added(self):
"""True if the file has been added"""
dirstate-item: implement `added` in a simpler way...
r48741 return self._wc_tracked and not (self._p1_tracked or self._p2_tracked)
dirstate-entry: add a `added` property...
r48315
@property
dirstate-entry: add a `merged` property...
r48302 def merged(self):
"""True if the file has been merged
Should only be set if a merge is in progress in the dirstate
"""
dirstate-item: implement `merged` in a simpler way...
r48742 return self._wc_tracked and self._merged
dirstate-entry: add a `merged` property...
r48302
dirstate-entry: add a `from_p2` property...
r48303 @property
def from_p2(self):
"""True if the file have been fetched from p2 during the current merge
dirstate-entry: restrict `from_p2` property to tracked file...
r48306 This is only True is the file is currently tracked.
dirstate-entry: add a `from_p2` property...
r48303 Should only be set if a merge is in progress in the dirstate
"""
dirstate-item: add more logic to `from_p2`...
r48747 if not self._wc_tracked:
return False
return self._clean_p2 or (not self._p1_tracked and self._p2_tracked)
dirstate-entry: add a `from_p2` property...
r48303
dirstate-entry: add a `removed` property...
r48304 @property
dirstate-entry: `merged_removed` and `from_p2_removed` properties...
r48305 def from_p2_removed(self):
"""True if the file has been removed, but was "from_p2" initially
This property seems like an abstraction leakage and should probably be
dealt in this class (or maybe the dirstatemap) directly.
"""
dirstate-item: implement `from_p2_removed` in a simpler way...
r48744 return self.removed and self._clean_p2
dirstate-entry: `merged_removed` and `from_p2_removed` properties...
r48305
@property
dirstate-entry: add a `removed` property...
r48304 def removed(self):
"""True if the file has been removed"""
dirstate-item: implement `removed` in a simpler way...
r48745 return not self._wc_tracked and (self._p1_tracked or self._p2_tracked)
dirstate-entry: add a `removed` property...
r48304
dirstate-entry: `merged_removed` and `from_p2_removed` properties...
r48305 @property
def merged_removed(self):
"""True if the file has been removed, but was "merged" initially
This property seems like an abstraction leakage and should probably be
dealt in this class (or maybe the dirstatemap) directly.
"""
dirstate-item: implement `merged_removed` in a simpler way...
r48746 return self.removed and self._merged
dirstate-entry: `merged_removed` and `from_p2_removed` properties...
r48305
dirstate-item: introduce a `dm_nonnormal` property...
r48485 @property
def dm_nonnormal(self):
"""True is the entry is non-normal in the dirstatemap sense
There is no reason for any code, but the dirstatemap one to use this.
"""
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME
dirstate-item: introduce a `dm_nonnormal` property...
r48485
dirstate-item: introduce a `dm_otherparent` property...
r48486 @property
def dm_otherparent(self):
"""True is the entry is `otherparent` in the dirstatemap sense
There is no reason for any code, but the dirstatemap one to use this.
"""
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_size() == FROM_P2
dirstate-item: introduce a `dm_otherparent` property...
r48486
dirstate-entry: introduce dedicated accessors for v1 serialization...
r48298 def v1_state(self):
"""return a "state" suitable for v1 serialization"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 if not (self._p1_tracked or self._p2_tracked or self._wc_tracked):
# the object has no state to record, this is -currently-
# unsupported
raise RuntimeError('untracked item')
dirstate-item: implement v1_state with higher level block...
r48748 elif self.removed:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return b'r'
dirstate-item: implement v1_state with higher level block...
r48748 elif self.merged:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return b'm'
dirstate-item: implement v1_state with higher level block...
r48748 elif self.added:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return b'a'
dirstate-item: implement v1_state with higher level block...
r48748 else:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return b'n'
dirstate-entry: introduce dedicated accessors for v1 serialization...
r48298
def v1_mode(self):
"""return a "mode" suitable for v1 serialization"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 return self._mode if self._mode is not None else 0
dirstate-entry: introduce dedicated accessors for v1 serialization...
r48298
def v1_size(self):
"""return a "size" suitable for v1 serialization"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 if not (self._p1_tracked or self._p2_tracked or self._wc_tracked):
# the object has no state to record, this is -currently-
# unsupported
raise RuntimeError('untracked item')
dirstate-item: implement `v1_size` with higher level block...
r48749 elif self.merged_removed:
return NONNORMAL
elif self.from_p2_removed:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return FROM_P2
dirstate-item: implement `v1_size` with higher level block...
r48749 elif self.removed:
return 0
elif self.merged:
return FROM_P2
elif self.added:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return NONNORMAL
dirstate-item: implement `v1_size` with higher level block...
r48749 elif self.from_p2:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return FROM_P2
elif self._possibly_dirty:
dirstate-item: implement `v1_size` with higher level block...
r48749 return self._size if self._size is not None else NONNORMAL
else:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return self._size
dirstate-entry: introduce dedicated accessors for v1 serialization...
r48298
def v1_mtime(self):
"""return a "mtime" suitable for v1 serialization"""
dirstate-item: keep the full information in memory (for pure form)...
r48739 if not (self._p1_tracked or self._p2_tracked or self._wc_tracked):
# the object has no state to record, this is -currently-
# unsupported
raise RuntimeError('untracked item')
dirstate-item: implement `v1_mtime` with higher level block...
r48750 elif self.removed:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return 0
elif self._possibly_dirty:
return AMBIGUOUS_TIME
dirstate-item: implement `v1_mtime` with higher level block...
r48750 elif self.merged:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return AMBIGUOUS_TIME
dirstate-item: implement `v1_mtime` with higher level block...
r48750 elif self.added:
dirstate-item: keep the full information in memory (for pure form)...
r48739 return AMBIGUOUS_TIME
dirstate-item: implement `v1_mtime` with higher level block...
r48750 elif self.from_p2:
return AMBIGUOUS_TIME
dirstate-item: keep the full information in memory (for pure form)...
r48739 else:
dirstate-item: implement `v1_mtime` with higher level block...
r48750 return self._mtime if self._mtime is not None else 0
dirstate-entry: introduce dedicated accessors for v1 serialization...
r48298
dirstate-entry: add a `need_delay` method...
r48321 def need_delay(self, now):
"""True if the stored mtime would be ambiguous with the current time"""
dirstate-item: have all the logic go through the v1_ accessors...
r48738 return self.v1_state() == b'n' and self.v1_mtime() == now
dirstate-entry: add a `need_delay` method...
r48321
Augie Fackler
formatting: blacken the codebase...
r43346
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def gettype(q):
return int(q & 0xFFFF)
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
r7945
Augie Fackler
formatting: blacken the codebase...
r43346
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 class BaseIndexObject(object):
revlog: signal which revlog index are compatible with Rust...
r48042 # Can I be passed to an algorithme implemented in Rust ?
rust_ext_compat = 0
Raphaël Gomès
pure-parsers: document index class constants...
r47380 # Format of an index entry according to Python's `struct` language
revlog: directly use the Struct object for related operation...
r47619 index_format = revlog_constants.INDEX_ENTRY_V1
Raphaël Gomès
pure-parsers: document index class constants...
r47380 # Size of a C unsigned long long int, platform independent
big_int_size = struct.calcsize(b'>Q')
# Size of a C long int, platform independent
int_size = struct.calcsize(b'>i')
# An empty index entry, used as a default value to be overridden, or nullrev
revlog: add a "data compression mode" entry in the index tuple...
r48023 null_item = (
0,
0,
0,
-1,
-1,
-1,
-1,
sha1nodeconstants.nullid,
0,
0,
revlog_constants.COMP_MODE_INLINE,
revlog: introduce a compression mode for sidedata in the revlog index...
r48030 revlog_constants.COMP_MODE_INLINE,
revlog: add a "data compression mode" entry in the index tuple...
r48023 )
Raphaël Gomès
revlog: prepare pure parser for being overloaded...
r47136
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 @util.propertycache
def entry_size(self):
return self.index_format.size
revlog: deprecate direct `nodemap` access...
r43974 @property
def nodemap(self):
Denis Laxalde
py3: pass a bytes value for "msg" to nouideprecwarn()...
r44018 msg = b"index.nodemap is deprecated, use index.[has_node|rev|get_rev]"
revlog: deprecate direct `nodemap` access...
r43974 util.nouideprecwarn(msg, b'5.3', stacklevel=2)
return self._nodemap
revlog: move the nodemap into the index object (for pure)...
r43925 @util.propertycache
revlog: deprecate direct `nodemap` access...
r43974 def _nodemap(self):
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 nodemap = nodemaputil.NodeMap({sha1nodeconstants.nullid: nullrev})
revlog: move the nodemap into the index object (for pure)...
r43925 for r in range(0, len(self)):
n = self[r][7]
nodemap[n] = r
return nodemap
index: add a `has_node` method (API)...
r43934 def has_node(self, node):
"""return True if the node exist in the index"""
revlog: deprecate direct `nodemap` access...
r43974 return node in self._nodemap
index: add a `has_node` method (API)...
r43934
index: add a `rev` method (API)...
r43952 def rev(self, node):
"""return a revision for a node
If the node is unknown, raise a RevlogError"""
revlog: deprecate direct `nodemap` access...
r43974 return self._nodemap[node]
index: add a `rev` method (API)...
r43952
index: add a `get_rev` method (API)...
r43954 def get_rev(self, node):
"""return a revision for a node
If the node is unknown, return None"""
revlog: deprecate direct `nodemap` access...
r43974 return self._nodemap.get(node)
index: add a `get_rev` method (API)...
r43954
revlog: deal with nodemap deletion within the index...
r43933 def _stripnodes(self, start):
revlog: deprecate direct `nodemap` access...
r43974 if '_nodemap' in vars(self):
revlog: deal with nodemap deletion within the index...
r43933 for r in range(start, len(self)):
n = self[r][7]
revlog: deprecate direct `nodemap` access...
r43974 del self._nodemap[n]
revlog: deal with nodemap deletion within the index...
r43933
revlog: move the nodemap into the index object (for pure)...
r43925 def clearcaches(self):
revlog: deprecate direct `nodemap` access...
r43974 self.__dict__.pop('_nodemap', None)
revlog: move the nodemap into the index object (for pure)...
r43925
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def __len__(self):
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 return self._lgt + len(self._extra)
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133
Martin von Zweigbergk
index: replace insert(-1, e) method by append(e) method...
r38886 def append(self, tup):
revlog: deprecate direct `nodemap` access...
r43974 if '_nodemap' in vars(self):
self._nodemap[tup[7]] = len(self)
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 data = self._pack_entry(len(self), tup)
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 self._extra.append(data)
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
r7945
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 def _pack_entry(self, rev, entry):
revlog: always "append" full size tuple...
r47914 assert entry[8] == 0
assert entry[9] == 0
return self.index_format.pack(*entry[:8])
Martin von Zweigbergk
index: rename _fix_index() since it no longer fixes the index...
r39251 def _check_index(self, i):
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if not isinstance(i, int):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise TypeError(b"expecting int indexes")
Martin von Zweigbergk
index: don't include nullid in boundary check in pure code...
r39250 if i < 0 or i >= len(self):
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 raise IndexError
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
r7945
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def __getitem__(self, i):
Augie Fackler
parsers: adjust pure-python version to mimic a3dacabd476b...
r39082 if i == -1:
Raphaël Gomès
revlog: prepare pure parser for being overloaded...
r47136 return self.null_item
Martin von Zweigbergk
index: rename _fix_index() since it no longer fixes the index...
r39251 self._check_index(i)
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if i >= self._lgt:
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 data = self._extra[i - self._lgt]
else:
index = self._calculate_index(i)
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 data = self._data[index : index + self.entry_size]
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 r = self._unpack_entry(i, data)
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if self._lgt and i == 0:
revlog: move `offset_type` to `revlogutils`...
r48186 offset = revlogutils.offset_type(0, gettype(r[0]))
r = (offset,) + r[1:]
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 return r
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 def _unpack_entry(self, rev, data):
revlog: make the index always return the same tuple...
r47913 r = self.index_format.unpack(data)
revlog: introduce a compression mode for sidedata in the revlog index...
r48030 r = r + (
0,
0,
revlog_constants.COMP_MODE_INLINE,
revlog_constants.COMP_MODE_INLINE,
)
revlog: make the index always return the same tuple...
r47913 return r
revlog: have an explicit "pack_header" method...
r47811 def pack_header(self, header):
"""pack header information as binary"""
v_fmt = revlog_constants.INDEX_HEADER
return v_fmt.pack(header)
def entry_binary(self, rev):
revlog: add a `entry_binary` method on index...
r47808 """return the raw binary string representing a revision"""
entry = self[rev]
revlog: make the index always return the same tuple...
r47913 p = revlog_constants.INDEX_ENTRY_V1.pack(*entry[:8])
revlog: add a `entry_binary` method on index...
r47808 if rev == 0:
revlog: have an explicit "pack_header" method...
r47811 p = p[revlog_constants.INDEX_HEADER.size :]
revlog: add a `entry_binary` method on index...
r47808 return p
Augie Fackler
formatting: blacken the codebase...
r43346
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 class IndexObject(BaseIndexObject):
def __init__(self, data):
revlog: add a `entry_binary` method on index...
r47808 assert len(data) % self.entry_size == 0, (
len(data),
self.entry_size,
len(data) % self.entry_size,
)
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 self._data = data
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 self._lgt = len(data) // self.entry_size
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 self._extra = []
def _calculate_index(self, i):
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 return i * self.entry_size
Matt Mackall
revlog: remove lazy index
r13253
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def __delitem__(self, i):
Alex Gaynor
style: always use `x is not None` instead of `not x is None`...
r34332 if not isinstance(i, slice) or not i.stop == -1 or i.step is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise ValueError(b"deleting slices only supports a:-1 with step 1")
Martin von Zweigbergk
index: rename _fix_index() since it no longer fixes the index...
r39251 i = i.start
self._check_index(i)
revlog: deal with nodemap deletion within the index...
r43933 self._stripnodes(i)
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if i < self._lgt:
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 self._data = self._data[: i * self.entry_size]
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 self._lgt = i
self._extra = []
else:
Augie Fackler
formatting: blacken the codebase...
r43346 self._extra = self._extra[: i - self._lgt]
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133
nodemap: add a (python) index class for persistent nodemap testing...
r44794 class PersistentNodeMapIndexObject(IndexObject):
"""a Debug oriented class to test persistent nodemap
We need a simple python object to test API and higher level behavior. See
the Rust implementation for more serious usage. This should be used only
through the dedicated `devel.persistent-nodemap` config.
"""
nodemap: add a optional `nodemap_add_full` method on indexes...
r44795 def nodemap_data_all(self):
"""Return bytes containing a full serialization of a nodemap
The nodemap should be valid for the full set of revisions in the
index."""
return nodemaputil.persistent_data(self)
nodemap: introduce append-only incremental update of the persistent data...
r44805 def nodemap_data_incremental(self):
"""Return bytes containing a incremental update to persistent nodemap
This containst the data for an append-only update of the data provided
in the last call to `update_nodemap_data`.
"""
if self._nm_root is None:
return None
nodemap: double check the source docket when doing incremental update...
r44809 docket = self._nm_docket
nodemap: track the total and unused amount of data in the rawdata file...
r44808 changed, data = nodemaputil.update_persistent_data(
nodemap: double check the source docket when doing incremental update...
r44809 self, self._nm_root, self._nm_max_idx, self._nm_docket.tip_rev
nodemap: introduce append-only incremental update of the persistent data...
r44805 )
nodemap: double check the source docket when doing incremental update...
r44809
self._nm_root = self._nm_max_idx = self._nm_docket = None
return docket, changed, data
nodemap: introduce append-only incremental update of the persistent data...
r44805
nodemap: track the maximum revision tracked in the nodemap...
r44807 def update_nodemap_data(self, docket, nm_data):
"""provide full block of persisted binary data for a nodemap
nodemap: provide the on disk data to indexes who support it...
r44801
The data are expected to come from disk. See `nodemap_data_all` for a
produceur of such data."""
if nm_data is not None:
nodemap: introduce append-only incremental update of the persistent data...
r44805 self._nm_root, self._nm_max_idx = nodemaputil.parse_data(nm_data)
if self._nm_root:
nodemap: double check the source docket when doing incremental update...
r44809 self._nm_docket = docket
nodemap: introduce append-only incremental update of the persistent data...
r44805 else:
nodemap: double check the source docket when doing incremental update...
r44809 self._nm_root = self._nm_max_idx = self._nm_docket = None
nodemap: provide the on disk data to indexes who support it...
r44801
nodemap: add a (python) index class for persistent nodemap testing...
r44794
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 class InlinedIndexObject(BaseIndexObject):
def __init__(self, data, inline=0):
self._data = data
self._lgt = self._inline_scan(None)
self._inline_scan(self._lgt)
self._extra = []
Martin Geisler
pure Python implementation of parsers.c
r7700
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def _inline_scan(self, lgt):
off = 0
if lgt is not None:
self._offsets = [0] * lgt
count = 0
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 while off <= len(self._data) - self.entry_size:
Raphaël Gomès
revlog: prepare pure parser for being overloaded...
r47136 start = off + self.big_int_size
Augie Fackler
formatting: blacken the codebase...
r43346 (s,) = struct.unpack(
Raphaël Gomès
revlog: prepare pure parser for being overloaded...
r47136 b'>i',
self._data[start : start + self.int_size],
Augie Fackler
formatting: blacken the codebase...
r43346 )
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if lgt is not None:
self._offsets[count] = off
count += 1
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 off += self.entry_size + s
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if off != len(self._data):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise ValueError(b"corrupted data")
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 return count
Augie Fackler
pure parsers: properly detect corrupt index files...
r14421
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def __delitem__(self, i):
Alex Gaynor
style: always use `x is not None` instead of `not x is None`...
r34332 if not isinstance(i, slice) or not i.stop == -1 or i.step is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise ValueError(b"deleting slices only supports a:-1 with step 1")
Martin von Zweigbergk
index: rename _fix_index() since it no longer fixes the index...
r39251 i = i.start
self._check_index(i)
revlog: deal with nodemap deletion within the index...
r43933 self._stripnodes(i)
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if i < self._lgt:
self._offsets = self._offsets[:i]
self._lgt = i
self._extra = []
else:
Augie Fackler
formatting: blacken the codebase...
r43346 self._extra = self._extra[: i - self._lgt]
Martin Geisler
pure Python implementation of parsers.c
r7700
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 def _calculate_index(self, i):
return self._offsets[i]
Martin Geisler
pure Python implementation of parsers.c
r7700
Augie Fackler
formatting: blacken the codebase...
r43346
Raphaël Gomès
revlog: introduce v2 format...
r47438 def parse_index2(data, inline, revlogv2=False):
Maciej Fijalkowski
pure: write a really lazy version of pure indexObject...
r29133 if not inline:
Raphaël Gomès
revlog: introduce v2 format...
r47438 cls = IndexObject2 if revlogv2 else IndexObject
return cls(data), None
revlogv2: drop the code related to inlined revlogv2...
r48036 cls = InlinedIndexObject
Raphaël Gomès
revlog: introduce v2 format...
r47438 return cls(data, inline), (0, data)
changelogv2: use a dedicated on disk format for changelogv2...
r48044 def parse_index_cl_v2(data):
return IndexChangelogV2(data), None
revlogv2: drop the code related to inlined revlogv2...
r48036 class IndexObject2(IndexObject):
revlog: directly use the Struct object for related operation...
r47619 index_format = revlog_constants.INDEX_ENTRY_V2
Raphaël Gomès
revlog: introduce v2 format...
r47438
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 def replace_sidedata_info(
revlog: compress sidedata when doing "post-pull" sidedata update...
r48033 self,
rev,
sidedata_offset,
sidedata_length,
offset_flags,
compression_mode,
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 ):
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 """
Replace an existing index entry's sidedata offset and length with new
ones.
This cannot be used outside of the context of sidedata rewriting,
revlog: use `rev` instead of `i` in replace_sidedata_info...
r48017 inside the transaction that creates the revision `rev`.
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 """
revlog: use `rev` instead of `i` in replace_sidedata_info...
r48017 if rev < 0:
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 raise KeyError
revlog: use `rev` instead of `i` in replace_sidedata_info...
r48017 self._check_index(rev)
revlog: simplify the replace_sidedata_info code...
r48018 if rev < self._lgt:
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 msg = b"cannot rewrite entries outside of this transaction"
raise KeyError(msg)
revlog: simplify the replace_sidedata_info code...
r48018 else:
entry = list(self[rev])
entry[0] = offset_flags
entry[8] = sidedata_offset
entry[9] = sidedata_length
revlog: compress sidedata when doing "post-pull" sidedata update...
r48033 entry[11] = compression_mode
revlog: simplify the replace_sidedata_info code...
r48018 entry = tuple(entry)
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 new = self._pack_entry(rev, entry)
revlog: simplify the replace_sidedata_info code...
r48018 self._extra[rev - self._lgt] = new
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 def _unpack_entry(self, rev, data):
revlog: introduce a compression mode for sidedata in the revlog index...
r48030 data = self.index_format.unpack(data)
entry = data[:10]
data_comp = data[10] & 3
sidedata_comp = (data[10] & (3 << 2)) >> 2
return entry + (data_comp, sidedata_comp)
revlog: make the index always return the same tuple...
r47913
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 def _pack_entry(self, rev, entry):
revlog: introduce a compression mode for sidedata in the revlog index...
r48030 data = entry[:10]
data_comp = entry[10] & 3
sidedata_comp = (entry[11] & 3) << 2
data += (data_comp | sidedata_comp,)
return self.index_format.pack(*data)
revlog: always "append" full size tuple...
r47914
revlog: have an explicit "pack_header" method...
r47811 def entry_binary(self, rev):
revlog: add a `entry_binary` method on index...
r47808 """return the raw binary string representing a revision"""
entry = self[rev]
revlog: pass around the `rev` we deal with when packing/unpacking entry...
r48041 return self._pack_entry(rev, entry)
revlog: add a `entry_binary` method on index...
r47808
revlogv2: store version information in the docket only...
r48009 def pack_header(self, header):
"""pack header information as binary"""
msg = 'version header should go in the docket, not the index: %d'
msg %= header
raise error.ProgrammingError(msg)
Raphaël Gomès
revlog: introduce v2 format...
r47438
changelogv2: use a dedicated on disk format for changelogv2...
r48044 class IndexChangelogV2(IndexObject2):
index_format = revlog_constants.INDEX_ENTRY_CL_V2
def _unpack_entry(self, rev, data, r=True):
items = self.index_format.unpack(data)
entry = items[:3] + (rev, rev) + items[3:8]
data_comp = items[8] & 3
sidedata_comp = (items[8] >> 2) & 3
return entry + (data_comp, sidedata_comp)
def _pack_entry(self, rev, entry):
assert entry[3] == rev, entry[3]
assert entry[4] == rev, entry[4]
data = entry[:3] + entry[5:10]
data_comp = entry[10] & 3
sidedata_comp = (entry[11] & 3) << 2
data += (data_comp | sidedata_comp,)
return self.index_format.pack(*data)
nodemap: add a (python) index class for persistent nodemap testing...
r44794 def parse_index_devel_nodemap(data, inline):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """like parse_index2, but alway return a PersistentNodeMapIndexObject"""
nodemap: add a (python) index class for persistent nodemap testing...
r44794 return PersistentNodeMapIndexObject(data), None
Martin Geisler
pure Python implementation of parsers.c
r7700 def parse_dirstate(dmap, copymap, st):
Augie Fackler
formatting: blacken the codebase...
r43346 parents = [st[:20], st[20:40]]
Mads Kiilerich
fix wording and not-completely-trivial spelling errors and bad docstrings
r17425 # dereference fields so they will be local in loop
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 format = b">cllll"
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
r7945 e_size = struct.calcsize(format)
Martin Geisler
pure Python implementation of parsers.c
r7700 pos1 = 40
l = len(st)
# the inner loop
while pos1 < l:
pos2 = pos1 + e_size
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 e = _unpack(b">cllll", st[pos1:pos2]) # a literal here is faster
Martin Geisler
pure Python implementation of parsers.c
r7700 pos1 = pos2 + e[4]
f = st[pos2:pos1]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'\0' in f:
f, c = f.split(b'\0')
Martin Geisler
pure Python implementation of parsers.c
r7700 copymap[f] = c
dirstate-item: add a `from_v1_data` constructor...
r48465 dmap[f] = DirstateItem.from_v1_data(*e[:4])
Martin Geisler
pure Python implementation of parsers.c
r7700 return parents
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567
Augie Fackler
formatting: blacken the codebase...
r43346
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567 def pack_dirstate(dmap, copymap, pl, now):
now = int(now)
timeless
pycompat: switch to util.stringio for py3 compat
r28861 cs = stringio()
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567 write = cs.write
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 write(b"".join(pl))
Gregory Szorc
py3: finish porting iteritems() to pycompat and remove source transformer...
r43376 for f, e in pycompat.iteritems(dmap):
dirstate-item: use need_delay when packing dirstate...
r48329 if e.need_delay(now):
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567 # The file was last modified "simultaneously" with the current
# write to dirstate (i.e. within the same second for file-
# systems with a granularity of 1 sec). This commonly happens
# for at least a couple of files on 'update'.
# The user could change the file without changing its size
Siddharth Agarwal
pack_dirstate: only invalidate mtime for files written in the last second...
r19652 # within the same second. Invalidate the file's mtime in
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567 # dirstate, forcing future 'status' calls to compare the
Siddharth Agarwal
pack_dirstate: only invalidate mtime for files written in the last second...
r19652 # contents of the file if the size is the same. This prevents
# mistakenly treating such files as clean.
dirstate-item: use `set_possibly_dirty` in `pure.pack_dirstate`...
r48467 e.set_possibly_dirty()
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567
if f in copymap:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f = b"%s\0%s" % (f, copymap[f])
dirstate-entry: introduce dedicated accessors for v1 serialization...
r48298 e = _pack(
b">cllll",
e.v1_state(),
e.v1_mode(),
e.v1_size(),
e.v1_mtime(),
len(f),
)
Siddharth Agarwal
dirstate: move pure python dirstate packing to pure/parsers.py
r18567 write(e)
write(f)
return cs.getvalue()