mercurial-scm/hg: rust/hg-core/src/dirstate/entry.rs annotate

annotate rust/hg-core/src/dirstate/entry.rs @ 48674:f7086f6173f8 stable

dirstate-v2: rename the configuration to enable the format The rename of the old experimental name was overlooked before the 6.0 release. We rename everything to use the new name (and keep the released name as an alias for compatibility). Differential Revision: https://phab.mercurial-scm.org/D12129

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 01 Feb 2022 16:36:20 +0100
parents	83d0bd45b662
children	d5a91701f7dc

rev	line source
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	1 use crate::dirstate_tree::on_disk::DirstateV2ParseError;
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	2 use crate::errors::HgError;
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	3 use bitflags::bitflags;
48218 15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	4 use std::convert::{TryFrom, TryInto};
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	5 use std::fs;
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	6 use std::io;
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	7 use std::time::{SystemTime, UNIX_EPOCH};
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	8
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	9 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	10 pub enum EntryState {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	11 Normal,
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	12 Added,
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	13 Removed,
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	14 Merged,
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	15 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	16
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	17 /// `size` and `mtime.seconds` are truncated to 31 bits.
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	18 ///
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	19 /// TODO: double-check status algorithm correctness for files
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	20 /// larger than 2 GiB or modified after 2038.
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	21 #[derive(Debug, Copy, Clone)]
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	22 pub struct DirstateEntry {
48139 ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	23 pub(crate) flags: Flags,
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	24 mode_size: Option<(u32, u32)>,
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	25 mtime: Option<TruncatedTimestamp>,
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	26 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	27
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	28 bitflags! {
48139 ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	29 pub(crate) struct Flags: u8 {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	30 const WDIR_TRACKED = 1 << 0;
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	31 const P1_TRACKED = 1 << 1;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	32 const P2_INFO = 1 << 2;
48252 602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	33 const HAS_FALLBACK_EXEC = 1 << 3;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	34 const FALLBACK_EXEC = 1 << 4;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	35 const HAS_FALLBACK_SYMLINK = 1 << 5;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	36 const FALLBACK_SYMLINK = 1 << 6;
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	37 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	38 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	39
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	40 /// A Unix timestamp with nanoseconds precision
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	41 #[derive(Debug, Copy, Clone)]
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	42 pub struct TruncatedTimestamp {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	43 truncated_seconds: u32,
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	44 /// Always in the `0 .. 1_000_000_000` range.
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	45 nanoseconds: u32,
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	46 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	47
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	48 impl TruncatedTimestamp {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	49 /// Constructs from a timestamp potentially outside of the supported range,
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	50 /// and truncate the seconds components to its lower 31 bits.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	51 ///
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	52 /// Panics if the nanoseconds components is not in the expected range.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	53 pub fn new_truncate(seconds: i64, nanoseconds: u32) -> Self {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	54 assert!(nanoseconds < NSEC_PER_SEC);
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	55 Self {
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	56 truncated_seconds: seconds as u32 & RANGE_MASK_31BIT,
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	57 nanoseconds,
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	58 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	59 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	60
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	61 /// Construct from components. Returns an error if they are not in the
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	62 /// expcted range.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	63 pub fn from_already_truncated(
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	64 truncated_seconds: u32,
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	65 nanoseconds: u32,
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	66 ) -> Result<Self, DirstateV2ParseError> {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	67 if truncated_seconds & !RANGE_MASK_31BIT == 0
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	68 && nanoseconds < NSEC_PER_SEC
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	69 {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	70 Ok(Self {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	71 truncated_seconds,
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	72 nanoseconds,
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	73 })
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	74 } else {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	75 Err(DirstateV2ParseError)
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	76 }
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	77 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	78
48218 15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	79 pub fn for_mtime_of(metadata: &fs::Metadata) -> io::Result<Self> {
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	80 #[cfg(unix)]
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	81 {
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	82 use std::os::unix::fs::MetadataExt;
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	83 let seconds = metadata.mtime();
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	84 // i64 -> u32 with value always in the `0 .. NSEC_PER_SEC` range
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	85 let nanoseconds = metadata.mtime_nsec().try_into().unwrap();
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	86 Ok(Self::new_truncate(seconds, nanoseconds))
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	87 }
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	88 #[cfg(not(unix))]
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	89 {
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	90 metadata.modified().map(Self::from)
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	91 }
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	92 }
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	93
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	94 /// The lower 31 bits of the number of seconds since the epoch.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	95 pub fn truncated_seconds(&self) -> u32 {
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	96 self.truncated_seconds
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	97 }
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	98
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	99 /// The sub-second component of this timestamp, in nanoseconds.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	100 /// Always in the `0 .. 1_000_000_000` range.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	101 ///
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	102 /// This timestamp is after `(seconds, 0)` by this many nanoseconds.
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	103 pub fn nanoseconds(&self) -> u32 {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	104 self.nanoseconds
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	105 }
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	106
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	107 /// Returns whether two timestamps are equal modulo 2**31 seconds.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	108 ///
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	109 /// If this returns `true`, the original values converted from `SystemTime`
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	110 /// or given to `new_truncate` were very likely equal. A false positive is
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	111 /// possible if they were exactly a multiple of 2**31 seconds apart (around
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	112 /// 68 years). This is deemed very unlikely to happen by chance, especially
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	113 /// on filesystems that support sub-second precision.
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	114 ///
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	115 /// If someone is manipulating the modification times of some files to
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	116 /// intentionally make `hg status` return incorrect results, not truncating
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	117 /// wouldn’t help much since they can set exactly the expected timestamp.
48262 68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	118 ///
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	119 /// Sub-second precision is ignored if it is zero in either value.
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	120 /// Some APIs simply return zero when more precision is not available.
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	121 /// When comparing values from different sources, if only one is truncated
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	122 /// in that way, doing a simple comparison would cause many false
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	123 /// negatives.
48257 f45d35950db6 dirstate: rename a `very_likely_equal` method to `likely_equal` Simon Sapin <simon.sapin@octobus.net> parents: 48254 diff changeset	124 pub fn likely_equal(self, other: Self) -> bool {
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	125 self.truncated_seconds == other.truncated_seconds
48262 68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	126 && (self.nanoseconds == other.nanoseconds
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	127 \|\| self.nanoseconds == 0
68bb472aee9c dirstate: ignore sub-second component when either is zero in mtime Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	128 \|\| other.nanoseconds == 0)
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	129 }
48218 15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	130
48257 f45d35950db6 dirstate: rename a `very_likely_equal` method to `likely_equal` Simon Sapin <simon.sapin@octobus.net> parents: 48254 diff changeset	131 pub fn likely_equal_to_mtime_of(
48218 15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	132 self,
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	133 metadata: &fs::Metadata,
15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	134 ) -> io::Result<bool> {
48257 f45d35950db6 dirstate: rename a `very_likely_equal` method to `likely_equal` Simon Sapin <simon.sapin@octobus.net> parents: 48254 diff changeset	135 Ok(self.likely_equal(Self::for_mtime_of(metadata)?))
48218 15dedc0c5c35 status: Extract TruncatedTimestamp from fs::Metadata without SystemTime Simon Sapin <simon.sapin@octobus.net> parents: 48194 diff changeset	136 }
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	137 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	138
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	139 impl From<SystemTime> for TruncatedTimestamp {
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	140 fn from(system_time: SystemTime) -> Self {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	141 // On Unix, `SystemTime` is a wrapper for the `timespec` C struct:
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	142 // https://www.gnu.org/software/libc/manual/html_node/Time-Types.html#index-struct-timespec
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	143 // We want to effectively access its fields, but the Rust standard
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	144 // library does not expose them. The best we can do is:
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	145 let seconds;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	146 let nanoseconds;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	147 match system_time.duration_since(UNIX_EPOCH) {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	148 Ok(duration) => {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	149 seconds = duration.as_secs() as i64;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	150 nanoseconds = duration.subsec_nanos();
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	151 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	152 Err(error) => {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	153 // `system_time` is before `UNIX_EPOCH`.
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	154 // We need to undo this algorithm:
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	155 // https://github.com/rust-lang/rust/blob/6bed1f0bc3cc50c10aab26d5f94b16a00776b8a5/library/std/src/sys/unix/time.rs#L40-L41
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	156 let negative = error.duration();
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	157 let negative_secs = negative.as_secs() as i64;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	158 let negative_nanos = negative.subsec_nanos();
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	159 if negative_nanos == 0 {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	160 seconds = -negative_secs;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	161 nanoseconds = 0;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	162 } else {
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	163 // For example if `system_time` was 4.3 seconds before
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	164 // the Unix epoch we get a Duration that represents
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	165 // `(-4, -0.3)` but we want `(-5, +0.7)`:
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	166 seconds = -1 - negative_secs;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	167 nanoseconds = NSEC_PER_SEC - negative_nanos;
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	168 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	169 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	170 };
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	171 Self::new_truncate(seconds, nanoseconds)
48192 d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	172 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	173 }
d2f760c2c91c dirstate-v2: Separate Rust structs for Timestamp and PackedTimestamp Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	174
48193 320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	175 const NSEC_PER_SEC: u32 = 1_000_000_000;
320de901896a dirstate-v2: Truncate directory mtimes to 31 bits of seconds Simon Sapin <simon.sapin@octobus.net> parents: 48192 diff changeset	176 const RANGE_MASK_31BIT: u32 = 0x7FFF_FFFF;
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	177
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	178 pub const MTIME_UNSET: i32 = -1;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	179
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	180 /// A `DirstateEntry` with a size of `-2` means that it was merged from the
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	181 /// other parent. This allows revert to pick the right status back during a
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	182 /// merge.
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	183 pub const SIZE_FROM_OTHER_PARENT: i32 = -2;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	184 /// A special value used for internal representation of special case in
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	185 /// dirstate v1 format.
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	186 pub const SIZE_NON_NORMAL: i32 = -1;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	187
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	188 impl DirstateEntry {
48139 ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	189 pub fn from_v2_data(
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	190 wdir_tracked: bool,
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	191 p1_tracked: bool,
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	192 p2_info: bool,
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	193 mode_size: Option<(u32, u32)>,
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	194 mtime: Option<TruncatedTimestamp>,
48253 948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	195 fallback_exec: Option<bool>,
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	196 fallback_symlink: Option<bool>,
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	197 ) -> Self {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	198 if let Some((mode, size)) = mode_size {
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	199 // TODO: return an error for out of range values?
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	200 assert!(mode & !RANGE_MASK_31BIT == 0);
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	201 assert!(size & !RANGE_MASK_31BIT == 0);
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	202 }
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	203 let mut flags = Flags::empty();
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	204 flags.set(Flags::WDIR_TRACKED, wdir_tracked);
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	205 flags.set(Flags::P1_TRACKED, p1_tracked);
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	206 flags.set(Flags::P2_INFO, p2_info);
48253 948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	207 if let Some(exec) = fallback_exec {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	208 flags.insert(Flags::HAS_FALLBACK_EXEC);
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	209 if exec {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	210 flags.insert(Flags::FALLBACK_EXEC);
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	211 }
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	212 }
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	213 if let Some(exec) = fallback_symlink {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	214 flags.insert(Flags::HAS_FALLBACK_SYMLINK);
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	215 if exec {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	216 flags.insert(Flags::FALLBACK_SYMLINK);
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	217 }
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	218 }
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	219 Self {
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	220 flags,
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	221 mode_size,
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	222 mtime,
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	223 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	224 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	225
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	226 pub fn from_v1_data(
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	227 state: EntryState,
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	228 mode: i32,
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	229 size: i32,
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	230 mtime: i32,
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	231 ) -> Self {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	232 match state {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	233 EntryState::Normal => {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	234 if size == SIZE_FROM_OTHER_PARENT {
48158 da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48157 diff changeset	235 Self {
da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48157 diff changeset	236 // might be missing P1_TRACKED
da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48157 diff changeset	237 flags: Flags::WDIR_TRACKED \| Flags::P2_INFO,
da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48157 diff changeset	238 mode_size: None,
da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48157 diff changeset	239 mtime: None,
da304f78a0e1 dirstate-item: replace call to new_from_p2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48157 diff changeset	240 }
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	241 } else if size == SIZE_NON_NORMAL {
48160 898de425bcd6 dirstate-item: replace call to new_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48159 diff changeset	242 Self {
898de425bcd6 dirstate-item: replace call to new_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48159 diff changeset	243 flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,
898de425bcd6 dirstate-item: replace call to new_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48159 diff changeset	244 mode_size: None,
898de425bcd6 dirstate-item: replace call to new_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48159 diff changeset	245 mtime: None,
898de425bcd6 dirstate-item: replace call to new_possibly_dirty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48159 diff changeset	246 }
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	247 } else if mtime == MTIME_UNSET {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	248 // TODO: return an error for negative values?
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	249 let mode = u32::try_from(mode).unwrap();
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	250 let size = u32::try_from(size).unwrap();
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	251 Self {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	252 flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	253 mode_size: Some((mode, size)),
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	254 mtime: None,
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	255 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	256 } else {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	257 // TODO: return an error for negative values?
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	258 let mode = u32::try_from(mode).unwrap();
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	259 let size = u32::try_from(size).unwrap();
1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	260 let mtime = u32::try_from(mtime).unwrap();
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	261 let mtime =
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	262 TruncatedTimestamp::from_already_truncated(mtime, 0)
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	263 .unwrap();
48163 d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48161 diff changeset	264 Self {
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48161 diff changeset	265 flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48161 diff changeset	266 mode_size: Some((mode, size)),
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48161 diff changeset	267 mtime: Some(mtime),
d0081dbca442 dirstate-item: replace call to new_normal Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48161 diff changeset	268 }
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	269 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	270 }
48156 d342815ff827 dirstate-item: replace call to new_added Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48155 diff changeset	271 EntryState::Added => Self {
d342815ff827 dirstate-item: replace call to new_added Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48155 diff changeset	272 flags: Flags::WDIR_TRACKED,
d342815ff827 dirstate-item: replace call to new_added Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48155 diff changeset	273 mode_size: None,
d342815ff827 dirstate-item: replace call to new_added Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48155 diff changeset	274 mtime: None,
d342815ff827 dirstate-item: replace call to new_added Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48155 diff changeset	275 },
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	276 EntryState::Removed => Self {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	277 flags: if size == SIZE_NON_NORMAL {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	278 Flags::P1_TRACKED \| Flags::P2_INFO
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	279 } else if size == SIZE_FROM_OTHER_PARENT {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	280 // We don’t know if P1_TRACKED should be set (file history)
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	281 Flags::P2_INFO
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	282 } else {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	283 Flags::P1_TRACKED
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	284 },
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	285 mode_size: None,
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	286 mtime: None,
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	287 },
48154 7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	288 EntryState::Merged => Self {
7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	289 flags: Flags::WDIR_TRACKED
7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	290 \| Flags::P1_TRACKED // might not be true because of rename ?
7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	291 \| Flags::P2_INFO, // might not be true because of rename ?
7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	292 mode_size: None,
7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	293 mtime: None,
7a8c9869e4fe dirstate-item: replace call to new_merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48153 diff changeset	294 },
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	295 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	296 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	297
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	298 /// Creates a new entry in "removed" state.
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	299 ///
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	300 /// `size` is expected to be zero, `SIZE_NON_NORMAL`, or
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	301 /// `SIZE_FROM_OTHER_PARENT`
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	302 pub fn new_removed(size: i32) -> Self {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	303 Self::from_v1_data(EntryState::Removed, 0, size, 0)
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	304 }
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	305
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	306 pub fn tracked(&self) -> bool {
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	307 self.flags.contains(Flags::WDIR_TRACKED)
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	308 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	309
48143 21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	310 pub fn p1_tracked(&self) -> bool {
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	311 self.flags.contains(Flags::P1_TRACKED)
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	312 }
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	313
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	314 fn in_either_parent(&self) -> bool {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	315 self.flags.intersects(Flags::P1_TRACKED \| Flags::P2_INFO)
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	316 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	317
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	318 pub fn removed(&self) -> bool {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	319 self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED)
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	320 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	321
48142 fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48139 diff changeset	322 pub fn p2_info(&self) -> bool {
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48139 diff changeset	323 self.flags.contains(Flags::WDIR_TRACKED \| Flags::P2_INFO)
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48139 diff changeset	324 }
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48139 diff changeset	325
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	326 pub fn added(&self) -> bool {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	327 self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	328 }
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	329
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	330 pub fn maybe_clean(&self) -> bool {
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	331 if !self.flags.contains(Flags::WDIR_TRACKED) {
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	332 false
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	333 } else if !self.flags.contains(Flags::P1_TRACKED) {
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	334 false
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	335 } else if self.flags.contains(Flags::P2_INFO) {
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	336 false
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	337 } else {
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	338 true
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	339 }
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	340 }
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48067 diff changeset	341
48087 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	342 pub fn any_tracked(&self) -> bool {
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	343 self.flags.intersects(
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	344 Flags::WDIR_TRACKED \| Flags::P1_TRACKED \| Flags::P2_INFO,
48087 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	345 )
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	346 }
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	347
48139 ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	348 /// Returns `(wdir_tracked, p1_tracked, p2_info, mode_size, mtime)`
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	349 pub(crate) fn v2_data(
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	350 &self,
48254 b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	351 ) -> (
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	352 bool,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	353 bool,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	354 bool,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	355 Option<(u32, u32)>,
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	356 Option<TruncatedTimestamp>,
48254 b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	357 Option<bool>,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	358 Option<bool>,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	359 ) {
48139 ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	360 if !self.any_tracked() {
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	361 // TODO: return an Option instead?
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	362 panic!("Accessing v1_state of an untracked DirstateEntry")
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	363 }
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	364 let wdir_tracked = self.flags.contains(Flags::WDIR_TRACKED);
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	365 let p1_tracked = self.flags.contains(Flags::P1_TRACKED);
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	366 let p2_info = self.flags.contains(Flags::P2_INFO);
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	367 let mode_size = self.mode_size;
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	368 let mtime = self.mtime;
48254 b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	369 (
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	370 wdir_tracked,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	371 p1_tracked,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	372 p2_info,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	373 mode_size,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	374 mtime,
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	375 self.get_fallback_exec(),
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	376 self.get_fallback_symlink(),
b874e8d81a98 dirstate-v2: preserve the fallback values on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48253 diff changeset	377 )
48139 ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	378 }
ab5a7fdbf75c dirstate-v2: Store a bitfield on disk instead of v1-like state Simon Sapin <simon.sapin@octobus.net> parents: 48138 diff changeset	379
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	380 fn v1_state(&self) -> EntryState {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	381 if !self.any_tracked() {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	382 // TODO: return an Option instead?
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	383 panic!("Accessing v1_state of an untracked DirstateEntry")
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	384 }
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	385 if self.removed() {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	386 EntryState::Removed
48152 8f88307f8e07 dirstate-item: replace another usage of `merged` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	387 } else if self
8f88307f8e07 dirstate-item: replace another usage of `merged` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	388 .flags
8f88307f8e07 dirstate-item: replace another usage of `merged` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	389 .contains(Flags::WDIR_TRACKED \| Flags::P1_TRACKED \| Flags::P2_INFO)
8f88307f8e07 dirstate-item: replace another usage of `merged` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48150 diff changeset	390 {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	391 EntryState::Merged
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	392 } else if self.added() {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	393 EntryState::Added
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	394 } else {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	395 EntryState::Normal
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	396 }
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	397 }
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	398
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	399 fn v1_mode(&self) -> i32 {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	400 if let Some((mode, _size)) = self.mode_size {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	401 i32::try_from(mode).unwrap()
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	402 } else {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	403 0
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	404 }
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	405 }
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	406
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	407 fn v1_size(&self) -> i32 {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	408 if !self.any_tracked() {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	409 // TODO: return an Option instead?
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	410 panic!("Accessing v1_size of an untracked DirstateEntry")
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	411 }
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	412 if self.removed()
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	413 && self.flags.contains(Flags::P1_TRACKED \| Flags::P2_INFO)
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	414 {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	415 SIZE_NON_NORMAL
48149 6ac2b417d5d7 dirstate-item: directly use `p2_info` in `v1_size` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48143 diff changeset	416 } else if self.flags.contains(Flags::P2_INFO) {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	417 SIZE_FROM_OTHER_PARENT
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	418 } else if self.removed() {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	419 0
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	420 } else if self.added() {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	421 SIZE_NON_NORMAL
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	422 } else if let Some((_mode, size)) = self.mode_size {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	423 i32::try_from(size).unwrap()
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	424 } else {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	425 SIZE_NON_NORMAL
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	426 }
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	427 }
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	428
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	429 fn v1_mtime(&self) -> i32 {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	430 if !self.any_tracked() {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	431 // TODO: return an Option instead?
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	432 panic!("Accessing v1_mtime of an untracked DirstateEntry")
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	433 }
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	434 if self.removed() {
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	435 0
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	436 } else if self.flags.contains(Flags::P2_INFO) {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	437 MTIME_UNSET
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	438 } else if !self.flags.contains(Flags::P1_TRACKED) {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	439 MTIME_UNSET
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	440 } else if let Some(mtime) = self.mtime {
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	441 i32::try_from(mtime.truncated_seconds()).unwrap()
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	442 } else {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	443 MTIME_UNSET
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	444 }
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	445 }
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	446
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	447 // TODO: return `Option<EntryState>`? None when `!self.any_tracked`
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	448 pub fn state(&self) -> EntryState {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	449 self.v1_state()
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	450 }
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	451
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	452 // TODO: return Option?
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	453 pub fn mode(&self) -> i32 {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	454 self.v1_mode()
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	455 }
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	456
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	457 // TODO: return Option?
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	458 pub fn size(&self) -> i32 {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	459 self.v1_size()
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	460 }
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	461
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	462 // TODO: return Option?
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	463 pub fn mtime(&self) -> i32 {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	464 self.v1_mtime()
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	465 }
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	466
48252 602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	467 pub fn get_fallback_exec(&self) -> Option<bool> {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	468 if self.flags.contains(Flags::HAS_FALLBACK_EXEC) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	469 Some(self.flags.contains(Flags::FALLBACK_EXEC))
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	470 } else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	471 None
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	472 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	473 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	474
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	475 pub fn set_fallback_exec(&mut self, value: Option<bool>) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	476 match value {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	477 None => {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	478 self.flags.remove(Flags::HAS_FALLBACK_EXEC);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	479 self.flags.remove(Flags::FALLBACK_EXEC);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	480 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	481 Some(exec) => {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	482 self.flags.insert(Flags::HAS_FALLBACK_EXEC);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	483 if exec {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	484 self.flags.insert(Flags::FALLBACK_EXEC);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	485 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	486 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	487 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	488 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	489
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	490 pub fn get_fallback_symlink(&self) -> Option<bool> {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	491 if self.flags.contains(Flags::HAS_FALLBACK_SYMLINK) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	492 Some(self.flags.contains(Flags::FALLBACK_SYMLINK))
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	493 } else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	494 None
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	495 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	496 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	497
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	498 pub fn set_fallback_symlink(&mut self, value: Option<bool>) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	499 match value {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	500 None => {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	501 self.flags.remove(Flags::HAS_FALLBACK_SYMLINK);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	502 self.flags.remove(Flags::FALLBACK_SYMLINK);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	503 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	504 Some(symlink) => {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	505 self.flags.insert(Flags::HAS_FALLBACK_SYMLINK);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	506 if symlink {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	507 self.flags.insert(Flags::FALLBACK_SYMLINK);
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	508 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	509 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	510 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	511 }
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48218 diff changeset	512
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	513 pub fn truncated_mtime(&self) -> Option<TruncatedTimestamp> {
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	514 self.mtime
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	515 }
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	516
48134 3c7db97ce541 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	517 pub fn drop_merge_data(&mut self) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	518 if self.flags.contains(Flags::P2_INFO) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	519 self.flags.remove(Flags::P2_INFO);
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	520 self.mode_size = None;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	521 self.mtime = None;
48134 3c7db97ce541 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	522 }
3c7db97ce541 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	523 }
3c7db97ce541 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	524
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	525 pub fn set_possibly_dirty(&mut self) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	526 self.mtime = None
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	527 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	528
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	529 pub fn set_clean(
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	530 &mut self,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	531 mode: u32,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	532 size: u32,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	533 mtime: TruncatedTimestamp,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	534 ) {
48194 1000db4a71f1 dirstate-v2: Store unsigned integers inside DirstateEntry Simon Sapin <simon.sapin@octobus.net> parents: 48193 diff changeset	535 let size = size & RANGE_MASK_31BIT;
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	536 self.flags.insert(Flags::WDIR_TRACKED \| Flags::P1_TRACKED);
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	537 self.mode_size = Some((mode, size));
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	538 self.mtime = Some(mtime);
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	539 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	540
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	541 pub fn set_tracked(&mut self) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	542 self.flags.insert(Flags::WDIR_TRACKED);
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	543 // `set_tracked` is replacing various `normallookup` call. So we mark
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	544 // the files as needing lookup
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	545 //
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	546 // Consider dropping this in the future in favor of something less
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	547 // broad.
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	548 self.mtime = None;
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	549 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	550
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	551 pub fn set_untracked(&mut self) {
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	552 self.flags.remove(Flags::WDIR_TRACKED);
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	553 self.mode_size = None;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	554 self.mtime = None;
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	555 }
3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48042 diff changeset	556
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	557 /// Returns `(state, mode, size, mtime)` for the puprose of serialization
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	558 /// in the dirstate-v1 format.
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	559 ///
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	560 /// This includes marker values such as `mtime == -1`. In the future we may
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	561 /// want to not represent these cases that way in memory, but serialization
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	562 /// will need to keep the same format.
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	563 pub fn v1_data(&self) -> (u8, i32, i32, i32) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	564 (
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	565 self.v1_state().into(),
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	566 self.v1_mode(),
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	567 self.v1_size(),
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	568 self.v1_mtime(),
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	569 )
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	570 }
f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48018 diff changeset	571
48061 060cd909439f dirstate: drop all logic around the "non-normal" sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48051 diff changeset	572 pub(crate) fn is_from_other_parent(&self) -> bool {
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	573 self.state() == EntryState::Normal
008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	574 && self.size() == SIZE_FROM_OTHER_PARENT
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	575 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	576
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	577 // TODO: other platforms
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	578 #[cfg(unix)]
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	579 pub fn mode_changed(
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	580 &self,
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	581 filesystem_metadata: &std::fs::Metadata,
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	582 ) -> bool {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	583 use std::os::unix::fs::MetadataExt;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	584 const EXEC_BIT_MASK: u32 = 0o100;
48042 008959fcbfb2 rust: Align DirstateEntry internals with Python/C DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48026 diff changeset	585 let dirstate_exec_bit = (self.mode() as u32) & EXEC_BIT_MASK;
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	586 let fs_exec_bit = filesystem_metadata.mode() & EXEC_BIT_MASK;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	587 dirstate_exec_bit != fs_exec_bit
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	588 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	589
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	590 /// Returns a `(state, mode, size, mtime)` tuple as for
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	591 /// `DirstateMapMethods::debug_iter`.
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	592 pub fn debug_tuple(&self) -> (u8, i32, i32, i32) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48134 diff changeset	593 (self.state().into(), self.mode(), self.size(), self.mtime())
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	594 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	595
48258 c591944f42c1 dirstate: align Rust function name to `need_delay` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48257 diff changeset	596 /// True if the stored mtime would be ambiguous with the current time
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	597 pub fn need_delay(&self, now: TruncatedTimestamp) -> bool {
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	598 if let Some(mtime) = self.mtime {
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	599 self.state() == EntryState::Normal
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	600 && mtime.truncated_seconds() == now.truncated_seconds()
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	601 } else {
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	602 false
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48259 diff changeset	603 }
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	604 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	605 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	606
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	607 impl EntryState {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	608 pub fn is_tracked(self) -> bool {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	609 use EntryState::*;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	610 match self {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	611 Normal \| Added \| Merged => true,
48026 1b2ee68e85f9 rust: Remove EntryState::Unknown Simon Sapin <simon.sapin@octobus.net> parents: 48022 diff changeset	612 Removed => false,
48018 08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	613 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	614 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	615 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	616
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	617 impl TryFrom<u8> for EntryState {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	618 type Error = HgError;
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	619
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	620 fn try_from(value: u8) -> Result<Self, Self::Error> {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	621 match value {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	622 b'n' => Ok(EntryState::Normal),
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	623 b'a' => Ok(EntryState::Added),
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	624 b'r' => Ok(EntryState::Removed),
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	625 b'm' => Ok(EntryState::Merged),
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	626 _ => Err(HgError::CorruptedRepository(format!(
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	627 "Incorrect dirstate entry state {}",
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	628 value
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	629 ))),
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	630 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	631 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	632 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	633
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	634 impl Into<u8> for EntryState {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	635 fn into(self) -> u8 {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	636 match self {
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	637 EntryState::Normal => b'n',
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	638 EntryState::Added => b'a',
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	639 EntryState::Removed => b'r',
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	640 EntryState::Merged => b'm',
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	641 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	642 }
08efe5945d2b rust: Move DirstateEntry to its own module Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	643 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/dirstate/entry.rs @ 48674:f7086f6173f8 stable