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

annotate rust/hg-core/src/dirstate/parsers.rs @ 47124:cd8ca38fccff

rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Getting the former (through `Deref`) is almost the only useful thing one can do with the latter anyway. With this changes, API become more flexible for the "provider" of these paths which may store something else that Deref?s to HgPath, such as `std::borrow::Cow<HgPath>`. Using `Cow` can help reduce memory alloactions and copying. Differential Revision: https://phab.mercurial-scm.org/D10558

author	Simon Sapin <simon.sapin@octobus.net>
date	Fri, 30 Apr 2021 19:57:46 +0200
parents	d6c94ca40863
children	73f23e7610f8

rev	line source
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // This software may be used and distributed according to the terms of the
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 // GNU General Public License version 2 or any later version.
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5
46439 68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	6 use crate::errors::HgError;
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	7 use crate::utils::hg_path::HgPath;
42609 326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42424 diff changeset	8 use crate::{
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	9 dirstate::{CopyMap, EntryState, RawEntry, StateMap},
46440 776b97179c06 rust: Remove DirstateParseError and ListDirstateTrackedFilesError Simon Sapin <simon.sapin@octobus.net> parents: 46439 diff changeset	10 DirstateEntry, DirstateParents,
42609 326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42424 diff changeset	11 };
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	12 use byteorder::{BigEndian, WriteBytesExt};
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	13 use bytes_cast::BytesCast;
44541 d880805d5442 hg-core: add function timing information Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	14 use micro_timer::timed;
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	15 use std::convert::{TryFrom, TryInto};
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	16
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	17 /// Parents are stored in the dirstate as byte hashes.
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	18 pub const PARENT_SIZE: usize = 20;
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	19 /// Dirstate entries have a static part of 8 + 32 + 32 + 32 + 32 bits.
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	20 const MIN_ENTRY_SIZE: usize = 17;
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	21
45357 27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	22 type ParseResult<'a> = (
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	23 &'a DirstateParents,
45357 27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	24 Vec<(&'a HgPath, DirstateEntry)>,
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	25 Vec<(&'a HgPath, &'a HgPath)>,
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	26 );
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	27
46601 755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	28 pub fn parse_dirstate_parents(
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	29 contents: &[u8],
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	30 ) -> Result<&DirstateParents, HgError> {
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	31 let (parents, _rest) = DirstateParents::from_bytes(contents)
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	32 .map_err(\|_\| HgError::corrupted("Too little data for dirstate."))?;
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	33 Ok(parents)
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	34 }
755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46595 diff changeset	35
44541 d880805d5442 hg-core: add function timing information Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	36 #[timed]
47097 e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	37 pub fn parse_dirstate(contents: &[u8]) -> Result<ParseResult, HgError> {
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	38 let mut copies = Vec::new();
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	39 let mut entries = Vec::new();
47097 e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	40 let parents =
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	41 parse_dirstate_entries(contents, \|path, entry, copy_source\| {
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	42 if let Some(source) = copy_source {
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	43 copies.push((path, source));
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	44 }
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	45 entries.push((path, *entry));
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	46 })?;
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	47 Ok((parents, entries, copies))
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	48 }
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49
47097 e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	50 pub fn parse_dirstate_entries<'a>(
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	51 mut contents: &'a [u8],
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	52 mut each_entry: impl FnMut(&'a HgPath, &DirstateEntry, Option<&'a HgPath>),
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	53 ) -> Result<&'a DirstateParents, HgError> {
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	54 let (parents, rest) = DirstateParents::from_bytes(contents)
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	55 .map_err(\|_\| HgError::corrupted("Too little data for dirstate."))?;
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	56 contents = rest;
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	57 while !contents.is_empty() {
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	58 let (raw_entry, rest) = RawEntry::from_bytes(contents)
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	59 .map_err(\|_\| HgError::corrupted("Overflow in dirstate."))?;
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	60
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	61 let entry = DirstateEntry {
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	62 state: EntryState::try_from(raw_entry.state)?,
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	63 mode: raw_entry.mode.get(),
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	64 mtime: raw_entry.mtime.get(),
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	65 size: raw_entry.size.get(),
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	66 };
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	67 let (paths, rest) =
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	68 u8::slice_from_bytes(rest, raw_entry.length.get() as usize)
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	69 .map_err(\|_\| HgError::corrupted("Overflow in dirstate."))?;
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	71 // `paths` is either a single path, or two paths separated by a NULL
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	72 // byte
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	73 let mut iter = paths.splitn(2, \|&byte\| byte == b'\0');
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	74 let path = HgPath::new(
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	75 iter.next().expect("splitn always yields at least one item"),
f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	76 );
47097 e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	77 let copy_source = iter.next().map(HgPath::new);
e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	78 each_entry(path, &entry, copy_source);
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	79
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	80 contents = rest;
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	81 }
47097 e66ea29e2b1a dirstate-tree: Implement DirstateMap::read Simon Sapin <simon.sapin@octobus.net> parents: 46890 diff changeset	82 Ok(parents)
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	83 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	84
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	85 fn packed_filename_and_copy_source_size(
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	86 filename: &HgPath,
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	87 copy_source: Option<&HgPath>,
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	88 ) -> usize {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	89 filename.len()
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	90 + if let Some(source) = copy_source {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	91 b"\0".len() + source.len()
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	92 } else {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	93 0
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	94 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	95 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	96
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	97 pub fn packed_entry_size(
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	98 filename: &HgPath,
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	99 copy_source: Option<&HgPath>,
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	100 ) -> usize {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	101 MIN_ENTRY_SIZE
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	102 + packed_filename_and_copy_source_size(filename, copy_source)
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	103 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	104
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	105 pub fn pack_entry(
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	106 filename: &HgPath,
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	107 entry: &DirstateEntry,
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	108 copy_source: Option<&HgPath>,
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	109 packed: &mut Vec<u8>,
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	110 ) {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	111 let length = packed_filename_and_copy_source_size(filename, copy_source);
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	112
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	113 // Unwrapping because `impl std::io::Write for Vec<u8>` never errors
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	114 packed.write_u8(entry.state.into()).unwrap();
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	115 packed.write_i32::<BigEndian>(entry.mode).unwrap();
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	116 packed.write_i32::<BigEndian>(entry.size).unwrap();
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	117 packed.write_i32::<BigEndian>(entry.mtime).unwrap();
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	118 packed.write_i32::<BigEndian>(length as i32).unwrap();
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	119 packed.extend(filename.as_bytes());
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	120 if let Some(source) = copy_source {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	121 packed.push(b'\0');
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	122 packed.extend(source.as_bytes());
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	123 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	124 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	125
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	126 /// Seconds since the Unix epoch
5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	127 pub struct Timestamp(pub u64);
5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	128
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	129 pub fn clear_ambiguous_mtime(
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	130 entry: &mut DirstateEntry,
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	131 mtime_now: i32,
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	132 ) -> bool {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	133 let ambiguous =
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	134 entry.state == EntryState::Normal && entry.mtime == mtime_now;
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	135 if ambiguous {
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	136 // The file was last modified "simultaneously" with the current
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	137 // write to dirstate (i.e. within the same second for file-
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	138 // systems with a granularity of 1 sec). This commonly happens
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	139 // for at least a couple of files on 'update'.
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	140 // The user could change the file without changing its size
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	141 // within the same second. Invalidate the file's mtime in
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	142 // dirstate, forcing future 'status' calls to compare the
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	143 // contents of the file if the size is the same. This prevents
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	144 // mistakenly treating such files as clean.
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	145 entry.mtime = -1;
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	146 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	147 ambiguous
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	148 }
d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	149
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	150 pub fn pack_dirstate(
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	151 state_map: &mut StateMap,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	152 copy_map: &CopyMap,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	153 parents: DirstateParents,
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	154 now: Timestamp,
46439 68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	155 ) -> Result<Vec<u8>, HgError> {
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	156 // TODO move away from i32 before 2038.
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	157 let now: i32 = now.0.try_into().expect("time overflow");
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	158
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	159 let expected_size: usize = state_map
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	160 .iter()
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	161 .map(\|(filename, _)\| {
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	162 packed_entry_size(filename, copy_map.get(filename).map(\|p\| &**p))
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	163 })
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	164 .sum();
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	165 let expected_size = expected_size + PARENT_SIZE * 2;
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	166
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	167 let mut packed = Vec::with_capacity(expected_size);
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	168
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	169 packed.extend(parents.p1.as_bytes());
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	170 packed.extend(parents.p2.as_bytes());
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171
45646 1efbc787334c rust-parsers: use in-place mutation instead of allocating a new `Vec` Rapha?l Gom?s <rgomes@octobus.net> parents: 45610 diff changeset	172 for (filename, entry) in state_map.iter_mut() {
47102 d6c94ca40863 dirstate-tree: Serialize to disk Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	173 clear_ambiguous_mtime(entry, now);
47124 cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	174 pack_entry(
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	175 filename,
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	176 entry,
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	177 copy_map.get(filename).map(\|p\| &**p),
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	178 &mut packed,
cd8ca38fccff rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs Simon Sapin <simon.sapin@octobus.net> parents: 47102 diff changeset	179 )
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	180 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	181
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	182 if packed.len() != expected_size {
46439 68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	183 return Err(HgError::CorruptedRepository(format!(
68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	184 "bad dirstate size: {} != {}",
68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	185 expected_size,
68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	186 packed.len()
68a15b5a7e58 rust: Replace DirstatePackError with HgError Simon Sapin <simon.sapin@octobus.net> parents: 45646 diff changeset	187 )));
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	188 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	189
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	190 Ok(packed)
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	191 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	192
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	193 #[cfg(test)]
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	194 mod tests {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	195 use super::*;
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	196 use crate::{utils::hg_path::HgPathBuf, FastHashMap};
45610 496537c9c1b4 rust: start plugging the dirstate tree behind a feature gate Rapha?l Gom?s <rgomes@octobus.net> parents: 45357 diff changeset	197 use pretty_assertions::assert_eq;
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	198
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	199 #[test]
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	200 fn test_pack_dirstate_empty() {
45610 496537c9c1b4 rust: start plugging the dirstate tree behind a feature gate Rapha?l Gom?s <rgomes@octobus.net> parents: 45357 diff changeset	201 let mut state_map = StateMap::default();
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	202 let copymap = FastHashMap::default();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	203 let parents = DirstateParents {
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	204 p1: b"12345678910111213141".into(),
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	205 p2: b"00000000000000000000".into(),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	206 };
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	207 let now = Timestamp(15000000);
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	208 let expected = b"1234567891011121314100000000000000000000".to_vec();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	209
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	210 assert_eq!(
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	211 expected,
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	212 pack_dirstate(&mut state_map, &copymap, parents, now).unwrap()
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	213 );
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	214
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	215 assert!(state_map.is_empty())
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	216 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	217 #[test]
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	218 fn test_pack_dirstate_one_entry() {
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	219 let expected_state_map: StateMap = [(
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	220 HgPathBuf::from_bytes(b"f1"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	221 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	222 state: EntryState::Normal,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	223 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	224 size: 0,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	225 mtime: 791231220,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	226 },
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	227 )]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	228 .iter()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	229 .cloned()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	230 .collect();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	231 let mut state_map = expected_state_map.clone();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	232
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	233 let copymap = FastHashMap::default();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	234 let parents = DirstateParents {
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	235 p1: b"12345678910111213141".into(),
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	236 p2: b"00000000000000000000".into(),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	237 };
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	238 let now = Timestamp(15000000);
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	239 let expected = [
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	240 49, 50, 51, 52, 53, 54, 55, 56, 57, 49, 48, 49, 49, 49, 50, 49,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	241 51, 49, 52, 49, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	242 48, 48, 48, 48, 48, 48, 48, 48, 110, 0, 0, 1, 164, 0, 0, 0, 0, 47,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	243 41, 58, 244, 0, 0, 0, 2, 102, 49,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	244 ]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	245 .to_vec();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	246
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	247 assert_eq!(
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	248 expected,
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	249 pack_dirstate(&mut state_map, &copymap, parents, now).unwrap()
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	250 );
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	251
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	252 assert_eq!(expected_state_map, state_map);
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	253 }
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	254 #[test]
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	255 fn test_pack_dirstate_one_entry_with_copy() {
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	256 let expected_state_map: StateMap = [(
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	257 HgPathBuf::from_bytes(b"f1"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	258 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	259 state: EntryState::Normal,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	260 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	261 size: 0,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	262 mtime: 791231220,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	263 },
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	264 )]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	265 .iter()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	266 .cloned()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	267 .collect();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	268 let mut state_map = expected_state_map.clone();
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	269 let mut copymap = FastHashMap::default();
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	270 copymap.insert(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	271 HgPathBuf::from_bytes(b"f1"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	272 HgPathBuf::from_bytes(b"copyname"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	273 );
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	274 let parents = DirstateParents {
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	275 p1: b"12345678910111213141".into(),
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	276 p2: b"00000000000000000000".into(),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	277 };
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	278 let now = Timestamp(15000000);
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	279 let expected = [
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	280 49, 50, 51, 52, 53, 54, 55, 56, 57, 49, 48, 49, 49, 49, 50, 49,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	281 51, 49, 52, 49, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	282 48, 48, 48, 48, 48, 48, 48, 48, 110, 0, 0, 1, 164, 0, 0, 0, 0, 47,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	283 41, 58, 244, 0, 0, 0, 11, 102, 49, 0, 99, 111, 112, 121, 110, 97,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	284 109, 101,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	285 ]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	286 .to_vec();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	287
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	288 assert_eq!(
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	289 expected,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	290 pack_dirstate(&mut state_map, &copymap, parents, now).unwrap()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	291 );
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	292 assert_eq!(expected_state_map, state_map);
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	293 }
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	294
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	295 #[test]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	296 fn test_parse_pack_one_entry_with_copy() {
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	297 let mut state_map: StateMap = [(
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	298 HgPathBuf::from_bytes(b"f1"),
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	299 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	300 state: EntryState::Normal,
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	301 mode: 0o644,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	302 size: 0,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	303 mtime: 791231220,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	304 },
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	305 )]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	306 .iter()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	307 .cloned()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	308 .collect();
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	309 let mut copymap = FastHashMap::default();
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	310 copymap.insert(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	311 HgPathBuf::from_bytes(b"f1"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	312 HgPathBuf::from_bytes(b"copyname"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	313 );
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	314 let parents = DirstateParents {
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	315 p1: b"12345678910111213141".into(),
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	316 p2: b"00000000000000000000".into(),
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	317 };
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	318 let now = Timestamp(15000000);
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	319 let result =
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	320 pack_dirstate(&mut state_map, &copymap, parents.clone(), now)
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	321 .unwrap();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	322
45357 27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	323 let (new_parents, entries, copies) =
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	324 parse_dirstate(result.as_slice()).unwrap();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	325 let new_state_map: StateMap = entries
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	326 .into_iter()
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	327 .map(\|(path, entry)\| (path.to_owned(), entry))
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	328 .collect();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	329 let new_copy_map: CopyMap = copies
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	330 .into_iter()
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	331 .map(\|(path, copy)\| (path.to_owned(), copy.to_owned()))
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	332 .collect();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	333
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	334 assert_eq!(
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	335 (&parents, state_map, copymap),
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	336 (new_parents, new_state_map, new_copy_map)
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	337 )
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	338 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	339
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	340 #[test]
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	341 fn test_parse_pack_multiple_entries_with_copy() {
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	342 let mut state_map: StateMap = [
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	343 (
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	344 HgPathBuf::from_bytes(b"f1"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	345 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	346 state: EntryState::Normal,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	347 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	348 size: 0,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	349 mtime: 791231220,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	350 },
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	351 ),
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	352 (
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	353 HgPathBuf::from_bytes(b"f2"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	354 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	355 state: EntryState::Merged,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	356 mode: 0o777,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	357 size: 1000,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	358 mtime: 791231220,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	359 },
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	360 ),
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	361 (
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	362 HgPathBuf::from_bytes(b"f3"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	363 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	364 state: EntryState::Removed,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	365 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	366 size: 234553,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	367 mtime: 791231220,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	368 },
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	369 ),
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	370 (
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	371 HgPathBuf::from_bytes(b"f4\xF6"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	372 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	373 state: EntryState::Added,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	374 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	375 size: -1,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	376 mtime: -1,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	377 },
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	378 ),
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	379 ]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	380 .iter()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	381 .cloned()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	382 .collect();
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	383 let mut copymap = FastHashMap::default();
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	384 copymap.insert(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	385 HgPathBuf::from_bytes(b"f1"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	386 HgPathBuf::from_bytes(b"copyname"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	387 );
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	388 copymap.insert(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	389 HgPathBuf::from_bytes(b"f4\xF6"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	390 HgPathBuf::from_bytes(b"copyname2"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	391 );
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	392 let parents = DirstateParents {
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	393 p1: b"12345678910111213141".into(),
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	394 p2: b"00000000000000000000".into(),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	395 };
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	396 let now = Timestamp(15000000);
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	397 let result =
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	398 pack_dirstate(&mut state_map, &copymap, parents.clone(), now)
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	399 .unwrap();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	400
45357 27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	401 let (new_parents, entries, copies) =
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	402 parse_dirstate(result.as_slice()).unwrap();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	403 let new_state_map: StateMap = entries
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	404 .into_iter()
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	405 .map(\|(path, entry)\| (path.to_owned(), entry))
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	406 .collect();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	407 let new_copy_map: CopyMap = copies
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	408 .into_iter()
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	409 .map(\|(path, copy)\| (path.to_owned(), copy.to_owned()))
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	410 .collect();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	411
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	412 assert_eq!(
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	413 (&parents, state_map, copymap),
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	414 (new_parents, new_state_map, new_copy_map)
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	415 )
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	416 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	417
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	418 #[test]
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	419 /// https://www.mercurial-scm.org/repo/hg/rev/af3f26b6bba4
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	420 fn test_parse_pack_one_entry_with_copy_and_time_conflict() {
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	421 let mut state_map: StateMap = [(
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	422 HgPathBuf::from_bytes(b"f1"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	423 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	424 state: EntryState::Normal,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	425 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	426 size: 0,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	427 mtime: 15000000,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	428 },
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	429 )]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	430 .iter()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	431 .cloned()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	432 .collect();
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	433 let mut copymap = FastHashMap::default();
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	434 copymap.insert(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	435 HgPathBuf::from_bytes(b"f1"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	436 HgPathBuf::from_bytes(b"copyname"),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	437 );
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	438 let parents = DirstateParents {
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	439 p1: b"12345678910111213141".into(),
98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46594 diff changeset	440 p2: b"00000000000000000000".into(),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	441 };
47101 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47097 diff changeset	442 let now = Timestamp(15000000);
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	443 let result =
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	444 pack_dirstate(&mut state_map, &copymap, parents.clone(), now)
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	445 .unwrap();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	446
45357 27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	447 let (new_parents, entries, copies) =
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	448 parse_dirstate(result.as_slice()).unwrap();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	449 let new_state_map: StateMap = entries
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	450 .into_iter()
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	451 .map(\|(path, entry)\| (path.to_owned(), entry))
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	452 .collect();
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	453 let new_copy_map: CopyMap = copies
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	454 .into_iter()
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	455 .map(\|(path, copy)\| (path.to_owned(), copy.to_owned()))
27424779c5b8 hg-core: make parse_dirstate return references rather than update hashmaps Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	456 .collect();
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	457
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	458 assert_eq!(
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	459 (
46594 f88e8ae0aa8f rust: Rewrite dirstate parsing usin the `bytes-cast` crate Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	460 &parents,
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	461 [(
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42799 diff changeset	462 HgPathBuf::from_bytes(b"f1"),
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	463 DirstateEntry {
42749 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42748 diff changeset	464 state: EntryState::Normal,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	465 mode: 0o644,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	466 size: 0,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	467 mtime: -1
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	468 }
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	469 )]
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	470 .iter()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	471 .cloned()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	472 .collect::<StateMap>(),
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	473 copymap,
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	474 ),
42748 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	475 (new_parents, new_state_map, new_copy_map)
42302 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	476 )
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	477 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	478 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/dirstate/parsers.rs @ 47124:cd8ca38fccff