rust-dirstatemap: add `set_untracked` method
ClosedPublic

rust/hg-core/src/dirstate_tree/dirstate_map.rs
783	If we know that an entry exist. why do we need a get_or_insert here?
793–795	Code lower in this patch seems to drop the node in the "added" case, how does this deal with the fact we keep touching it here ?

Alphare added inline comments.Apr 8 2022, 9:08 AM

rust/hg-core/src/dirstate_tree/dirstate_map.rs
783	See D12458. We've agreed to fix this in additional patches to reduce churn.
793–795	This is not called at all in the "added" case.

Alphare added a commit: rHG0e20d8410c2d: rust-dirstatemap: add `set_untracked` method.Apr 8 2022, 11:56 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG0e20d8410c2d: rust-dirstatemap: add `set_untracked` method (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare added a commit: rHG95e304addfc1: rust-dirstatemap: add `set_untracked` method.Apr 8 2022, 12:50 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

			Path	Packages
M			rust/hg-core/src/dirstate_tree/dirstate_map.rs (56 lines)
M			rust/hg-cpython/src/dirstate/dirstate_map.rs (13 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32835		Apr 6 2022, 10:11 AM	★	★
Diff 2	32896	rHG0e20d8410c2dc8a5fdecc76e360e1678230b5b07	Mar 28 2022, 12:13 PM	★	★
Diff 3	32932		Apr 8 2022, 12:29 PM	★	★
Diff 4	33034		Apr 12 2022, 10:58 AM	★	★
Diff 5	33116		Apr 12 2022, 12:06 PM	★	★

Status	Author	Revision
Closed	Alphare	D12478 rust-dirstatemap: add unit tests
Closed	Alphare	D12477 rust: add `Debug` trait to a bunch of structs
Closed	Alphare	D12476 rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert`
Closed	Alphare	D12475 rust-dirstatemap: use `DirstateEntry::tracked` directly
Closed	Alphare	D12474 rust-cpython: remove unused API to `drop_entry_and_copy_source`
Closed	Alphare	D12473 rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods
Closed	Alphare	D12472 rust-dirstatemap: implement part of the `setparents` logic
Closed	Alphare	D12471 dirstate-item: add missing bit of docstring
Closed	Alphare	D12470 dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common
Closed	Alphare	D12469 dirstatemap: move `_refresh_entry` out of the common methods
Closed	Alphare	D12468 dirstatemap: move `_drop_entry` out of the common methods
Closed	Alphare	D12467 rust-dirstatemap: remove `_drop_entry`
Closed	Alphare	D12466 rust-dirstatemap: remove `__settitem__`
Closed	Alphare	D12465 rust-dirstatemap: remove unused `_refresh_entry` implementation
Closed	Alphare	D12464 rust-distatemap: remove `addfile` API
Closed	Alphare	D12463 rust-dirstatemap: remove `removefile` API
Closed	Alphare	D12462 rhg: use the new `set_clean` API
Closed	Alphare	D12461 dirstatemap: move `set_untracked` out of the common methods
Closed	Alphare	D12460 rust-dirstatemap: add `set_untracked` method
Closed	Alphare	D12459 dirstatemap: move `set_possibly_dirty` out of the common methods
Closed	Alphare	D12458 rust-dirstatemap: add `set_possibly_dirty` method
Closed	Alphare	D12457 dirstatemap: move `set_clean` out of common methods
Closed	Alphare	D12456 rust-dirstatemap: add `set_clean` method
Closed	Alphare	D12455 dirstatemap: remove `_insert_entry`
Closed	Alphare	D12454 dirstatemap: move `reset_state` out of common methods
Closed	Alphare	D12453 rust-dirstatemap: add Rust implementation of `reset_state`
Closed	Alphare	D12452 rust-dirstate: introduce intermediate struct for dirstate-v2 data
Closed	Alphare	D12451 dirstatemap: remove unused parameter from `reset_state`
Closed	Alphare	D12450 dirstatemap: move `set_tracked` out of common methods and plug in Rust
Closed	Alphare	D12449 rust-dirstatemap: add `set_tracked` method
Closed	Alphare	D12448 rust-dirstate: don't return a state for untracked entries
Closed	Alphare	D12447 dirstate: remove v1_* methods from Python/C/Rust shared API
Closed	Alphare	D12446 rust-dirstate-entry: fix typo in panic message
Closed	Alphare	D12445 test-issue660: add dirstate-v2 variant
Closed	Alphare	D12444 test-issue660: test inside a repository, not the test dir
Closed	Alphare	D12443 dirstate: fix some typos in docstrings

Diff 32896

rust/hg-core/src/dirstate_tree/dirstate_map.rs

	)?;			)?;
	if !had_entry {			if !had_entry {
	self.nodes_with_entry_count += 1			self.nodes_with_entry_count += 1
	}			}
	node.data = NodeData::Entry(new_entry);			node.data = NodeData::Entry(new_entry);
	Ok(())			Ok(())
	}			}

				/// It is the responsibility of the caller to know that there was an entry
				/// there before. Does not handle the removal of copy source
				fn set_untracked(
				&mut self,
				filename: &HgPath,
				old_entry: DirstateEntry,
				) -> Result<(), DirstateV2ParseError> {
				let node = Self::get_or_insert_node(
				marmouteUnsubmitted Not Done If we know that an entry exist. why do we need a get_or_insert here? marmoute: If we know that an entry exist. why do we need a get_or_insert here?
				AlphareAuthorUnsubmitted Done See D12458. We've agreed to fix this in additional patches to reduce churn. Alphare: See D12458. We've agreed to fix this in additional patches to reduce churn.
				self.on_disk,
				&mut self.unreachable_bytes,
				&mut self.root,
				filename,
				WithBasename::to_cow_owned,
				\|ancestor\| {
				ancestor.tracked_descendants_count -= 1;
				},
				)?;
				let mut new_entry = old_entry.clone();
				new_entry.set_untracked();
				node.data = NodeData::Entry(new_entry);
				marmouteUnsubmitted Not Done Code lower in this patch seems to drop the node in the "added" case, how does this deal with the fact we keep touching it here ? marmoute: Code lower in this patch seems to drop the node in the "added" case, how does this deal with…
				AlphareAuthorUnsubmitted Done This is not called at all in the "added" case. Alphare: This is not called at all in the "added" case.
				Ok(())
				}

	fn set_clean(			fn set_clean(
	&mut self,			&mut self,
	filename: &HgPath,			filename: &HgPath,
	old_entry: DirstateEntry,			old_entry: DirstateEntry,
	mode: u32,			mode: u32,
	size: u32,			size: u32,
	mtime: TruncatedTimestamp,			mtime: TruncatedTimestamp,
	) -> Result<(), DirstateError> {			) -> Result<(), DirstateError> {
	pub fn set_tracked(			pub fn set_tracked(
	&mut self,			&mut self,
	filename: &HgPath,			filename: &HgPath,
	) -> Result<bool, DirstateV2ParseError> {			) -> Result<bool, DirstateV2ParseError> {
	let old_entry_opt = self.get(filename)?;			let old_entry_opt = self.get(filename)?;
	self.with_dmap_mut(\|map\| map.set_tracked(filename, old_entry_opt))			self.with_dmap_mut(\|map\| map.set_tracked(filename, old_entry_opt))
	}			}

				pub fn set_untracked(
				&mut self,
				filename: &HgPath,
				) -> Result<bool, DirstateError> {
				let old_entry_opt = self.get(filename)?;
				match old_entry_opt {
				None => Ok(false),
				Some(old_entry) => {
				if !old_entry.tracked() {
				// `DirstateMap::set_untracked` is not a noop if
				// already not tracked as it will decrement the
				// tracked counters while going down.
				return Ok(true);
				}
				if old_entry.added() {
				// Untracking an "added" entry will just result in a
				// worthless entry (and other parts of the code will
				// complain about it), just drop it entirely.
				self.drop_entry_and_copy_source(filename)?;
				return Ok(true);
				}
				if !old_entry.p2_info() {
				self.copy_map_remove(filename)?;
				}

				self.with_dmap_mut(\|map\| {
				map.set_untracked(filename, old_entry)?;
				Ok(true)
				})
				}
				}
				}

	pub fn set_clean(			pub fn set_clean(
	&mut self,			&mut self,
	filename: &HgPath,			filename: &HgPath,
	mode: u32,			mode: u32,
	size: u32,			size: u32,
	mtime: TruncatedTimestamp,			mtime: TruncatedTimestamp,
	) -> Result<(), DirstateError> {			) -> Result<(), DirstateError> {
	let old_entry = match self.get(filename)? {			let old_entry = match self.get(filename)? {

rust/hg-cpython/src/dirstate/dirstate_map.rs

	.or_else(\|_\| {			.or_else(\|_\| {
	Err(PyErr::new::<exc::OSError, _>(			Err(PyErr::new::<exc::OSError, _>(
	py,			py,
	"Dirstate error".to_string(),			"Dirstate error".to_string(),
	))			))
	})?.to_py_object(py))			})?.to_py_object(py))
	}			}

				def set_untracked(&self, f: PyObject) -> PyResult<PyBool> {
				Ok(self.inner(py).borrow_mut()
				.set_untracked(
				HgPath::new(f.extract::<PyBytes>(py)?.data(py)),
				)
				.or_else(\|_\| {
				Err(PyErr::new::<exc::OSError, _>(
				py,
				"Dirstate error".to_string(),
				))
				})?.to_py_object(py))
				}

	def set_clean(			def set_clean(
	&self,			&self,
	f: PyObject,			f: PyObject,
	mode: u32,			mode: u32,
	size: u32,			size: u32,
	mtime: (i64, u32, bool)			mtime: (i64, u32, bool)
	) -> PyResult<PyNone> {			) -> PyResult<PyNone> {
	let (mtime_s, mtime_ns, second_ambiguous) = mtime;			let (mtime_s, mtime_ns, second_ambiguous) = mtime;

This is an archive of the discontinued Mercurial Phabricator instance.

rust-dirstatemap: add `set_untracked` methodClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 32896

rust/hg-core/src/dirstate_tree/dirstate_map.rs

rust/hg-cpython/src/dirstate/dirstate_map.rs

rust-dirstatemap: add `set_untracked` method
ClosedPublic

Revision Contents
Changeset List