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

annotate mercurial/dirstatemap.py @ 48137:25836b0029f5

dirstatemap: drop legacy method on the dirstatemap wrapper They are no longer in use now that the Rust wrapper version of the Dirstatemap are back in line with the Python one. Differential Revision: https://phab.mercurial-scm.org/D11582

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sat, 02 Oct 2021 11:39:57 +0200
parents	bda85920de6b
children	38488d488ec1

rev	line source
47501 8b7e47802deb dirstate: split dirstatemap in its own file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47489 diff changeset	1 # dirstatemap.py
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # 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: 9678 diff changeset	4 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5
27503 0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	6 from __future__ import absolute_import
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	7
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	8 import errno
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	9
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	10 from .i18n import _
43239 6fcdcea2b03a dirstate: add some traces on listdir calls Augie Fackler <augie@google.com> parents: 43117 diff changeset	11
27503 0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	12 from . import (
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	13 error,
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	14 pathutil,
32372 df448de7cf3b parsers: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32352 diff changeset	15 policy,
30304 ba2c04059317 py3: use pycompat.ossep at certain places Pulkit Goyal <7895pulkit@gmail.com> parents: 30224 diff changeset	16 pycompat,
31050 206532700213 txnutil: factor out the logic to read file in according to HG_PENDING FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30634 diff changeset	17 txnutil,
27503 0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	18 util,
0f4596622273 dirstate: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27399 diff changeset	19 )
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	20
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47672 diff changeset	21 from .dirstateutils import (
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47672 diff changeset	22 docket as docketmod,
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47672 diff changeset	23 )
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47672 diff changeset	24
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43505 diff changeset	25 parsers = policy.importmod('parsers')
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43505 diff changeset	26 rustmod = policy.importrust('dirstate')
32372 df448de7cf3b parsers: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32352 diff changeset	27
8261 0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	28 propertycache = util.propertycache
16201 fb7c4c14223f dirstate: filecacheify _branch Idan Kamara <idankk86@gmail.com> parents: 16200 diff changeset	29
48044 d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	30 if rustmod is None:
d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	31 DirstateItem = parsers.DirstateItem
d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	32 else:
d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	33 DirstateItem = rustmod.DirstateItem
21808 7537e57f5dbd dirstate: add dirstatetuple to create dirstate values Siddharth Agarwal <sid0@fb.com> parents: 21116 diff changeset	34
47521 abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	35 rangemask = 0x7FFFFFFF
abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	36
47482 cb29484eaade dirstate: introduce a symbolic constant for the FROM_P2 marker Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47481 diff changeset	37
48119 aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	38 class _dirstatemapcommon(object):
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	39 """
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	40 Methods that are identical for both implementations of the dirstatemap
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	41 class, with and without Rust extensions enabled.
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	42 """
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	43
48122 bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	44 # please pytype
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	45
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	46 _map = None
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	47 copymap = None
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	48
48120 fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	49 def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	50 self._use_dirstate_v2 = use_dirstate_v2
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	51 self._nodeconstants = nodeconstants
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	52 self._ui = ui
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	53 self._opener = opener
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	54 self._root = root
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	55 self._filename = b'dirstate'
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	56 self._nodelen = 20 # Also update Rust code when changing this!
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	57 self._parents = None
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	58 self._dirtyparents = False
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	59
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	60 # for consistent view between _pl() and _read() invocations
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	61 self._pendingmode = None
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	62
48122 bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	63 def preload(self):
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	64 """Loads the underlying data, if it's not already loaded"""
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	65 self._map
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	66
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	67 def get(self, key, default=None):
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	68 return self._map.get(key, default)
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	69
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	70 def __len__(self):
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	71 return len(self._map)
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	72
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	73 def __iter__(self):
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	74 return iter(self._map)
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	75
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	76 def __contains__(self, key):
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	77 return key in self._map
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	78
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	79 def __getitem__(self, item):
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	80 return self._map[item]
bbd924a36a6e dirstatemap: move a multiple simple functions in the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48121 diff changeset	81
48125 de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	82 ### sub-class utility method
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	83 #
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	84 # Use to allow for generic implementation of some method while still coping
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	85 # with minor difference between implementation.
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	86
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	87 def _dirs_incr(self, filename, old_entry=None):
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	88 """incremente the dirstate counter if applicable
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	89
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	90 This might be a no-op for some subclass who deal with directory
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	91 tracking in a different way.
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	92 """
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	93
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	94 def _dirs_decr(self, filename, old_entry=None, remove_variant=False):
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	95 """decremente the dirstate counter if applicable
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	96
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	97 This might be a no-op for some subclass who deal with directory
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	98 tracking in a different way.
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	99 """
de793f249852 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48124 diff changeset	100
48126 a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	101 def _refresh_entry(self, f, entry):
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	102 """record updated state of an entry"""
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	103
48128 a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	104 def _insert_entry(self, f, entry):
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	105 """add a new dirstate entry (or replace an unrelated one)
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	106
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	107 The fact it is actually new is the responsability of the caller
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	108 """
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	109
48132 c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	110 def _drop_entry(self, f):
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	111 """remove any entry for file f
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	112
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	113 This should also drop associated copy information
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	114
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	115 The fact we actually need to drop it is the responsability of the caller"""
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	116
48127 ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	117 ### method to manipulate the entries
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	118
48130 743808de0c03 dirstatemap: use common code for set_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48129 diff changeset	119 def set_possibly_dirty(self, filename):
743808de0c03 dirstatemap: use common code for set_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48129 diff changeset	120 """record that the current state of the file on disk is unknown"""
743808de0c03 dirstatemap: use common code for set_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48129 diff changeset	121 entry = self[filename]
743808de0c03 dirstatemap: use common code for set_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48129 diff changeset	122 entry.set_possibly_dirty()
743808de0c03 dirstatemap: use common code for set_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48129 diff changeset	123 self._refresh_entry(filename, entry)
743808de0c03 dirstatemap: use common code for set_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48129 diff changeset	124
48131 f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	125 def set_clean(self, filename, mode, size, mtime):
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	126 """mark a file as back to a clean state"""
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	127 entry = self[filename]
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	128 mtime = mtime & rangemask
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	129 size = size & rangemask
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	130 entry.set_clean(mode, size, mtime)
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	131 self._refresh_entry(filename, entry)
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	132 self.copymap.pop(filename, None)
f903a357ba72 dirstatemap: use common code for set_clean Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48130 diff changeset	133
48129 a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	134 def set_tracked(self, filename):
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	135 new = False
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	136 entry = self.get(filename)
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	137 if entry is None:
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	138 self._dirs_incr(filename)
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	139 entry = DirstateItem(
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	140 p1_tracked=False,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	141 p2_tracked=False,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	142 wc_tracked=True,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	143 merged=False,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	144 clean_p1=False,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	145 clean_p2=False,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	146 possibly_dirty=False,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	147 parentfiledata=None,
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	148 )
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	149
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	150 self._insert_entry(filename, entry)
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	151 new = True
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	152 elif not entry.tracked:
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	153 self._dirs_incr(filename, entry)
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	154 entry.set_tracked()
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	155 self._refresh_entry(filename, entry)
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	156 new = True
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	157 else:
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	158 # XXX This is probably overkill for more case, but we need this to
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	159 # fully replace the `normallookup` call with `set_tracked` one.
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	160 # Consider smoothing this in the future.
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	161 entry.set_possibly_dirty()
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	162 self._refresh_entry(filename, entry)
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	163 return new
a39192fc7c56 dirstatemap: use a common implement for set_tracked Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48128 diff changeset	164
48127 ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	165 def set_untracked(self, f):
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	166 """Mark a file as no longer tracked in the dirstate map"""
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	167 entry = self.get(f)
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	168 if entry is None:
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	169 return False
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	170 else:
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	171 self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	172 if not entry.merged:
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	173 self.copymap.pop(f, None)
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	174 entry.set_untracked()
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	175 self._refresh_entry(f, entry)
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	176 return True
ced8cf9c4905 dirstatemap: use a common implementation for `dirstatemap.set_untracked` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48126 diff changeset	177
48133 55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	178 def reset_state(
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	179 self,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	180 filename,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	181 wc_tracked=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	182 p1_tracked=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	183 p2_tracked=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	184 merged=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	185 clean_p1=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	186 clean_p2=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	187 possibly_dirty=False,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	188 parentfiledata=None,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	189 ):
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	190 """Set a entry to a given state, diregarding all previous state
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	191
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	192 This is to be used by the part of the dirstate API dedicated to
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	193 adjusting the dirstate after a update/merge.
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	194
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	195 note: calling this might result to no entry existing at all if the
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	196 dirstate map does not see any point at having one for this file
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	197 anymore.
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	198 """
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	199 if merged and (clean_p1 or clean_p2):
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	200 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	201 raise error.ProgrammingError(msg)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	202 # copy information are now outdated
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	203 # (maybe new information should be in directly passed to this function)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	204 self.copymap.pop(filename, None)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	205
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	206 if not (p1_tracked or p2_tracked or wc_tracked):
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	207 old_entry = self._map.get(filename)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	208 self._drop_entry(filename)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	209 self._dirs_decr(filename, old_entry=old_entry)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	210 return
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	211 elif merged:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	212 pass
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	213 elif not (p1_tracked or p2_tracked) and wc_tracked:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	214 pass # file is added, nothing special to adjust
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	215 elif (p1_tracked or p2_tracked) and not wc_tracked:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	216 pass
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	217 elif clean_p2 and wc_tracked:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	218 pass
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	219 elif not p1_tracked and p2_tracked and wc_tracked:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	220 clean_p2 = True
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	221 elif possibly_dirty:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	222 pass
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	223 elif wc_tracked:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	224 # this is a "normal" file
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	225 if parentfiledata is None:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	226 msg = b'failed to pass parentfiledata for a normal file: %s'
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	227 msg %= filename
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	228 raise error.ProgrammingError(msg)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	229 else:
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	230 assert False, 'unreachable'
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	231
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	232 old_entry = self._map.get(filename)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	233 self._dirs_incr(filename, old_entry)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	234 entry = DirstateItem(
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	235 wc_tracked=wc_tracked,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	236 p1_tracked=p1_tracked,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	237 p2_tracked=p2_tracked,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	238 merged=merged,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	239 clean_p1=clean_p1,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	240 clean_p2=clean_p2,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	241 possibly_dirty=possibly_dirty,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	242 parentfiledata=parentfiledata,
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	243 )
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	244 self._insert_entry(filename, entry)
55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	245
48119 aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	246
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	247 class dirstatemap(_dirstatemapcommon):
35078 a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	248 """Map encapsulating the dirstate's contents.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	249
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	250 The dirstate contains the following state:
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	251
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	252 - `identity` is the identity of the dirstate file, which can be used to
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	253 detect when changes have occurred to the dirstate file.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	254
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	255 - `parents` is a pair containing the parents of the working copy. The
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	256 parents are updated by calling `setparents`.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	257
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	258 - the state map maps filenames to tuples of (state, mode, size, mtime),
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	259 where state is a single character representing 'normal', 'added',
35079 853b7c41d19c dirstate: add explicit methods for modifying dirstate Mark Thomas <mbthomas@fb.com> parents: 35078 diff changeset	260 'removed', or 'merged'. It is read by treating the dirstate as a
47996 aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	261 dict. File state is updated by calling various methods (see each
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	262 documentation for details):
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	263
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	264 - `reset_state`,
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	265 - `set_tracked`
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	266 - `set_untracked`
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	267 - `set_clean`
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	268 - `set_possibly_dirty`
35078 a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	269
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	270 - `copymap` maps destination filenames to their source filename.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	271
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	272 The dirstate also provides the following views onto the state:
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	273
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	274 - `filefoldmap` is a dict mapping normalized filenames to the denormalized
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	275 form that they appear as in the dirstate.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	276
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	277 - `dirfoldmap` is a dict mapping normalized directory names to the
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	278 denormalized form that they appear as in the dirstate.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	279 """
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	280
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47277 diff changeset	281 def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
48120 fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	282 super(dirstatemap, self).__init__(
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	283 ui, opener, root, nodeconstants, use_dirstate_v2
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	284 )
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	285 if self._use_dirstate_v2:
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	286 msg = "Dirstate V2 not supportedi"
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	287 msg += "(should have detected unsupported requirement)"
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	288 raise error.ProgrammingError(msg)
34337 c36c3fa7d35b dirstate: move opendirstatefile to dirstatemap Durham Goode <durham@fb.com> parents: 34336 diff changeset	289
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	290 ### Core data storage and access
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	291
34934 6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	292 @propertycache
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	293 def _map(self):
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	294 self._map = {}
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	295 self.read()
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	296 return self._map
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	297
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	298 @propertycache
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	299 def copymap(self):
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	300 self.copymap = {}
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	301 self._map
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	302 return self.copymap
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	303
34933 0217f75b6e59 dirstate: move clear onto dirstatemap class Durham Goode <durham@fb.com> parents: 34678 diff changeset	304 def clear(self):
34935 ffeea2406276 dirstate: remove excess attribute lookups for dirstate.status (issue5714) Durham Goode <durham@fb.com> parents: 34934 diff changeset	305 self._map.clear()
ffeea2406276 dirstate: remove excess attribute lookups for dirstate.status (issue5714) Durham Goode <durham@fb.com> parents: 34934 diff changeset	306 self.copymap.clear()
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	307 self.setparents(self._nodeconstants.nullid, self._nodeconstants.nullid)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	308 util.clearcachedproperty(self, b"_dirs")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	309 util.clearcachedproperty(self, b"_alldirs")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	310 util.clearcachedproperty(self, b"filefoldmap")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	311 util.clearcachedproperty(self, b"dirfoldmap")
34933 0217f75b6e59 dirstate: move clear onto dirstatemap class Durham Goode <durham@fb.com> parents: 34678 diff changeset	312
35878 6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	313 def items(self):
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	314 return pycompat.iteritems(self._map)
34332 b36881c68569 dirstate: create new dirstatemap class Durham Goode <durham@fb.com> parents: 34188 diff changeset	315
35878 6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	316 # forward for python2,3 compat
6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	317 iteritems = items
6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	318
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	319 def debug_iter(self, all):
357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	320 """
48024 cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	321 Return an iterator of (filename, state, mode, size, mtime) tuples
cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	322
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	323 `all` is unused when Rust is not enabled
357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	324 """
48024 cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	325 for (filename, item) in self.items():
cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	326 yield (filename, item.state, item.mode, item.size, item.mtime)
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	327
34332 b36881c68569 dirstate: create new dirstatemap class Durham Goode <durham@fb.com> parents: 34188 diff changeset	328 def keys(self):
b36881c68569 dirstate: create new dirstatemap class Durham Goode <durham@fb.com> parents: 34188 diff changeset	329 return self._map.keys()
34333 4ac04418ce66 dirstate: move nonnormalentries to dirstatemap Durham Goode <durham@fb.com> parents: 34332 diff changeset	330
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	331 ### reading/setting parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	332
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	333 def parents(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	334 if not self._parents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	335 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	336 fp = self._opendirstatefile()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	337 st = fp.read(2 * self._nodelen)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	338 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	339 except IOError as err:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	340 if err.errno != errno.ENOENT:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	341 raise
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	342 # File doesn't exist, so the current state is empty
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	343 st = b''
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	344
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	345 l = len(st)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	346 if l == self._nodelen * 2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	347 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	348 st[: self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	349 st[self._nodelen : 2 * self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	350 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	351 elif l == 0:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	352 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	353 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	354 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	355 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	356 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	357 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	358 _(b'working directory state appears damaged!')
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	359 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	360
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	361 return self._parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	362
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	363 def setparents(self, p1, p2, fold_p2=False):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	364 self._parents = (p1, p2)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	365 self._dirtyparents = True
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	366 copies = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	367 if fold_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	368 for f, s in pycompat.iteritems(self._map):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	369 # Discard "merged" markers when moving away from a merge state
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	370 if s.merged or s.from_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	371 source = self.copymap.pop(f, None)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	372 if source:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	373 copies[f] = source
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	374 s.drop_merge_data()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	375 return copies
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	376
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	377 ### disk interaction
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	378
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	379 def read(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	380 # ignore HG_PENDING because identity is used only for writing
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	381 self.identity = util.filestat.frompath(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	382 self._opener.join(self._filename)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	383 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	384
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	385 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	386 fp = self._opendirstatefile()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	387 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	388 st = fp.read()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	389 finally:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	390 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	391 except IOError as err:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	392 if err.errno != errno.ENOENT:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	393 raise
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	394 return
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	395 if not st:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	396 return
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	397
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	398 if util.safehasattr(parsers, b'dict_new_presized'):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	399 # Make an estimate of the number of files in the dirstate based on
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	400 # its size. This trades wasting some memory for avoiding costly
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	401 # resizes. Each entry have a prefix of 17 bytes followed by one or
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	402 # two path names. Studies on various large-scale real-world repositories
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	403 # found 54 bytes a reasonable upper limit for the average path names.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	404 # Copy entries are ignored for the sake of this estimate.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	405 self._map = parsers.dict_new_presized(len(st) // 71)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	406
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	407 # Python's garbage collector triggers a GC each time a certain number
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	408 # of container objects (the number being defined by
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	409 # gc.get_threshold()) are allocated. parse_dirstate creates a tuple
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	410 # for each file in the dirstate. The C version then immediately marks
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	411 # them as not to be tracked by the collector. However, this has no
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	412 # effect on when GCs are triggered, only on what objects the GC looks
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	413 # into. This means that O(number of files) GCs are unavoidable.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	414 # Depending on when in the process's lifetime the dirstate is parsed,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	415 # this can get very expensive. As a workaround, disable GC while
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	416 # parsing the dirstate.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	417 #
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	418 # (we cannot decorate the function directly since it is in a C module)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	419 parse_dirstate = util.nogc(parsers.parse_dirstate)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	420 p = parse_dirstate(self._map, self.copymap, st)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	421 if not self._dirtyparents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	422 self.setparents(*p)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	423
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	424 # Avoid excess attribute lookups by fast pathing certain checks
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	425 self.__contains__ = self._map.__contains__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	426 self.__getitem__ = self._map.__getitem__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	427 self.get = self._map.get
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	428
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	429 def write(self, _tr, st, now):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	430 d = parsers.pack_dirstate(self._map, self.copymap, self.parents(), now)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	431 st.write(d)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	432 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	433 self._dirtyparents = False
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	434
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	435 def _opendirstatefile(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	436 fp, mode = txnutil.trypending(self._root, self._opener, self._filename)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	437 if self._pendingmode is not None and self._pendingmode != mode:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	438 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	439 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	440 _(b'working directory state may be changed parallelly')
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	441 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	442 self._pendingmode = mode
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	443 return fp
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	444
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	445 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	446 def identity(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	447 self._map
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	448 return self.identity
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	449
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	450 ### code related to maintaining and accessing "extra" property
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	451 # (e.g. "has_dir")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	452
47687 e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	453 def _dirs_incr(self, filename, old_entry=None):
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	454 """incremente the dirstate counter if applicable"""
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	455 if (
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	456 old_entry is None or old_entry.removed
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	457 ) and "_dirs" in self.__dict__:
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	458 self._dirs.addpath(filename)
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	459 if old_entry is None and "_alldirs" in self.__dict__:
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	460 self._alldirs.addpath(filename)
e59bd6723f2f dirstate-map: factor out the change to _dirs and _alldirs on adding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	461
47689 f2aef39abc14 dirstate-map: factor out the change to _dirs and _alldirs on removing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47688 diff changeset	462 def _dirs_decr(self, filename, old_entry=None, remove_variant=False):
47688 b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	463 """decremente the dirstate counter if applicable"""
b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	464 if old_entry is not None:
b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	465 if "_dirs" in self.__dict__ and not old_entry.removed:
b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	466 self._dirs.delpath(filename)
47689 f2aef39abc14 dirstate-map: factor out the change to _dirs and _alldirs on removing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47688 diff changeset	467 if "_alldirs" in self.__dict__ and not remove_variant:
47688 b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	468 self._alldirs.delpath(filename)
47689 f2aef39abc14 dirstate-map: factor out the change to _dirs and _alldirs on removing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47688 diff changeset	469 elif remove_variant and "_alldirs" in self.__dict__:
f2aef39abc14 dirstate-map: factor out the change to _dirs and _alldirs on removing Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47688 diff changeset	470 self._alldirs.addpath(filename)
47688 b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	471 if "filefoldmap" in self.__dict__:
b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	472 normed = util.normcase(filename)
b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	473 self.filefoldmap.pop(normed, None)
b37ab6b5c438 dirstate-map: factor out the change to _dirs and _alldirs on dropping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47687 diff changeset	474
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	475 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	476 def filefoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	477 """Returns a dictionary mapping normalized case paths to their
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	478 non-normalized versions.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	479 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	480 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	481 makefilefoldmap = parsers.make_file_foldmap
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	482 except AttributeError:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	483 pass
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	484 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	485 return makefilefoldmap(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	486 self._map, util.normcasespec, util.normcasefallback
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	487 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	488
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	489 f = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	490 normcase = util.normcase
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	491 for name, s in pycompat.iteritems(self._map):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	492 if not s.removed:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	493 f[normcase(name)] = name
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	494 f[b'.'] = b'.' # prevents useless util.fspath() invocation
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	495 return f
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	496
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	497 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	498 def dirfoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	499 f = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	500 normcase = util.normcase
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	501 for name in self._dirs:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	502 f[normcase(name)] = name
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	503 return f
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	504
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	505 def hastrackeddir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	506 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	507 Returns True if the dirstate contains a tracked (not removed) file
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	508 in this directory.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	509 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	510 return d in self._dirs
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	511
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	512 def hasdir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	513 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	514 Returns True if the dirstate contains a file (tracked or removed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	515 in this directory.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	516 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	517 return d in self._alldirs
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	518
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	519 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	520 def _dirs(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	521 return pathutil.dirs(self._map, only_tracked=True)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	522
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	523 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	524 def _alldirs(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	525 return pathutil.dirs(self._map)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	526
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	527 ### code related to manipulation of entries and copy-sources
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	528
48126 a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	529 def _refresh_entry(self, f, entry):
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	530 if not entry.any_tracked:
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	531 self._map.pop(f, None)
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	532
48128 a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	533 def _insert_entry(self, f, entry):
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	534 self._map[f] = entry
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	535
48132 c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	536 def _drop_entry(self, f):
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	537 self._map.pop(f, None)
48133 55293938b843 dirstatemap: use a common implement for reset_state Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48132 diff changeset	538 self.copymap.pop(f, None)
48132 c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	539
42755 749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	540
749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	541 if rustmod is not None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42927 diff changeset	542
48119 aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	543 class dirstatemap(_dirstatemapcommon):
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47277 diff changeset	544 def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
48120 fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	545 super(dirstatemap, self).__init__(
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	546 ui, opener, root, nodeconstants, use_dirstate_v2
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	547 )
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47672 diff changeset	548 self._docket = None
42755 749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	549
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	550 ### Core data storage and access
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	551
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	552 @property
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	553 def docket(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	554 if not self._docket:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	555 if not self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	556 raise error.ProgrammingError(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	557 b'dirstate only has a docket in v2 format'
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	558 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	559 self._docket = docketmod.DirstateDocket.parse(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	560 self._readdirstatefile(), self._nodeconstants
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	561 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	562 return self._docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	563
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	564 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	565 def _map(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	566 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	567 Fills the Dirstatemap when called.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	568 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	569 # ignore HG_PENDING because identity is used only for writing
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	570 self.identity = util.filestat.frompath(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	571 self._opener.join(self._filename)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	572 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	573
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	574 if self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	575 if self.docket.uuid:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	576 # TODO: use mmap when possible
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	577 data = self._opener.read(self.docket.data_filename())
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	578 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	579 data = b''
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	580 self._map = rustmod.DirstateMap.new_v2(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	581 data, self.docket.data_size, self.docket.tree_metadata
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	582 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	583 parents = self.docket.parents
48051 98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	584 else:
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	585 self._map, parents = rustmod.DirstateMap.new_v1(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	586 self._readdirstatefile()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	587 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	588
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	589 if parents and not self._dirtyparents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	590 self.setparents(*parents)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	591
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	592 self.__contains__ = self._map.__contains__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	593 self.__getitem__ = self._map.__getitem__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	594 self.get = self._map.get
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	595 return self._map
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	596
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	597 @property
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	598 def copymap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	599 return self._map.copymap()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	600
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	601 def debug_iter(self, all):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	602 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	603 Return an iterator of (filename, state, mode, size, mtime) tuples
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	604
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	605 `all`: also include with `state == b' '` dirstate tree nodes that
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	606 don't have an associated `DirstateItem`.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	607
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	608 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	609 return self._map.debug_iter(all)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	610
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	611 def clear(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	612 self._map.clear()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	613 self.setparents(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	614 self._nodeconstants.nullid, self._nodeconstants.nullid
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	615 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	616 util.clearcachedproperty(self, b"_dirs")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	617 util.clearcachedproperty(self, b"_alldirs")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	618 util.clearcachedproperty(self, b"dirfoldmap")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	619
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	620 def items(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	621 return self._map.items()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	622
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	623 # forward for python2,3 compat
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	624 iteritems = items
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	625
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	626 def keys(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	627 return iter(self._map)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	628
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	629 ### reading/setting parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	630
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	631 def setparents(self, p1, p2, fold_p2=False):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	632 self._parents = (p1, p2)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	633 self._dirtyparents = True
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	634 copies = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	635 if fold_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	636 # Collect into an intermediate list to avoid a `RuntimeError`
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	637 # exception due to mutation during iteration.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	638 # TODO: move this the whole loop to Rust where `iter_mut`
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	639 # enables in-place mutation of elements of a collection while
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	640 # iterating it, without mutating the collection itself.
48136 bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	641 files_with_p2_info = [
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	642 f for f, s in self._map.items() if s.merged or s.from_p2
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	643 ]
48136 bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	644 rust_map = self._map
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	645 for f in files_with_p2_info:
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	646 e = rust_map.get(f)
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	647 source = self.copymap.pop(f, None)
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	648 if source:
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	649 copies[f] = source
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	650 e.drop_merge_data()
bda85920de6b dirstatemap: align the Rust wrapper implementation of `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48133 diff changeset	651 rust_map.set_dirstate_item(f, e)
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	652 return copies
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	653
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	654 def parents(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	655 if not self._parents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	656 if self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	657 self._parents = self.docket.parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	658 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	659 read_len = self._nodelen * 2
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	660 st = self._readdirstatefile(read_len)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	661 l = len(st)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	662 if l == read_len:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	663 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	664 st[: self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	665 st[self._nodelen : 2 * self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	666 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	667 elif l == 0:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	668 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	669 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	670 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	671 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	672 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	673 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	674 _(b'working directory state appears damaged!')
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	675 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	676
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	677 return self._parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	678
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	679 ### disk interaction
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	680
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	681 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	682 def identity(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	683 self._map
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	684 return self.identity
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	685
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	686 def write(self, tr, st, now):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	687 if not self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	688 p1, p2 = self.parents()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	689 packed = self._map.write_v1(p1, p2, now)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	690 st.write(packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	691 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	692 self._dirtyparents = False
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	693 return
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	694
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	695 # We can only append to an existing data file if there is one
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	696 can_append = self.docket.uuid is not None
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	697 packed, meta, append = self._map.write_v2(now, can_append)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	698 if append:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	699 docket = self.docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	700 data_filename = docket.data_filename()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	701 if tr:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	702 tr.add(data_filename, docket.data_size)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	703 with self._opener(data_filename, b'r+b') as fp:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	704 fp.seek(docket.data_size)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	705 assert fp.tell() == docket.data_size
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	706 written = fp.write(packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	707 if written is not None: # py2 may return None
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	708 assert written == len(packed), (written, len(packed))
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	709 docket.data_size += len(packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	710 docket.parents = self.parents()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	711 docket.tree_metadata = meta
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	712 st.write(docket.serialize())
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	713 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	714 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	715 old_docket = self.docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	716 new_docket = docketmod.DirstateDocket.with_new_uuid(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	717 self.parents(), len(packed), meta
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	718 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	719 data_filename = new_docket.data_filename()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	720 if tr:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	721 tr.add(data_filename, 0)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	722 self._opener.write(data_filename, packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	723 # Write the new docket after the new data file has been
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	724 # written. Because `st` was opened with `atomictemp=True`,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	725 # the actual `.hg/dirstate` file is only affected on close.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	726 st.write(new_docket.serialize())
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	727 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	728 # Remove the old data file after the new docket pointing to
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	729 # the new data file was written.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	730 if old_docket.uuid:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	731 data_filename = old_docket.data_filename()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	732 unlink = lambda _tr=None: self._opener.unlink(data_filename)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	733 if tr:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	734 category = b"dirstate-v2-clean-" + old_docket.uuid
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	735 tr.addpostclose(category, unlink)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	736 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	737 unlink()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	738 self._docket = new_docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	739 # Reload from the newly-written file
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	740 util.clearcachedproperty(self, b"_map")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	741 self._dirtyparents = False
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	742
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	743 def _opendirstatefile(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	744 fp, mode = txnutil.trypending(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	745 self._root, self._opener, self._filename
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	746 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	747 if self._pendingmode is not None and self._pendingmode != mode:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	748 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	749 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	750 _(b'working directory state may be changed parallelly')
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	751 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	752 self._pendingmode = mode
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	753 return fp
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	754
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	755 def _readdirstatefile(self, size=-1):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	756 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	757 with self._opendirstatefile() as fp:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	758 return fp.read(size)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	759 except IOError as err:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	760 if err.errno != errno.ENOENT:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	761 raise
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	762 # File doesn't exist, so the current state is empty
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	763 return b''
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	764
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	765 ### code related to maintaining and accessing "extra" property
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	766 # (e.g. "has_dir")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	767
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	768 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	769 def filefoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	770 """Returns a dictionary mapping normalized case paths to their
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	771 non-normalized versions.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	772 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	773 return self._map.filefoldmapasdict()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	774
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	775 def hastrackeddir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	776 return self._map.hastrackeddir(d)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	777
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	778 def hasdir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	779 return self._map.hasdir(d)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	780
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	781 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	782 def dirfoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	783 f = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	784 normcase = util.normcase
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	785 for name in self._map.tracked_dirs():
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	786 f[normcase(name)] = name
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	787 return f
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	788
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	789 ### code related to manipulation of entries and copy-sources
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	790
48126 a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	791 def _refresh_entry(self, f, entry):
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	792 if not entry.any_tracked:
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	793 self._map.drop_item_and_copy_source(f)
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	794 else:
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	795 self._map.addfile(f, entry)
a1a6569b9283 dirstatemap: add a common `_refresh_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48125 diff changeset	796
48128 a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	797 def _insert_entry(self, f, entry):
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	798 self._map.addfile(f, entry)
a8ff00ad290b dirstatemap: add a common `_insert_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48127 diff changeset	799
48132 c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	800 def _drop_entry(self, f):
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	801 self._map.drop_item_and_copy_source(f)
c057d7c97b72 dirstatemap: add a common `_drop_entry` method for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48131 diff changeset	802
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	803 def __setitem__(self, key, value):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	804 assert isinstance(value, DirstateItem)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	805 self._map.set_dirstate_item(key, value)

Mercurial > public > mercurial-scm > hg

annotate mercurial/dirstatemap.py @ 48137:25836b0029f5