##// END OF EJS Templates
bundlerepo: fix mismatches with repository and revlog classes...
bundlerepo: fix mismatches with repository and revlog classes Both pytype and PyCharm complained that `write()` and `_write()` in the bundlephasecache class aren't proper overrides- indeed they seem to be missing an argument that the base class has. PyCharm and pytype also complained that the `revlog.revlog` class doesn't have a `_chunk()` method. That looks like it was moved from revlog to `_InnerRevlog` back in e8ad6d8de8b8, and wasn't caught because this module wasn't type checked. However, I couldn't figure out a syntax with `revlog.revlog._inner._chunk(self, rev)`, as it complained about passing too many args. `bundlerevlog._rawtext()` uses this `super(...)` style to call the super class, so hopefully that works, even with the wonky dynamic subclassing. The revlog class needed the `_InnerRevlog` field typed because it isn't set in the constructor. Finally, the vfs type hints look broken. This initially failed with: File "/mnt/c/Users/Matt/hg/mercurial/bundlerepo.py", line 65, in __init__: Function readonlyvfs.__init__ was called with the wrong arguments [wrong-arg-types] Expected: (self, vfs: mercurial.vfs.vfs) Actually passed: (self, vfs: Callable) Called from (traceback): line 232, in dirlog line 214, in __init__ I don't see a raw Callable, but I tried changing some of the vfs args to be typed as `vfsmod.abstractvfs`, but that class doesn't have `options`, so it failed elsewhere. `readonlyvfs` isn't a subclass of `vfs` (it's a subclass of `abstractvfs`), so I'm not sure how to handle that. It would be a shame to have to make a union of vfs subclasses (but not all of them have `options` either).

File last commit:

r51575:2cc5de26 default
r52764:cfd30df0 default
Show More
owning.rs
91 lines | 2.3 KiB | application/rls-services+xml | RustLexer
use crate::{DirstateError, DirstateParents};
use super::dirstate_map::DirstateMap;
use self_cell::self_cell;
use std::ops::Deref;
self_cell!(
/// Keep a `DirstateMap<'owner>` next to the `owner` buffer that it
/// borrows.
pub struct OwningDirstateMap {
owner: Box<dyn Deref<Target = [u8]> + Send>,
#[covariant]
dependent: DirstateMap,
}
);
impl OwningDirstateMap {
pub fn new_empty<OnDisk>(on_disk: OnDisk) -> Self
where
OnDisk: Deref<Target = [u8]> + Send + 'static,
{
let on_disk = Box::new(on_disk);
OwningDirstateMap::new(on_disk, |bytes| DirstateMap::empty(bytes))
}
pub fn new_v1<OnDisk>(
on_disk: OnDisk,
identity: Option<u64>,
) -> Result<(Self, DirstateParents), DirstateError>
where
OnDisk: Deref<Target = [u8]> + Send + 'static,
{
let on_disk = Box::new(on_disk);
let mut parents = DirstateParents::NULL;
Ok((
OwningDirstateMap::try_new(on_disk, |bytes| {
DirstateMap::new_v1(bytes, identity).map(|(dmap, p)| {
parents = p.unwrap_or(DirstateParents::NULL);
dmap
})
})?,
parents,
))
}
pub fn new_v2<OnDisk>(
on_disk: OnDisk,
data_size: usize,
metadata: &[u8],
uuid: Vec<u8>,
identity: Option<u64>,
) -> Result<Self, DirstateError>
where
OnDisk: Deref<Target = [u8]> + Send + 'static,
{
let on_disk = Box::new(on_disk);
OwningDirstateMap::try_new(on_disk, |bytes| {
DirstateMap::new_v2(bytes, data_size, metadata, uuid, identity)
})
}
pub fn with_dmap_mut<R>(
&mut self,
f: impl FnOnce(&mut DirstateMap) -> R,
) -> R {
self.with_dependent_mut(|_owner, dmap| f(dmap))
}
pub fn get_map(&self) -> &DirstateMap {
self.borrow_dependent()
}
pub fn on_disk(&self) -> &[u8] {
self.borrow_owner()
}
pub fn old_uuid(&self) -> Option<&[u8]> {
self.get_map().old_uuid.as_deref()
}
pub fn old_identity(&self) -> Option<u64> {
self.get_map().identity
}
pub fn old_data_size(&self) -> usize {
self.get_map().old_data_size
}
}