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

annotate mercurial/dirstatemap.py @ 48124:08e04bb0bff3

dirstatemap: small rework of the `set_untracked` method This shuffle the code a bit to have it flowing more "naturally". This will help us to create a common version of this code in the next changesets. Differential Revision: https://phab.mercurial-scm.org/D11569

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Fri, 01 Oct 2021 18:49:21 +0200
parents	771c90807a2b
children	de793f249852

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
48119 aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	82
aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	83 class dirstatemap(_dirstatemapcommon):
35078 a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	84 """Map encapsulating the dirstate's contents.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	85
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	86 The dirstate contains the following state:
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	87
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	88 - `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	89 detect when changes have occurred to the dirstate file.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	90
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	91 - `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	92 parents are updated by calling `setparents`.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	93
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	94 - 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	95 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	96 '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	97 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	98 documentation for details):
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	99
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	100 - `reset_state`,
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	101 - `set_tracked`
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	102 - `set_untracked`
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	103 - `set_clean`
aa442fde0ea5 dirstate: update the documentation of the dirstatemap API Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47990 diff changeset	104 - `set_possibly_dirty`
35078 a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	105
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	106 - `copymap` maps destination filenames to their source filename.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	107
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	108 The dirstate also provides the following views onto the state:
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	109
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	110 - `filefoldmap` is a dict mapping normalized filenames to the denormalized
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	111 form that they appear as in the dirstate.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	112
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	113 - `dirfoldmap` is a dict mapping normalized directory names to the
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	114 denormalized form that they appear as in the dirstate.
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	115 """
a052022639cc dirstate: document dirstatemap interface Mark Thomas <mbthomas@fb.com> parents: 35016 diff changeset	116
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47277 diff changeset	117 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	118 super(dirstatemap, self).__init__(
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	119 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	120 )
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	121 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	122 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	123 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	124 raise error.ProgrammingError(msg)
34337 c36c3fa7d35b dirstate: move opendirstatefile to dirstatemap Durham Goode <durham@fb.com> parents: 34336 diff changeset	125
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	126 ### Core data storage and access
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	127
34934 6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	128 @propertycache
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	129 def _map(self):
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	130 self._map = {}
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	131 self.read()
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	132 return self._map
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	133
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	134 @propertycache
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	135 def copymap(self):
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	136 self.copymap = {}
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	137 self._map
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	138 return self.copymap
6e66033f91cc dirstate: avoid reading the map when possible (issue5713) (issue5717) Durham Goode <durham@fb.com> parents: 34933 diff changeset	139
34933 0217f75b6e59 dirstate: move clear onto dirstatemap class Durham Goode <durham@fb.com> parents: 34678 diff changeset	140 def clear(self):
34935 ffeea2406276 dirstate: remove excess attribute lookups for dirstate.status (issue5714) Durham Goode <durham@fb.com> parents: 34934 diff changeset	141 self._map.clear()
ffeea2406276 dirstate: remove excess attribute lookups for dirstate.status (issue5714) Durham Goode <durham@fb.com> parents: 34934 diff changeset	142 self.copymap.clear()
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	143 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	144 util.clearcachedproperty(self, b"_dirs")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	145 util.clearcachedproperty(self, b"_alldirs")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	146 util.clearcachedproperty(self, b"filefoldmap")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	147 util.clearcachedproperty(self, b"dirfoldmap")
34933 0217f75b6e59 dirstate: move clear onto dirstatemap class Durham Goode <durham@fb.com> parents: 34678 diff changeset	148
35878 6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	149 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	150 return pycompat.iteritems(self._map)
34332 b36881c68569 dirstate: create new dirstatemap class Durham Goode <durham@fb.com> parents: 34188 diff changeset	151
35878 6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	152 # forward for python2,3 compat
6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	153 iteritems = items
6e7fae8f1c6c contrib: fix dirstatenonnormalcheck to work in Python 3 Augie Fackler <augie@google.com> parents: 35835 diff changeset	154
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	155 def debug_iter(self, all):
357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	156 """
48024 cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	157 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	158
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48019 diff changeset	159 `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	160 """
48024 cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	161 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	162 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	163
34332 b36881c68569 dirstate: create new dirstatemap class Durham Goode <durham@fb.com> parents: 34188 diff changeset	164 def keys(self):
b36881c68569 dirstate: create new dirstatemap class Durham Goode <durham@fb.com> parents: 34188 diff changeset	165 return self._map.keys()
34333 4ac04418ce66 dirstate: move nonnormalentries to dirstatemap Durham Goode <durham@fb.com> parents: 34332 diff changeset	166
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	167 ### reading/setting parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	168
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	169 def parents(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	170 if not self._parents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	171 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	172 fp = self._opendirstatefile()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	173 st = fp.read(2 * self._nodelen)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	174 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	175 except IOError as err:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	176 if err.errno != errno.ENOENT:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	177 raise
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	178 # 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	179 st = b''
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	180
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	181 l = len(st)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	182 if l == self._nodelen * 2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	183 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	184 st[: self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	185 st[self._nodelen : 2 * self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	186 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	187 elif l == 0:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	188 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	189 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	190 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	191 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	192 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	193 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	194 _(b'working directory state appears damaged!')
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	195 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	196
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	197 return self._parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	198
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	199 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	200 self._parents = (p1, p2)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	201 self._dirtyparents = True
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	202 copies = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	203 if fold_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	204 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	205 # 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	206 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	207 source = self.copymap.pop(f, None)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	208 if source:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	209 copies[f] = source
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	210 s.drop_merge_data()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	211 return copies
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	212
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	213 ### disk interaction
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	214
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	215 def read(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	216 # 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	217 self.identity = util.filestat.frompath(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	218 self._opener.join(self._filename)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	219 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	220
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	221 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	222 fp = self._opendirstatefile()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	223 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	224 st = fp.read()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	225 finally:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	226 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	227 except IOError as err:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	228 if err.errno != errno.ENOENT:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	229 raise
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	230 return
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	231 if not st:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	232 return
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	233
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	234 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	235 # 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	236 # 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	237 # 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	238 # 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	239 # 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	240 # 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	241 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	242
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	243 # 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	244 # 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	245 # 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	246 # 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	247 # 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	248 # 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	249 # 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	250 # 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	251 # 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	252 # parsing the dirstate.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	253 #
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	254 # (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	255 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	256 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	257 if not self._dirtyparents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	258 self.setparents(*p)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	259
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	260 # 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	261 self.__contains__ = self._map.__contains__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	262 self.__getitem__ = self._map.__getitem__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	263 self.get = self._map.get
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	264
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	265 def write(self, _tr, st, now):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	266 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	267 st.write(d)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	268 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	269 self._dirtyparents = False
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	270
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	271 def _opendirstatefile(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	272 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	273 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	274 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	275 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	276 _(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	277 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	278 self._pendingmode = mode
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	279 return fp
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	280
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	281 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	282 def identity(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	283 self._map
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	284 return self.identity
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	285
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	286 ### 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	287 # (e.g. "has_dir")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	288
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	289 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	290 """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	291 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	292 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	293 ) 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	294 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	295 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	296 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	297
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	298 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	299 """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	300 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	301 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	302 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	303 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	304 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	305 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	306 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	307 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	308 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	309 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	310
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	311 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	312 def filefoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	313 """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	314 non-normalized versions.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	315 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	316 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	317 makefilefoldmap = parsers.make_file_foldmap
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	318 except AttributeError:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	319 pass
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	320 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	321 return makefilefoldmap(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	322 self._map, util.normcasespec, util.normcasefallback
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	323 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	324
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	325 f = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	326 normcase = util.normcase
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	327 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	328 if not s.removed:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	329 f[normcase(name)] = name
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	330 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	331 return f
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 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	334 def dirfoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	335 f = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	336 normcase = util.normcase
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	337 for name in self._dirs:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	338 f[normcase(name)] = name
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	339 return f
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	340
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	341 def hastrackeddir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	342 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	343 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	344 in this directory.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	345 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	346 return d in self._dirs
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	347
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	348 def hasdir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	349 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	350 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	351 in this directory.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	352 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	353 return d in self._alldirs
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	354
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	355 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	356 def _dirs(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	357 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	358
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	359 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	360 def _alldirs(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	361 return pathutil.dirs(self._map)
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 ### 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	364
47720 b0314d8deee1 dirstate: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47692 diff changeset	365 def set_possibly_dirty(self, filename):
b0314d8deee1 dirstate: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47692 diff changeset	366 """record that the current state of the file on disk is unknown"""
b0314d8deee1 dirstate: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47692 diff changeset	367 self[filename].set_possibly_dirty()
b0314d8deee1 dirstate: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47692 diff changeset	368
47974 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	369 def set_clean(self, filename, mode, size, mtime):
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	370 """mark a file as back to a clean state"""
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	371 entry = self[filename]
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	372 mtime = mtime & rangemask
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	373 size = size & rangemask
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	374 entry.set_clean(mode, size, mtime)
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	375 self.copymap.pop(filename, None)
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47972 diff changeset	376
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	377 def reset_state(
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	378 self,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	379 filename,
47998 938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	380 wc_tracked=False,
938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	381 p1_tracked=False,
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	382 p2_tracked=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	383 merged=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	384 clean_p1=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	385 clean_p2=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	386 possibly_dirty=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	387 parentfiledata=None,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	388 ):
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	389 """Set a entry to a given state, diregarding all previous state
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	390
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	391 This is to be used by the part of the dirstate API dedicated to
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	392 adjusting the dirstate after a update/merge.
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	393
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	394 note: calling this might result to no entry existing at all if the
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	395 dirstate map does not see any point at having one for this file
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	396 anymore.
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	397 """
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	398 if merged and (clean_p1 or clean_p2):
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	399 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	400 raise error.ProgrammingError(msg)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	401 # copy information are now outdated
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	402 # (maybe new information should be in directly passed to this function)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	403 self.copymap.pop(filename, None)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	404
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	405 if not (p1_tracked or p2_tracked or wc_tracked):
47998 938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	406 old_entry = self._map.pop(filename, None)
938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	407 self._dirs_decr(filename, old_entry=old_entry)
938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	408 self.copymap.pop(filename, None)
47896 d5b54917eb92 dirstatemap: temporarily return early in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47894 diff changeset	409 return
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	410 elif merged:
48109 2c2788ce0257 dirstate: remove a update_file's special case for `merged` file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48108 diff changeset	411 pass
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	412 elif not (p1_tracked or p2_tracked) and wc_tracked:
47903 6816ae362ddd dirstatemap: use the default code to handle "added" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47902 diff changeset	413 pass # file is added, nothing special to adjust
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	414 elif (p1_tracked or p2_tracked) and not wc_tracked:
47902 4cade5e944c2 dirstatemap: use the default code to handle "removed" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47901 diff changeset	415 pass
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	416 elif clean_p2 and wc_tracked:
48108 d4e715d2be0b dirstate: remove a update_file's special case for tracked file with p2 data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48068 diff changeset	417 pass
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	418 elif not p1_tracked and p2_tracked and wc_tracked:
47900 40cf4b278f8f dirstatemap: use the default code to handle "p2-tracked" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47899 diff changeset	419 clean_p2 = True
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	420 elif possibly_dirty:
47899 625b6ddb828c dirstatemap: use the default code to handle "possibly_dirty" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47898 diff changeset	421 pass
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	422 elif wc_tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	423 # this is a "normal" file
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	424 if parentfiledata is None:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	425 msg = b'failed to pass parentfiledata for a normal file: %s'
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	426 msg %= filename
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	427 raise error.ProgrammingError(msg)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	428 else:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	429 assert False, 'unreachable'
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	430
47897 4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	431 old_entry = self._map.get(filename)
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	432 self._dirs_incr(filename, old_entry)
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	433 entry = DirstateItem(
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	434 wc_tracked=wc_tracked,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	435 p1_tracked=p1_tracked,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	436 p2_tracked=p2_tracked,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	437 merged=merged,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	438 clean_p1=clean_p1,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	439 clean_p2=clean_p2,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	440 possibly_dirty=possibly_dirty,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	441 parentfiledata=parentfiledata,
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	442 )
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	443 self._map[filename] = entry
4f0ebf83e4dc dirstatemap: conclude `reset_state` with logic using the new __init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47896 diff changeset	444
47990 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	445 def set_tracked(self, filename):
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	446 new = False
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	447 entry = self.get(filename)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	448 if entry is None:
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	449 self._dirs_incr(filename)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	450 entry = DirstateItem(
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	451 p1_tracked=False,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	452 p2_tracked=False,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	453 wc_tracked=True,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	454 merged=False,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	455 clean_p1=False,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	456 clean_p2=False,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	457 possibly_dirty=False,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	458 parentfiledata=None,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	459 )
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	460 self._map[filename] = entry
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	461 new = True
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	462 elif not entry.tracked:
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	463 self._dirs_incr(filename, entry)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	464 entry.set_tracked()
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	465 new = True
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	466 else:
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	467 # XXX This is probably overkill for more case, but we need this to
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	468 # fully replace the `normallookup` call with `set_tracked` one.
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	469 # Consider smoothing this in the future.
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	470 self.set_possibly_dirty(filename)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	471 return new
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	472
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	473 def set_untracked(self, f):
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	474 """Mark a file as no longer tracked in the dirstate map"""
47972 5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	475 entry = self.get(f)
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	476 if entry is None:
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	477 return False
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	478 else:
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	479 self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	480 if not entry.merged:
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	481 self.copymap.pop(f, None)
48124 08e04bb0bff3 dirstatemap: small rework of the `set_untracked` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	482 entry.set_untracked()
08e04bb0bff3 dirstatemap: small rework of the `set_untracked` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48123 diff changeset	483 if not entry.any_tracked:
47972 5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	484 self._map.pop(f, None)
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	485 return True
35079 853b7c41d19c dirstate: add explicit methods for modifying dirstate Mark Thomas <mbthomas@fb.com> parents: 35078 diff changeset	486
42755 749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	487
749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	488 if rustmod is not None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42927 diff changeset	489
48119 aec5b0981c26 dirstatemap: introduce a common base for the dirstatemap class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48109 diff changeset	490 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	491 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	492 super(dirstatemap, self).__init__(
fe6617715464 dirstatemap: use a common __init__ for dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48119 diff changeset	493 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	494 )
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47672 diff changeset	495 self._docket = None
42755 749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	496
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	497 ### Core data storage and access
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	498
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	499 @property
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	500 def docket(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	501 if not self._docket:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	502 if not self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	503 raise error.ProgrammingError(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	504 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	505 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	506 self._docket = docketmod.DirstateDocket.parse(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	507 self._readdirstatefile(), self._nodeconstants
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	508 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	509 return self._docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	510
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	511 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	512 def _map(self):
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 Fills the Dirstatemap when called.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	515 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	516 # 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	517 self.identity = util.filestat.frompath(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	518 self._opener.join(self._filename)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	519 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	520
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	521 if self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	522 if self.docket.uuid:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	523 # TODO: use mmap when possible
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	524 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	525 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	526 data = b''
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	527 self._map = rustmod.DirstateMap.new_v2(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	528 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	529 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	530 parents = self.docket.parents
48051 98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	531 else:
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	532 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	533 self._readdirstatefile()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	534 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	535
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	536 if parents and not self._dirtyparents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	537 self.setparents(*parents)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	538
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	539 self.__contains__ = self._map.__contains__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	540 self.__getitem__ = self._map.__getitem__
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	541 self.get = self._map.get
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	542 return self._map
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	543
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	544 @property
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	545 def copymap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	546 return self._map.copymap()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	547
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	548 def debug_iter(self, all):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	549 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	550 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	551
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	552 `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	553 don't have an associated `DirstateItem`.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	554
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	555 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	556 return self._map.debug_iter(all)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	557
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	558 def clear(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	559 self._map.clear()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	560 self.setparents(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	561 self._nodeconstants.nullid, self._nodeconstants.nullid
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	562 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	563 util.clearcachedproperty(self, b"_dirs")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	564 util.clearcachedproperty(self, b"_alldirs")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	565 util.clearcachedproperty(self, b"dirfoldmap")
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 def items(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	568 return self._map.items()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	569
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	570 # forward for python2,3 compat
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	571 iteritems = items
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 def keys(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	574 return iter(self._map)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	575
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	576 ### reading/setting parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	577
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	578 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	579 self._parents = (p1, p2)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	580 self._dirtyparents = True
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	581 copies = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	582 if fold_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	583 # 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	584 # exception due to mutation during iteration.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	585 # 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	586 # 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	587 # iterating it, without mutating the collection itself.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	588 candidatefiles = [
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	589 (f, s)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	590 for f, s in self._map.items()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	591 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	592 ]
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	593 for f, s in candidatefiles:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	594 # 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	595 if s.merged:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	596 source = self.copymap.get(f)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	597 if source:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	598 copies[f] = source
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	599 self.reset_state(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	600 f,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	601 wc_tracked=True,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	602 p1_tracked=True,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	603 possibly_dirty=True,
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 # Also fix up otherparent markers
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	606 elif s.from_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	607 source = self.copymap.get(f)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	608 if source:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	609 copies[f] = source
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	610 self.reset_state(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	611 f,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	612 p1_tracked=False,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	613 wc_tracked=True,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	614 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	615 return copies
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	616
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	617 def parents(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	618 if not self._parents:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	619 if self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	620 self._parents = self.docket.parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	621 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	622 read_len = self._nodelen * 2
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	623 st = self._readdirstatefile(read_len)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	624 l = len(st)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	625 if l == read_len:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	626 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	627 st[: self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	628 st[self._nodelen : 2 * self._nodelen],
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	629 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	630 elif l == 0:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	631 self._parents = (
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	632 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	633 self._nodeconstants.nullid,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	634 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	635 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	636 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	637 _(b'working directory state appears damaged!')
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	638 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	639
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	640 return self._parents
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	641
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	642 ### disk interaction
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	643
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	644 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	645 def identity(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	646 self._map
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	647 return self.identity
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	648
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	649 def write(self, tr, st, now):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	650 if not self._use_dirstate_v2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	651 p1, p2 = self.parents()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	652 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	653 st.write(packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	654 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	655 self._dirtyparents = False
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	656 return
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	657
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	658 # 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	659 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	660 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	661 if append:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	662 docket = self.docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	663 data_filename = docket.data_filename()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	664 if tr:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	665 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	666 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	667 fp.seek(docket.data_size)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	668 assert fp.tell() == docket.data_size
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	669 written = fp.write(packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	670 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	671 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	672 docket.data_size += len(packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	673 docket.parents = self.parents()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	674 docket.tree_metadata = meta
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	675 st.write(docket.serialize())
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	676 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	677 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	678 old_docket = self.docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	679 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	680 self.parents(), len(packed), meta
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	681 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	682 data_filename = new_docket.data_filename()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	683 if tr:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	684 tr.add(data_filename, 0)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	685 self._opener.write(data_filename, packed)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	686 # 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	687 # 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	688 # 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	689 st.write(new_docket.serialize())
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	690 st.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	691 # 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	692 # the new data file was written.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	693 if old_docket.uuid:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	694 data_filename = old_docket.data_filename()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	695 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	696 if tr:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	697 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	698 tr.addpostclose(category, unlink)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	699 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	700 unlink()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	701 self._docket = new_docket
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	702 # Reload from the newly-written file
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	703 util.clearcachedproperty(self, b"_map")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	704 self._dirtyparents = False
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	705
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	706 def _opendirstatefile(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	707 fp, mode = txnutil.trypending(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	708 self._root, self._opener, self._filename
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	709 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	710 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	711 fp.close()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	712 raise error.Abort(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	713 _(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	714 )
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	715 self._pendingmode = mode
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	716 return fp
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	717
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	718 def _readdirstatefile(self, size=-1):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	719 try:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	720 with self._opendirstatefile() as fp:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	721 return fp.read(size)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	722 except IOError as err:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	723 if err.errno != errno.ENOENT:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	724 raise
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	725 # 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	726 return b''
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	727
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	728 ### 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	729 # (e.g. "has_dir")
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	730
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	731 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	732 def filefoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	733 """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	734 non-normalized versions.
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	735 """
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	736 return self._map.filefoldmapasdict()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	737
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	738 def hastrackeddir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	739 return self._map.hastrackeddir(d)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	740
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	741 def hasdir(self, d):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	742 return self._map.hasdir(d)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	743
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	744 @propertycache
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	745 def dirfoldmap(self):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	746 f = {}
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	747 normcase = util.normcase
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	748 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	749 f[normcase(name)] = name
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	750 return f
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 ### 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	753
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	754 def set_possibly_dirty(self, filename):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	755 """record that the current state of the file on disk is unknown"""
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	756 entry = self[filename]
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	757 entry.set_possibly_dirty()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	758 self._map.set_dirstate_item(filename, entry)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	759
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	760 def set_clean(self, filename, mode, size, mtime):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	761 """mark a file as back to a clean state"""
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	762 entry = self[filename]
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	763 mtime = mtime & rangemask
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	764 size = size & rangemask
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	765 entry.set_clean(mode, size, mtime)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	766 self._map.set_dirstate_item(filename, entry)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	767 self._map.copymap().pop(filename, None)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	768
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	769 def __setitem__(self, key, value):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	770 assert isinstance(value, DirstateItem)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	771 self._map.set_dirstate_item(key, value)
42755 749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	772
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	773 def reset_state(
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	774 self,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	775 filename,
47998 938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	776 wc_tracked=False,
938a7769050c dirstate: support file tracked nowhere in `reset_state` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47997 diff changeset	777 p1_tracked=False,
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	778 p2_tracked=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	779 merged=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	780 clean_p1=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	781 clean_p2=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	782 possibly_dirty=False,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	783 parentfiledata=None,
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	784 ):
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	785 """Set a entry to a given state, disregarding all previous state
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	786
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	787 This is to be used by the part of the dirstate API dedicated to
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	788 adjusting the dirstate after a update/merge.
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	789
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	790 note: calling this might result to no entry existing at all if the
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	791 dirstate map does not see any point at having one for this file
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	792 anymore.
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	793 """
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	794 if merged and (clean_p1 or clean_p2):
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	795 msg = (
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	796 b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	797 )
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	798 raise error.ProgrammingError(msg)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	799 # copy information are now outdated
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	800 # (maybe new information should be in directly passed to this function)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	801 self.copymap.pop(filename, None)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	802
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	803 if not (p1_tracked or p2_tracked or wc_tracked):
48121 5fc2dfb073d6 dirstatemap: rename `_rustmap` to `_map` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48120 diff changeset	804 self._map.drop_item_and_copy_source(filename)
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	805 elif merged:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	806 # XXX might be merged and removed ?
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	807 entry = self.get(filename)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	808 if entry is not None and entry.tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	809 # XXX mostly replicate dirstate.other parent. We should get
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	810 # the higher layer to pass us more reliable data where `merged`
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	811 # actually mean merged. Dropping the else clause will show
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	812 # failure in `test-graft.t`
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	813 self.addfile(filename, merged=True)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	814 else:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	815 self.addfile(filename, from_p2=True)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	816 elif not (p1_tracked or p2_tracked) and wc_tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	817 self.addfile(
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	818 filename, added=True, possibly_dirty=possibly_dirty
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	819 )
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	820 elif (p1_tracked or p2_tracked) and not wc_tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	821 # XXX might be merged and removed ?
47894 226c7dbeea11 rust-dirstatemap: temporarily use `from_v1_data` in `addfile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47893 diff changeset	822 self[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	823 elif clean_p2 and wc_tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	824 if p1_tracked or self.get(filename) is not None:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	825 # XXX the `self.get` call is catching some case in
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	826 # `test-merge-remove.t` where the file is tracked in p1, the
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	827 # p1_tracked argument is False.
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	828 #
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	829 # In addition, this seems to be a case where the file is marked
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	830 # as merged without actually being the result of a merge
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	831 # action. So thing are not ideal here.
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	832 self.addfile(filename, merged=True)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	833 else:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	834 self.addfile(filename, from_p2=True)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	835 elif not p1_tracked and p2_tracked and wc_tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	836 self.addfile(
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	837 filename, from_p2=True, possibly_dirty=possibly_dirty
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	838 )
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	839 elif possibly_dirty:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	840 self.addfile(filename, possibly_dirty=possibly_dirty)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	841 elif wc_tracked:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	842 # this is a "normal" file
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	843 if parentfiledata is None:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	844 msg = b'failed to pass parentfiledata for a normal file: %s'
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	845 msg %= filename
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	846 raise error.ProgrammingError(msg)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	847 mode, size, mtime = parentfiledata
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	848 self.addfile(filename, mode=mode, size=size, mtime=mtime)
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	849 else:
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	850 assert False, 'unreachable'
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47689 diff changeset	851
47990 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	852 def set_tracked(self, filename):
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	853 new = False
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	854 entry = self.get(filename)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	855 if entry is None:
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	856 self.addfile(filename, added=True)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	857 new = True
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	858 elif not entry.tracked:
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	859 entry.set_tracked()
48121 5fc2dfb073d6 dirstatemap: rename `_rustmap` to `_map` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48120 diff changeset	860 self._map.set_dirstate_item(filename, entry)
47990 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	861 new = True
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	862 else:
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	863 # XXX This is probably overkill for more case, but we need this to
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	864 # fully replace the `normallookup` call with `set_tracked` one.
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	865 # Consider smoothing this in the future.
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	866 self.set_possibly_dirty(filename)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	867 return new
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47983 diff changeset	868
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	869 def set_untracked(self, f):
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	870 """Mark a file as no longer tracked in the dirstate map"""
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	871 # in merge is only trigger more logic, so it "fine" to pass it.
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	872 #
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	873 # the inner rust dirstate map code need to be adjusted once the API
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	874 # for dirstate/dirstatemap/DirstateItem is a bit more settled
47972 5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	875 entry = self.get(f)
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	876 if entry is None:
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	877 return False
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	878 else:
5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	879 if entry.added:
48121 5fc2dfb073d6 dirstatemap: rename `_rustmap` to `_map` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48120 diff changeset	880 self._map.drop_item_and_copy_source(f)
47972 5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	881 else:
48121 5fc2dfb073d6 dirstatemap: rename `_rustmap` to `_map` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48120 diff changeset	882 self._map.removefile(f, in_merge=True)
47972 5a6c1ef4bcac dirstate: make dirstatemap.set_untracked deal with added file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47970 diff changeset	883 return True
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47770 diff changeset	884
48123 771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	885 ### Legacy method we need to get rid of
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	886
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	887 def addfile(
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	888 self,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	889 f,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	890 mode=0,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	891 size=None,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	892 mtime=None,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	893 added=False,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	894 merged=False,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	895 from_p2=False,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	896 possibly_dirty=False,
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	897 ):
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	898 if added:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	899 assert not possibly_dirty
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	900 assert not from_p2
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	901 item = DirstateItem.new_added()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	902 elif merged:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	903 assert not possibly_dirty
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	904 assert not from_p2
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	905 item = DirstateItem.new_merged()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	906 elif from_p2:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	907 assert not possibly_dirty
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	908 item = DirstateItem.new_from_p2()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	909 elif possibly_dirty:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	910 item = DirstateItem.new_possibly_dirty()
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	911 else:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	912 assert size is not None
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	913 assert mtime is not None
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	914 size = size & rangemask
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	915 mtime = mtime & rangemask
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	916 item = DirstateItem.new_normal(mode, size, mtime)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	917 self._map.addfile(f, item)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	918 if added:
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	919 self.copymap.pop(f, None)
771c90807a2b dirstatemap: arrange methods by category Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48122 diff changeset	920
42755 749ef8c31187 rust-dirstate: call rust dirstatemap from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 42747 diff changeset	921 def removefile(self, args, *kwargs):
48121 5fc2dfb073d6 dirstatemap: rename `_rustmap` to `_map` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48120 diff changeset	922 return self._map.removefile(args, *kwargs)

Mercurial > public > mercurial-scm > hg

annotate mercurial/dirstatemap.py @ 48124:08e04bb0bff3