This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30588		Oct 2 2021, 8:40 PM	★	★
Diff 2	30601		Oct 3 2021, 6:51 AM	★	★
Diff 3	30654	rHG8f88307f8e07a7bb39ba8d332f05e9053e3295f8	Sep 30 2021, 9:29 PM	★	★

Commit	Parents	Author	Summary	Date
123b74192926	9a18f70fc714	Pierre-Yves David		Sep 30 2021, 9:29 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 30601

mercurial/pure/parsers.py

	def v1_state(self):			def v1_state(self):
	"""return a "state" suitable for v1 serialization"""			"""return a "state" suitable for v1 serialization"""
	if not self.any_tracked:			if not self.any_tracked:
	# the object has no state to record, this is -currently-			# the object has no state to record, this is -currently-
	# unsupported			# unsupported
	raise RuntimeError('untracked item')			raise RuntimeError('untracked item')
	elif self.removed:			elif self.removed:
	return b'r'			return b'r'
	elif self.merged:			elif self._p1_tracked and self._p2_info:
	return b'm'			return b'm'
	elif self.added:			elif self.added:
	return b'a'			return b'a'
	else:			else:
	return b'n'			return b'n'

	def v1_mode(self):			def v1_mode(self):
	"""return a "mode" suitable for v1 serialization"""			"""return a "mode" suitable for v1 serialization"""

rust/hg-core/src/dirstate/entry.rs


	fn v1_state(&self) -> EntryState {			fn v1_state(&self) -> EntryState {
	if !self.any_tracked() {			if !self.any_tracked() {
	// TODO: return an Option instead?			// TODO: return an Option instead?
	panic!("Accessing v1_state of an untracked DirstateEntry")			panic!("Accessing v1_state of an untracked DirstateEntry")
	}			}
	if self.removed() {			if self.removed() {
	EntryState::Removed			EntryState::Removed
	} else if self.merged() {			} else if self
				.flags
				.contains(Flags::WDIR_TRACKED \| Flags::P1_TRACKED \| Flags::P2_INFO)
				{
	EntryState::Merged			EntryState::Merged
	} else if self.added() {			} else if self.added() {
	EntryState::Added			EntryState::Added
	} else {			} else {
	EntryState::Normal			EntryState::Normal
	}			}
	}			}

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: replace another usage of `merged`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30601

mercurial/pure/parsers.py

rust/hg-core/src/dirstate/entry.rs

dirstate-item: replace another usage of `merged`
ClosedPublic

Revision Contents
Changeset List