This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	SimonSapin	D11546 dirstate-v2: Add internal documentation
Closed	SimonSapin	D11545 dirstate-v2: Move data file info in the docket closer together
Closed	marmoute	D11608 dirstate-item: drop the legacy new_normal constructor
Closed	marmoute	D11607 dirstate-item: replace call to new_possibly_dirty
Closed	marmoute	D11606 dirstate-item: replace a call to new_possibly_dirty
Closed	marmoute	D11605 dirstate-item: drop the legacy new_possibly_dirty constructor
Closed	marmoute	D11604 dirstate-item: replace call to new_possibly_dirty
Closed	marmoute	D11603 dirstate-item: drop the legacy new_from_p2 constructor
Closed	marmoute	D11602 dirstate-item: replace call to new_from_p2
Closed	marmoute	D11601 dirstate-item: drop the legacy new_added constructor
Closed	marmoute	D11600 dirstate-item: replace call to new_added
Closed	marmoute	D11599 dirstate-item: drop the legacy new_merged constructor
Closed	marmoute	D11598 dirstate-item: replace call to new_merged
Closed	marmoute	D11597 dirstate-item: drop the `merged` property
Closed	marmoute	D11596 dirstate-item: replace another usage of `merged`
Closed	marmoute	D11595 dirstate-item: replace a `merged` usage with `from_p2`
Closed	marmoute	D11594 dirstate-item: drop the `from_p2` property
Closed	marmoute	D11593 dirstate-item: directly use `p2_info` in `v1_size`
Closed	marmoute	D11592 dirstate-item: use the `p2_info` property to replace more verbose call
Closed	marmoute	D11591 status: process `from_p2` file the same as `merged` one
Closed	marmoute	D11590 dirstate: drop an incorrect comment
Closed	marmoute	D11589 dirstate: drop some duplicated code
Abandoned	pulkit	D11588 dirstate: drop some duplicated code
Closed	marmoute	D11587 dirstate: align the dirstate's API to the lower level ones
Closed	marmoute	D11586 dirstate-item: introduce a `p1_tracked` property
Closed	marmoute	D11585 dirstate-item: introduce a `p2_info` property that combine two others
Closed	marmoute	D11584 dirstate: narrow gathering of parent data
Closed	marmoute	D11583 dirstate: align the dirstatemap's API to the data change
Closed	marmoute	D11558 dirstate-v2: Store a bitfield on disk instead of v1-like state
Closed	marmoute	D11557 dirstate-item: change the internal storage and constructor value
Closed	marmoute	D11582 dirstatemap: drop legacy method on the dirstatemap wrapper
Closed	marmoute	D11581 dirstatemap: align the Rust wrapper implementation of `setparent`
Closed	marmoute	D11580 dirstatemap: fix copymap.pop in Rust to return the value it pops
Closed	marmoute	D11579 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem
Closed	marmoute	D11578 dirstatemap: use a common implement for reset_state
Closed	marmoute	D11577 dirstatemap: add a common `_drop_entry` method for dirstatemap
Closed	marmoute	D11576 dirstatemap: use common code for set_clean
Closed	marmoute	D11575 dirstatemap: use common code for set_possibly_dirty
Closed	marmoute	D11574 dirstatemap: use a common implement for set_tracked
Closed	marmoute	D11573 dirstatemap: add a common `_insert_entry` method for dirstatemap
Closed	marmoute	D11572 dirstatemap: use a common implementation for `dirstatemap.set_untracked`
Closed	marmoute	D11571 dirstatemap: add a common `_refresh_entry` method for dirstatemap
Closed	marmoute	D11570 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class
Closed	marmoute	D11569 dirstatemap: small rework of the `set_untracked` method
Closed	marmoute	D11568 dirstatemap: arrange methods by category
Closed	marmoute	D11567 dirstatemap: move a multiple simple functions in the common class
Closed	marmoute	D11566 dirstatemap: rename `_rustmap` to `_map`
Closed	marmoute	D11565 dirstatemap: use a common __init__ for dirstatemap
Closed	marmoute	D11564 dirstatemap: introduce a common base for the dirstatemap class

Diff 30624

mercurial/dirstatemap.py



	class _dirstatemapcommon(object):			class _dirstatemapcommon(object):
	"""			"""
	Methods that are identical for both implementations of the dirstatemap			Methods that are identical for both implementations of the dirstatemap
	class, with and without Rust extensions enabled.			class, with and without Rust extensions enabled.
	"""			"""

				# please pytype
				AlphareUnsubmitted Not Done Not sure if pleading or asserting ;) Alphare: Not sure if pleading or asserting ;)

				_map = None
				copymap = None

	def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):			def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
	self._use_dirstate_v2 = use_dirstate_v2			self._use_dirstate_v2 = use_dirstate_v2
	self._nodeconstants = nodeconstants			self._nodeconstants = nodeconstants
	self._ui = ui			self._ui = ui
	self._opener = opener			self._opener = opener
	self._root = root			self._root = root
	self._filename = b'dirstate'			self._filename = b'dirstate'
	self._nodelen = 20 # Also update Rust code when changing this!			self._nodelen = 20 # Also update Rust code when changing this!
	self._parents = None			self._parents = None
	self._dirtyparents = False			self._dirtyparents = False

	# for consistent view between _pl() and _read() invocations			# for consistent view between _pl() and _read() invocations
	self._pendingmode = None			self._pendingmode = None

				def preload(self):
				"""Loads the underlying data, if it's not already loaded"""
				self._map

				def get(self, key, default=None):
				return self._map.get(key, default)

				def __len__(self):
				return len(self._map)

				def __iter__(self):
				return iter(self._map)

				def __contains__(self, key):
				return key in self._map

				def __getitem__(self, item):
				return self._map[item]


	class dirstatemap(_dirstatemapcommon):			class dirstatemap(_dirstatemapcommon):
	"""Map encapsulating the dirstate's contents.			"""Map encapsulating the dirstate's contents.

	The dirstate contains the following state:			The dirstate contains the following state:

	- `identity` is the identity of the dirstate file, which can be used to			- `identity` is the identity of the dirstate file, which can be used to
	detect when changes have occurred to the dirstate file.			detect when changes have occurred to the dirstate file.
	"""			"""
	Return an iterator of (filename, state, mode, size, mtime) tuples			Return an iterator of (filename, state, mode, size, mtime) tuples

	`all` is unused when Rust is not enabled			`all` is unused when Rust is not enabled
	"""			"""
	for (filename, item) in self.items():			for (filename, item) in self.items():
	yield (filename, item.state, item.mode, item.size, item.mtime)			yield (filename, item.state, item.mode, item.size, item.mtime)

	def __len__(self):
	return len(self._map)

	def __iter__(self):
	return iter(self._map)

	def get(self, key, default=None):
	return self._map.get(key, default)

	def __contains__(self, key):
	return key in self._map

	def __getitem__(self, key):
	return self._map[key]

	def keys(self):			def keys(self):
	return self._map.keys()			return self._map.keys()

	def preload(self):
	"""Loads the underlying data, if it's not already loaded"""
	self._map

	def _dirs_incr(self, filename, old_entry=None):			def _dirs_incr(self, filename, old_entry=None):
	"""incremente the dirstate counter if applicable"""			"""incremente the dirstate counter if applicable"""
	if (			if (
	old_entry is None or old_entry.removed			old_entry is None or old_entry.removed
	) and "_dirs" in self.__dict__:			) and "_dirs" in self.__dict__:
	self._dirs.addpath(filename)			self._dirs.addpath(filename)
	if old_entry is None and "_alldirs" in self.__dict__:			if old_entry is None and "_alldirs" in self.__dict__:
	self._alldirs.addpath(filename)			self._alldirs.addpath(filename)
	self._map.drop_item_and_copy_source(f)			self._map.drop_item_and_copy_source(f)
	else:			else:
	self._map.removefile(f, in_merge=True)			self._map.removefile(f, in_merge=True)
	return True			return True

	def removefile(self, args, *kwargs):			def removefile(self, args, *kwargs):
	return self._map.removefile(args, *kwargs)			return self._map.removefile(args, *kwargs)

	def get(self, args, *kwargs):
	return self._map.get(args, *kwargs)

	@property			@property
	def copymap(self):			def copymap(self):
	return self._map.copymap()			return self._map.copymap()

	def debug_iter(self, all):			def debug_iter(self, all):
	"""			"""
	Return an iterator of (filename, state, mode, size, mtime) tuples			Return an iterator of (filename, state, mode, size, mtime) tuples

	`all`: also include with `state == b' '` dirstate tree nodes that			`all`: also include with `state == b' '` dirstate tree nodes that
	don't have an associated `DirstateItem`.			don't have an associated `DirstateItem`.

	"""			"""
	return self._map.debug_iter(all)			return self._map.debug_iter(all)

	def preload(self):
	self._map

	def clear(self):			def clear(self):
	self._map.clear()			self._map.clear()
	self.setparents(			self.setparents(
	self._nodeconstants.nullid, self._nodeconstants.nullid			self._nodeconstants.nullid, self._nodeconstants.nullid
	)			)
	util.clearcachedproperty(self, b"_dirs")			util.clearcachedproperty(self, b"_dirs")
	util.clearcachedproperty(self, b"_alldirs")			util.clearcachedproperty(self, b"_alldirs")
	util.clearcachedproperty(self, b"dirfoldmap")			util.clearcachedproperty(self, b"dirfoldmap")

	def items(self):			def items(self):
	return self._map.items()			return self._map.items()

	def keys(self):			def keys(self):
	return iter(self._map)			return iter(self._map)

	def __contains__(self, key):
	return key in self._map

	def __getitem__(self, item):
	return self._map[item]

	def __len__(self):
	return len(self._map)

	def __iter__(self):
	return iter(self._map)

	# forward for python2,3 compat			# forward for python2,3 compat
	iteritems = items			iteritems = items

	def _opendirstatefile(self):			def _opendirstatefile(self):
	fp, mode = txnutil.trypending(			fp, mode = txnutil.trypending(
	self._root, self._opener, self._filename			self._root, self._opener, self._filename
	)			)
	if self._pendingmode is not None and self._pendingmode != mode:			if self._pendingmode is not None and self._pendingmode != mode:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30555		Oct 2 2021, 11:04 AM	★	★
Diff 2	30624	rHGbbd924a36a6ef6c4697f8ed96e4c1c330d0ed409	Oct 2 2021, 6:01 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstatemap: move a multiple simple functions in the common classClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30624

mercurial/dirstatemap.py

dirstatemap: move a multiple simple functions in the common class
ClosedPublic

Revision Contents
Changeset List