This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	SimonSapin	D11635 dirstate-v2: Replace the 32-bit `mode` field with two bits
Closed	SimonSapin	D11634 dirstate-v2: Store unsigned integers inside DirstateEntry
Closed	SimonSapin	D11633 dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Closed	SimonSapin	D11632 dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp
Closed	SimonSapin	D11629 dirstate-v2: Change the representation of negative directory mtime
Closed	SimonSapin	D11631 dirstate-v2: Only convert from SystemTime to Timestamp and not back
Abandoned	SimonSapin	D11624 dirstate-v2: Change the representation of negative directory mtime
Closed	marmoute	D11547 dirstate-v2: Name a constant in the Rust implementation
Closed	SimonSapin	D11620 dirstate-v2: Swap the order of size and mtime on disk
Closed	SimonSapin	D11625 dirstate-v2: Document flags/mode/size/mtime fields of tree nodes
Closed	SimonSapin	D11623 dirstate-v2: Use "byte sequence" in docs

Diff 30718

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

	use crate::DirstateError;			use crate::DirstateError;
	use crate::DirstateParents;			use crate::DirstateParents;
	use bitflags::bitflags;			use bitflags::bitflags;
	use bytes_cast::unaligned::{I32Be, I64Be, U16Be, U32Be};			use bytes_cast::unaligned::{I32Be, I64Be, U16Be, U32Be};
	use bytes_cast::BytesCast;			use bytes_cast::BytesCast;
	use format_bytes::format_bytes;			use format_bytes::format_bytes;
	use std::borrow::Cow;			use std::borrow::Cow;
	use std::convert::{TryFrom, TryInto};			use std::convert::{TryFrom, TryInto};
	use std::time::{Duration, SystemTime, UNIX_EPOCH};			use std::time::{SystemTime, UNIX_EPOCH};

	/// Added at the start of `.hg/dirstate` when the "v2" format is used.			/// Added at the start of `.hg/dirstate` when the "v2" format is used.
	/// This a redundant sanity check more than an actual "magic number" since			/// This a redundant sanity check more than an actual "magic number" since
	/// `.hg/requires` already governs which format should be used.			/// `.hg/requires` already governs which format should be used.
	pub const V2_FORMAT_MARKER: &[u8; 12] = b"dirstate-v2\n";			pub const V2_FORMAT_MARKER: &[u8; 12] = b"dirstate-v2\n";

	/// Keep space for 256-bit hashes			/// Keep space for 256-bit hashes
	const STORED_NODE_ID_BYTES: usize = 32;			const STORED_NODE_ID_BYTES: usize = 32;
	};			};
	Timestamp {			Timestamp {
	seconds: secs.into(),			seconds: secs.into(),
	nanoseconds: nanos.into(),			nanoseconds: nanos.into(),
	}			}
	}			}
	}			}

	impl From<&'_ Timestamp> for SystemTime {
	fn from(timestamp: &'_ Timestamp) -> Self {
	let secs = timestamp.seconds.get();
	let nanos = timestamp.nanoseconds.get();
	if secs >= 0 {
	UNIX_EPOCH + Duration::new(secs as u64, nanos)
	} else {
	UNIX_EPOCH - Duration::new((-secs) as u64, nanos)
	}
	}
	}

	fn read_hg_path(			fn read_hg_path(
	on_disk: &[u8],			on_disk: &[u8],
	slice: PathSlice,			slice: PathSlice,
	) -> Result<&HgPath, DirstateV2ParseError> {			) -> Result<&HgPath, DirstateV2ParseError> {
	read_slice(on_disk, slice.start, slice.len.get()).map(HgPath::new)			read_slice(on_disk, slice.start, slice.len.get()).map(HgPath::new)
	}			}

	fn read_nodes(			fn read_nodes(

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

	&& self.ignore_patterns_have_changed == Some(false)			&& self.ignore_patterns_have_changed == Some(false)
	{			{
	if let Some(cached_mtime) = cached_directory_mtime {			if let Some(cached_mtime) = cached_directory_mtime {
	// The dirstate contains a cached mtime for this directory, set			// The dirstate contains a cached mtime for this directory, set
	// by a previous run of the `status` algorithm which found this			// by a previous run of the `status` algorithm which found this
	// directory eligible for `read_dir` caching.			// directory eligible for `read_dir` caching.
	if let Some(meta) = directory_metadata {			if let Some(meta) = directory_metadata {
	if let Ok(current_mtime) = meta.modified() {			if let Ok(current_mtime) = meta.modified() {
	if current_mtime == cached_mtime.into() {			let current_mtime = Timestamp::from(current_mtime);
				if current_mtime == *cached_mtime {
	// The mtime of that directory has not changed			// The mtime of that directory has not changed
	// since then, which means that the results of			// since then, which means that the results of
	// `read_dir` should also be unchanged.			// `read_dir` should also be unchanged.
	return true;			return true;
	}			}
	}			}
	}			}
	}			}

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30718		Oct 12 2021, 1:00 PM	★	★
Diff 2	30751	rHG0cc0c097216474bdccce3bcc5eaede5d1e648a3a	Oct 12 2021, 9:29 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-v2: Only convert from SystemTime to Timestamp and not backClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30718

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

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

dirstate-v2: Only convert from SystemTime to Timestamp and not back
ClosedPublic

Revision Contents
Changeset List