This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	pulkit	D11588 dirstate: drop some duplicated code
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
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 30658

mercurial/pure/parsers.py

	"""Build a new DirstateItem object from V1 data			"""Build a new DirstateItem object from V1 data

	Since the dirstate-v1 format is frozen, the signature of this function			Since the dirstate-v1 format is frozen, the signature of this function
	is not expected to change, unlike the __init__ one.			is not expected to change, unlike the __init__ one.
	"""			"""
	if state == b'm':			if state == b'm':
	return cls(wc_tracked=True, p1_tracked=True, p2_info=True)			return cls(wc_tracked=True, p1_tracked=True, p2_info=True)
	elif state == b'a':			elif state == b'a':
	return cls.new_added()			return cls(wc_tracked=True)
	elif state == b'r':			elif state == b'r':
	if size == NONNORMAL:			if size == NONNORMAL:
	p1_tracked = True			p1_tracked = True
	p2_info = True			p2_info = True
	elif size == FROM_P2:			elif size == FROM_P2:
	p1_tracked = False			p1_tracked = False
	p2_info = True			p2_info = True
	else:			else:

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

	flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,			flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,
	mode_size: Some((mode, size)),			mode_size: Some((mode, size)),
	mtime: None,			mtime: None,
	}			}
	} else {			} else {
	Self::new_normal(mode, size, mtime)			Self::new_normal(mode, size, mtime)
	}			}
	}			}
	EntryState::Added => Self::new_added(),			EntryState::Added => Self {
				flags: Flags::WDIR_TRACKED,
				mode_size: None,
				mtime: None,
				},
	EntryState::Removed => Self {			EntryState::Removed => Self {
	flags: if size == SIZE_NON_NORMAL {			flags: if size == SIZE_NON_NORMAL {
	Flags::P1_TRACKED \| Flags::P2_INFO			Flags::P1_TRACKED \| Flags::P2_INFO
	} else if size == SIZE_FROM_OTHER_PARENT {			} else if size == SIZE_FROM_OTHER_PARENT {
	// We don’t know if P1_TRACKED should be set (file history)			// We don’t know if P1_TRACKED should be set (file history)
	Flags::P2_INFO			Flags::P2_INFO
	} else {			} else {
	Flags::P1_TRACKED			Flags::P1_TRACKED

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30605		Oct 3 2021, 6:52 AM	★	★
Diff 2	30658	rHGd342815ff827fd890324c1f56bea044ce37817a3	Oct 1 2021, 3:15 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: replace call to new_addedClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30658

mercurial/pure/parsers.py

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

dirstate-item: replace call to new_added
ClosedPublic

Revision Contents
Changeset List