This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26821		Apr 12 2021, 8:23 AM	★	★
Diff 2	27051		Apr 19 2021, 11:02 AM	★	★
Diff 3	27642	rHG12182be2628585262c026b3ec4a6749ef038af60	Apr 6 2021, 8:29 AM	★	★

Commit	Parents	Author	Summary	Date
763fed648b81	a35c1e78dec6	Simon Sapin		Apr 6 2021, 8:29 AM

Status	Author	Revision
Closed	SimonSapin	D10560 dirstate-tree: Borrow paths from the "on disk" bytes
Closed	SimonSapin	D10559 dirstate-tree: Borrow copy source paths from the "on disk" bytes
Closed	SimonSapin	D10558 rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs
Closed	SimonSapin	D10557 dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Closed	SimonSapin	D10556 rust: Read dirstate from disk in DirstateMap constructor
Closed	SimonSapin	D10555 rust: Remove handling of `parents` in `DirstateMap`
Closed	SimonSapin	D10554 dirstate-tree: Fold "tracked descendants" counter update in main walk
Closed	SimonSapin	D10553 dirstate-tree: Use HashMap instead of BTreeMap
Closed	SimonSapin	D10552 dirstate-tree: Add #[timed] attribute to `status` and `DirstateMap::read`
Closed	SimonSapin	D10551 dirstate-tree: Paralellize the status algorithm with Rayon
Closed	SimonSapin	D10550 dirstate-tree: Avoid BTreeMap double-lookup when inserting a dirstate entry
Closed	SimonSapin	D10549 dirstate-tree: Handle I/O errors in status
Closed	SimonSapin	D10548 dirstate-tree: Ignore FIFOs etc. in the status algorithm
Closed	SimonSapin	D10547 dirstate-tree: Add the new `status()` algorithm
Closed	SimonSapin	D10546 dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Closed	SimonSapin	D10495 rust: Add doc-comments to DirstateStatus fields
Closed	SimonSapin	D10494 rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct
Closed	SimonSapin	D10493 rust: Remove DirstateMap::file_fold_map
Closed	SimonSapin	D10492 dirstate-tree: Add "non normal" and "from other parent" sets
Closed	SimonSapin	D10491 dirstate-tree: Add add_file, remove_file, and drop_file
Closed	SimonSapin	D10490 dirstate-tree: Add has_dir and has_tracked_dir
Closed	SimonSapin	D10489 dirstate-tree: Add clear_ambiguous_times in the new DirstateMap
Closed	SimonSapin	D10488 dirstate-tree: Add copy_map_insert and copy_map_remove
Closed	SimonSapin	D10487 dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Closed	SimonSapin	D10486 dirstate-tree: Serialize to disk
Closed	SimonSapin	D10485 rust: Add a Timestamp struct instead of abusing Duration
Closed	SimonSapin	D10370 dirstate-tree: Add tree traversal/iteration
Closed	SimonSapin	D10369 dirstate-tree: Add map `get` and `contains_key` methods
Closed	SimonSapin	D10368 dirstate-tree: Add parsing only dirstate parents from disk
Closed	SimonSapin	D10367 dirstate-tree: Implement DirstateMap::read
Abandoned	SimonSapin	D10366 rust: Refactor parse_dirstate() to take a callback
Closed	SimonSapin	D10365 dirstate-tree: Add `WithBasename` wrapper for `HgPath`
Closed	SimonSapin	D10364 dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Closed	SimonSapin	D10363 dirstate-tree: Abstract "non-normal" and "other parent" sets
Closed	SimonSapin	D10362 dirstate-tree: Make Rust DirstateMap bindings go through a trait object

Diff 27051

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

	use std::collections::BTreeMap;			use std::collections::BTreeMap;
	use std::path::PathBuf;			use std::path::PathBuf;
	use std::time::Duration;			use std::time::Duration;

	use super::path_with_basename::WithBasename;			use super::path_with_basename::WithBasename;

	use crate::dirstate::parsers::parse_dirstate_entries;			use crate::dirstate::parsers::parse_dirstate_entries;
				use crate::dirstate::parsers::parse_dirstate_parents;

	use crate::matchers::Matcher;			use crate::matchers::Matcher;
	use crate::revlog::node::NULL_NODE;			use crate::revlog::node::NULL_NODE;
	use crate::utils::hg_path::{HgPath, HgPathBuf};			use crate::utils::hg_path::{HgPath, HgPathBuf};
	use crate::CopyMapIter;			use crate::CopyMapIter;
	use crate::DirstateEntry;			use crate::DirstateEntry;
	use crate::DirstateError;			use crate::DirstateError;
	use crate::DirstateMapError;			use crate::DirstateMapError;
	use crate::DirstateParents;			use crate::DirstateParents;
	&mut self,			&mut self,
	_directory: &HgPath,			_directory: &HgPath,
	) -> Result<bool, DirstateMapError> {			) -> Result<bool, DirstateMapError> {
	todo!()			todo!()
	}			}

	fn parents(			fn parents(
	&mut self,			&mut self,
	_file_contents: &[u8],			file_contents: &[u8],
	) -> Result<&DirstateParents, DirstateError> {			) -> Result<&DirstateParents, DirstateError> {
	todo!()			if self.parents.is_none() {
				let parents = if !file_contents.is_empty() {
				parse_dirstate_parents(file_contents)?.clone()
				} else {
				DirstateParents {
				p1: NULL_NODE,
				p2: NULL_NODE,
				}
				};
				self.parents = Some(parents);
				}
				Ok(self.parents.as_ref().unwrap())
	}			}

	fn set_parents(&mut self, parents: &DirstateParents) {			fn set_parents(&mut self, parents: &DirstateParents) {
	self.parents = Some(parents.clone());			self.parents = Some(parents.clone());
	self.dirty_parents = true;			self.dirty_parents = true;
	}			}

	fn read<'a>(			fn read<'a>(

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-tree: Add parsing only dirstate parents from diskClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 27051

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

dirstate-tree: Add parsing only dirstate parents from disk
ClosedPublic

Revision Contents
Changeset List