36 /// A `DirstateEntry` with a size of `-2` means that it was merged from the |
36 /// A `DirstateEntry` with a size of `-2` means that it was merged from the |
37 /// other parent. This allows revert to pick the right status back during a |
37 /// other parent. This allows revert to pick the right status back during a |
38 /// merge. |
38 /// merge. |
39 pub const SIZE_FROM_OTHER_PARENT: i32 = -2; |
39 pub const SIZE_FROM_OTHER_PARENT: i32 = -2; |
40 |
40 |
|
41 #[cfg(not(feature = "dirstate-tree"))] |
41 pub type StateMap = FastHashMap<HgPathBuf, DirstateEntry>; |
42 pub type StateMap = FastHashMap<HgPathBuf, DirstateEntry>; |
|
43 #[cfg(not(feature = "dirstate-tree"))] |
42 pub type StateMapIter<'a> = hash_map::Iter<'a, HgPathBuf, DirstateEntry>; |
44 pub type StateMapIter<'a> = hash_map::Iter<'a, HgPathBuf, DirstateEntry>; |
|
45 |
|
46 #[cfg(feature = "dirstate-tree")] |
|
47 pub type StateMap = dirstate_tree::tree::Tree; |
|
48 #[cfg(feature = "dirstate-tree")] |
|
49 pub type StateMapIter<'a> = dirstate_tree::iter::Iter<'a>; |
43 pub type CopyMap = FastHashMap<HgPathBuf, HgPathBuf>; |
50 pub type CopyMap = FastHashMap<HgPathBuf, HgPathBuf>; |
44 pub type CopyMapIter<'a> = hash_map::Iter<'a, HgPathBuf, HgPathBuf>; |
51 pub type CopyMapIter<'a> = hash_map::Iter<'a, HgPathBuf, HgPathBuf>; |
45 |
52 |
46 #[derive(Copy, Clone, Debug, Eq, PartialEq)] |
53 #[derive(Copy, Clone, Debug, Eq, PartialEq)] |
47 pub enum EntryState { |
54 pub enum EntryState { |