rust-dirstate-status: add first Rust implementation of `dirstate.status` Note: This patch also added the rayon crate as a Cargo dependency. It will help us immensely in making Rust code parallel and easy to maintain. It is a stable, well-known, and supported crate maintained by people on the Rust team. The current `dirstate.status` method has grown over the years through bug reports and new features to the point where it got too big and too complex. This series does not yet improve the logic, but adds a Rust fast-path to speed up certain cases. Tested on mozilla-try-2019-02-18 with zstd compression: - `hg diff` on an empty working copy: - c: 1.64(+-)0.04s - rust+c before this change: 2.84(+-)0.1s - rust+c: 849(+-)40ms - `hg commit` when creating a file: - c: 5.960s - rust+c before this change: 5.828s - rust+c: 4.668s - `hg commit` when updating a file: - c: 4.866s - rust+c before this change: 4.371s - rust+c: 3.855s - `hg status -mard` - c: 1.82(+-)0.04s - rust+c before this change: 2.64(+-)0.1s - rust+c: 896(+-)30ms The numbers are clear: the current Rust `dirstatemap` implementation is super slow, its performance needs to be addressed. This will be done in a future series, immediately after this one, with the goal of getting Rust to be at least to the speed of the Python + C implementation in all cases before the 5.2 freeze. At worse, we gate dirstatemap to only be used in those cases. Cases where the fast-path is not executed: - for commands that need ignore support (`status`, for example) - if subrepos are found (should not be hard to add, but winter is coming) - any other matcher than an `alwaysmatcher`, like patterns, etc. - with extensions like `sparse` and `fsmonitor` The next step after this is to rethink the logic to be closer to Jane Street's Valentin Gatien-Baron's Rust fast-path which does a lot less work when possible. Differential Revision: https://phab.mercurial-scm.org/D7058

     1

// dirstate module

     2

//

     3

// Copyright 2019 Raphaël Gomès <rgomes@octobus.net>

     4

//

     5

// This software may be used and distributed according to the terms of the

     6

// GNU General Public License version 2 or any later version.

     7

     8

use crate::{utils::hg_path::HgPathBuf, DirstateParseError};

     9

use std::collections::hash_map;

    10

use std::collections::HashMap;

    11

use std::convert::TryFrom;

    12

    13

pub mod dirs_multiset;

    14

pub mod dirstate_map;

    15

pub mod parsers;

    16

pub mod status;

    17

    18

#[derive(Debug, PartialEq, Clone)]

    19

pub struct DirstateParents {

    20

    pub p1: [u8; 20],

    21

    pub p2: [u8; 20],

    22

}

    23

    24

/// The C implementation uses all signed types. This will be an issue

    25

/// either when 4GB+ source files are commonplace or in 2038, whichever

    26

/// comes first.

    27

#[derive(Debug, PartialEq, Copy, Clone)]

    28

pub struct DirstateEntry {

    29

    pub state: EntryState,

    30

    pub mode: i32,

    31

    pub mtime: i32,

    32

    pub size: i32,

    33

}

    34

    35

pub type StateMap = HashMap<HgPathBuf, DirstateEntry>;

    36

pub type StateMapIter<'a> = hash_map::Iter<'a, HgPathBuf, DirstateEntry>;

    37

pub type CopyMap = HashMap<HgPathBuf, HgPathBuf>;

    38

pub type CopyMapIter<'a> = hash_map::Iter<'a, HgPathBuf, HgPathBuf>;

    39

    40

#[derive(Copy, Clone, Debug, Eq, PartialEq)]

    41

pub enum EntryState {

    42

    Normal,

    43

    Added,

    44

    Removed,

    45

    Merged,

    46

    Unknown,

    47

}

    48

    49

impl TryFrom<u8> for EntryState {

    50

    type Error = DirstateParseError;

    51

    52

    fn try_from(value: u8) -> Result<Self, Self::Error> {

    53

        match value {

    54

            b'n' => Ok(EntryState::Normal),

    55

            b'a' => Ok(EntryState::Added),

    56

            b'r' => Ok(EntryState::Removed),

    57

            b'm' => Ok(EntryState::Merged),

    58

            b'?' => Ok(EntryState::Unknown),

    59

            _ => Err(DirstateParseError::CorruptedEntry(format!(

    60

                "Incorrect entry state {}",

    61

                value

    62

            ))),

    63

        }

    64

    }

    65

}

    66

    67

impl Into<u8> for EntryState {

    68

    fn into(self) -> u8 {

    69

        match self {

    70

            EntryState::Normal => b'n',

    71

            EntryState::Added => b'a',

    72

            EntryState::Removed => b'r',

    73

            EntryState::Merged => b'm',

    74

            EntryState::Unknown => b'?',

    75

        }

    76

    }

    77

}