| Alphare |
| hg-reviewers |
This version:
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| rust/Cargo.lock | ||
|---|---|---|
| 3 | This is not supposed to be here yet (since we're still on 1.41.1 officially), so I'll remove it from the changeset. | |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/Cargo.lock (6 lines) | |||
| M | rust/hg-core/Cargo.toml (2 lines) | |||
| M | rust/hg-core/src/repo.rs (15 lines) |
| sha-1 = "0.9.6" | sha-1 = "0.9.6" | ||||
| twox-hash = "1.5.0" | twox-hash = "1.5.0" | ||||
| same-file = "1.0.6" | same-file = "1.0.6" | ||||
| stable_deref_trait = "1.2.0" | stable_deref_trait = "1.2.0" | ||||
| tempfile = "3.1.0" | tempfile = "3.1.0" | ||||
| crossbeam-channel = "0.4" | crossbeam-channel = "0.4" | ||||
| micro-timer = "0.3.0" | micro-timer = "0.3.0" | ||||
| log = "0.4.8" | log = "0.4.8" | ||||
| memmap2 = "0.3.1" | memmap2 = {version = "0.4", features = ["stable_deref_trait"]} | ||||
| zstd = "0.5.3" | zstd = "0.5.3" | ||||
| format-bytes = "0.2.2" | format-bytes = "0.2.2" | ||||
| # We don't use the `miniz-oxide` backend to not change rhg benchmarks and until | # We don't use the `miniz-oxide` backend to not change rhg benchmarks and until | ||||
| # we have a clearer view of which backend is the fastest. | # we have a clearer view of which backend is the fastest. | ||||
| [dependencies.flate2] | [dependencies.flate2] | ||||
| version = "1.0.16" | version = "1.0.16" | ||||
| features = ["zlib"] | features = ["zlib"] | ||||
| default-features = false | default-features = false | ||||
| [dev-dependencies] | [dev-dependencies] | ||||
| clap = "*" | clap = "*" | ||||
| pretty_assertions = "0.6.1" | pretty_assertions = "0.6.1" | ||||
| self.dirstate_parents.set(Some(docket.parents())); | self.dirstate_parents.set(Some(docket.parents())); | ||||
| let data_size = docket.data_size(); | let data_size = docket.data_size(); | ||||
| let metadata = docket.tree_metadata(); | let metadata = docket.tree_metadata(); | ||||
| let mut map = if let Some(data_mmap) = self | let mut map = if let Some(data_mmap) = self | ||||
| .hg_vfs() | .hg_vfs() | ||||
| .mmap_open(docket.data_filename()) | .mmap_open(docket.data_filename()) | ||||
| .io_not_found_as_none()? | .io_not_found_as_none()? | ||||
| { | { | ||||
| OwningDirstateMap::new_empty(MmapWrapper(data_mmap)) | OwningDirstateMap::new_empty(data_mmap) | ||||
| } else { | } else { | ||||
| OwningDirstateMap::new_empty(Vec::new()) | OwningDirstateMap::new_empty(Vec::new()) | ||||
| }; | }; | ||||
| let (on_disk, placeholder) = map.get_mut_pair(); | let (on_disk, placeholder) = map.get_mut_pair(); | ||||
| *placeholder = DirstateMap::new_v2(on_disk, data_size, metadata)?; | *placeholder = DirstateMap::new_v2(on_disk, data_size, metadata)?; | ||||
| Ok(map) | Ok(map) | ||||
| } else { | } else { | ||||
| let mut map = OwningDirstateMap::new_empty(dirstate_file_contents); | let mut map = OwningDirstateMap::new_empty(dirstate_file_contents); | ||||
| pub fn get_mut_or_init(&self, repo: &Repo) -> Result<RefMut<T>, E> { | pub fn get_mut_or_init(&self, repo: &Repo) -> Result<RefMut<T>, E> { | ||||
| let mut borrowed = self.value.borrow_mut(); | let mut borrowed = self.value.borrow_mut(); | ||||
| if borrowed.is_none() { | if borrowed.is_none() { | ||||
| *borrowed = Some((self.init)(repo)?); | *borrowed = Some((self.init)(repo)?); | ||||
| } | } | ||||
| Ok(RefMut::map(borrowed, |option| option.as_mut().unwrap())) | Ok(RefMut::map(borrowed, |option| option.as_mut().unwrap())) | ||||
| } | } | ||||
| } | } | ||||
| // TODO: remove this when https://github.com/RazrFalcon/memmap2-rs/pull/22 is on crates.io | |||||
| struct MmapWrapper(memmap2::Mmap); | |||||
| impl std::ops::Deref for MmapWrapper { | |||||
| type Target = [u8]; | |||||
| fn deref(&self) -> &[u8] { | |||||
| self.0.deref() | |||||
| } | |||||
| } | |||||
| unsafe impl stable_deref_trait::StableDeref for MmapWrapper {} | |||||
This is not supposed to be here yet (since we're still on 1.41.1 officially), so I'll remove it from the changeset.