This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30584		Oct 2 2021, 8:40 PM	★	★
Diff 2	30597		Oct 3 2021, 6:51 AM	★	★
Diff 3	30650	rHGe2753a7acfa78f651ac1a372ea5605610221eefc	Sep 30 2021, 10:04 PM	★	★

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 30650

mercurial/dirstate.py

	# tuple members one by one.			# tuple members one by one.
	t = dget(fn)			t = dget(fn)
	mode = t.mode			mode = t.mode
	size = t.size			size = t.size
	time = t.mtime			time = t.mtime

	if not st and t.tracked:			if not st and t.tracked:
	dadd(fn)			dadd(fn)
	elif t.merged or t.from_p2:			elif t.p2_info:
	madd(fn)			madd(fn)
	elif t.added:			elif t.added:
	aadd(fn)			aadd(fn)
	elif t.removed:			elif t.removed:
	radd(fn)			radd(fn)
	elif t.tracked:			elif t.tracked:
	if (			if (
	size >= 0			size >= 0

mercurial/dirstatemap.py


	def setparents(self, p1, p2, fold_p2=False):			def setparents(self, p1, p2, fold_p2=False):
	self._parents = (p1, p2)			self._parents = (p1, p2)
	self._dirtyparents = True			self._dirtyparents = True
	copies = {}			copies = {}
	if fold_p2:			if fold_p2:
	for f, s in pycompat.iteritems(self._map):			for f, s in pycompat.iteritems(self._map):
	# Discard "merged" markers when moving away from a merge state			# Discard "merged" markers when moving away from a merge state
	if s.merged or s.from_p2:			if s.p2_info:
	source = self.copymap.pop(f, None)			source = self.copymap.pop(f, None)
	if source:			if source:
	copies[f] = source			copies[f] = source
	s.drop_merge_data()			s.drop_merge_data()
	return copies			return copies

	### disk interaction			### disk interaction

	copies = {}			copies = {}
	if fold_p2:			if fold_p2:
	# Collect into an intermediate list to avoid a `RuntimeError`			# Collect into an intermediate list to avoid a `RuntimeError`
	# exception due to mutation during iteration.			# exception due to mutation during iteration.
	# TODO: move this the whole loop to Rust where `iter_mut`			# TODO: move this the whole loop to Rust where `iter_mut`
	# enables in-place mutation of elements of a collection while			# enables in-place mutation of elements of a collection while
	# iterating it, without mutating the collection itself.			# iterating it, without mutating the collection itself.
	files_with_p2_info = [			files_with_p2_info = [
	f for f, s in self._map.items() if s.merged or s.from_p2			f for f, s in self._map.items() if s.p2_info
	]			]
	rust_map = self._map			rust_map = self._map
	for f in files_with_p2_info:			for f in files_with_p2_info:
	e = rust_map.get(f)			e = rust_map.get(f)
	source = self.copymap.pop(f, None)			source = self.copymap.pop(f, None)
	if source:			if source:
	copies[f] = source			copies[f] = source
	e.drop_merge_data()			e.drop_merge_data()

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: use the `p2_info` property to replace more verbose callClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30650

mercurial/dirstate.py

mercurial/dirstatemap.py

dirstate-item: use the `p2_info` property to replace more verbose call
ClosedPublic

Revision Contents
Changeset List