dirstate_map.rs
521 lines
| 16.0 KiB
| application/rls-services+xml
|
RustLexer
|
r42999 | // dirstate_map.rs | ||
// | ||||
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net> | ||||
// | ||||
// This software may be used and distributed according to the terms of the | ||||
// GNU General Public License version 2 or any later version. | ||||
//! Bindings for the `hg::dirstate::dirstate_map` file provided by the | ||||
//! `hg-core` package. | ||||
|
r43567 | use std::cell::{Ref, RefCell}; | ||
|
r42999 | use std::convert::TryInto; | ||
use std::time::Duration; | ||||
use cpython::{ | ||||
exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyObject, | ||||
PyResult, PyTuple, Python, PythonObject, ToPyObject, | ||||
}; | ||||
use crate::{ | ||||
dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator}, | ||||
|
r43479 | dirstate::{dirs_multiset::Dirs, make_dirstate_tuple}, | ||
|
r43447 | ref_sharing::{PyLeakedRef, PySharedRefCell}, | ||
|
r42999 | }; | ||
use hg::{ | ||||
|
r43227 | utils::hg_path::{HgPath, HgPathBuf}, | ||
|
r43070 | DirsMultiset, DirstateEntry, DirstateMap as RustDirstateMap, | ||
|
r43158 | DirstateParents, DirstateParseError, EntryState, StateMapIter, | ||
PARENT_SIZE, | ||||
|
r42999 | }; | ||
// TODO | ||||
// This object needs to share references to multiple members of its Rust | ||||
// inner struct, namely `copy_map`, `dirs` and `all_dirs`. | ||||
// Right now `CopyMap` is done, but it needs to have an explicit reference | ||||
// to `RustDirstateMap` which itself needs to have an encapsulation for | ||||
// every method in `CopyMap` (copymapcopy, etc.). | ||||
// This is ugly and hard to maintain. | ||||
// The same logic applies to `dirs` and `all_dirs`, however the `Dirs` | ||||
// `py_class!` is already implemented and does not mention | ||||
// `RustDirstateMap`, rightfully so. | ||||
// All attributes also have to have a separate refcount data attribute for | ||||
// leaks, with all methods that go along for reference sharing. | ||||
py_class!(pub class DirstateMap |py| { | ||||
|
r43115 | data inner: PySharedRefCell<RustDirstateMap>; | ||
|
r42999 | |||
def __new__(_cls, _root: PyObject) -> PyResult<Self> { | ||||
let inner = RustDirstateMap::default(); | ||||
Self::create_instance( | ||||
py, | ||||
|
r43115 | PySharedRefCell::new(inner), | ||
|
r42999 | ) | ||
} | ||||
def clear(&self) -> PyResult<PyObject> { | ||||
|
r43450 | self.inner_shared(py).borrow_mut()?.clear(); | ||
|
r42999 | Ok(py.None()) | ||
} | ||||
def get( | ||||
&self, | ||||
key: PyObject, | ||||
default: Option<PyObject> = None | ||||
) -> PyResult<Option<PyObject>> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | match self.inner(py).borrow().get(HgPath::new(key.data(py))) { | ||
|
r42999 | Some(entry) => { | ||
|
r43479 | Ok(Some(make_dirstate_tuple(py, entry)?)) | ||
|
r42999 | }, | ||
None => Ok(default) | ||||
} | ||||
} | ||||
def addfile( | ||||
&self, | ||||
f: PyObject, | ||||
oldstate: PyObject, | ||||
state: PyObject, | ||||
mode: PyObject, | ||||
size: PyObject, | ||||
mtime: PyObject | ||||
) -> PyResult<PyObject> { | ||||
|
r43450 | self.inner_shared(py).borrow_mut()?.add_file( | ||
|
r43227 | HgPath::new(f.extract::<PyBytes>(py)?.data(py)), | ||
|
r42999 | oldstate.extract::<PyBytes>(py)?.data(py)[0] | ||
.try_into() | ||||
.map_err(|e: DirstateParseError| { | ||||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?, | ||||
DirstateEntry { | ||||
state: state.extract::<PyBytes>(py)?.data(py)[0] | ||||
.try_into() | ||||
.map_err(|e: DirstateParseError| { | ||||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?, | ||||
mode: mode.extract(py)?, | ||||
size: size.extract(py)?, | ||||
mtime: mtime.extract(py)?, | ||||
}, | ||||
); | ||||
Ok(py.None()) | ||||
} | ||||
def removefile( | ||||
&self, | ||||
f: PyObject, | ||||
oldstate: PyObject, | ||||
size: PyObject | ||||
) -> PyResult<PyObject> { | ||||
|
r43450 | self.inner_shared(py).borrow_mut()? | ||
|
r42999 | .remove_file( | ||
|
r43227 | HgPath::new(f.extract::<PyBytes>(py)?.data(py)), | ||
|
r42999 | oldstate.extract::<PyBytes>(py)?.data(py)[0] | ||
.try_into() | ||||
.map_err(|e: DirstateParseError| { | ||||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?, | ||||
size.extract(py)?, | ||||
) | ||||
.or_else(|_| { | ||||
Err(PyErr::new::<exc::OSError, _>( | ||||
py, | ||||
"Dirstate error".to_string(), | ||||
)) | ||||
})?; | ||||
Ok(py.None()) | ||||
} | ||||
def dropfile( | ||||
&self, | ||||
f: PyObject, | ||||
oldstate: PyObject | ||||
) -> PyResult<PyBool> { | ||||
|
r43450 | self.inner_shared(py).borrow_mut()? | ||
|
r42999 | .drop_file( | ||
|
r43227 | HgPath::new(f.extract::<PyBytes>(py)?.data(py)), | ||
|
r42999 | oldstate.extract::<PyBytes>(py)?.data(py)[0] | ||
.try_into() | ||||
.map_err(|e: DirstateParseError| { | ||||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?, | ||||
) | ||||
.and_then(|b| Ok(b.to_py_object(py))) | ||||
.or_else(|_| { | ||||
Err(PyErr::new::<exc::OSError, _>( | ||||
py, | ||||
"Dirstate error".to_string(), | ||||
)) | ||||
}) | ||||
} | ||||
def clearambiguoustimes( | ||||
&self, | ||||
files: PyObject, | ||||
now: PyObject | ||||
) -> PyResult<PyObject> { | ||||
|
r43227 | let files: PyResult<Vec<HgPathBuf>> = files | ||
|
r42999 | .iter(py)? | ||
.map(|filename| { | ||||
|
r43227 | Ok(HgPathBuf::from_bytes( | ||
filename?.extract::<PyBytes>(py)?.data(py), | ||||
)) | ||||
|
r42999 | }) | ||
.collect(); | ||||
|
r43450 | self.inner_shared(py).borrow_mut()? | ||
|
r42999 | .clear_ambiguous_times(files?, now.extract(py)?); | ||
Ok(py.None()) | ||||
} | ||||
// TODO share the reference | ||||
def nonnormalentries(&self) -> PyResult<PyObject> { | ||||
let (non_normal, other_parent) = | ||||
self.inner(py).borrow().non_normal_other_parent_entries(); | ||||
let locals = PyDict::new(py); | ||||
locals.set_item( | ||||
py, | ||||
"non_normal", | ||||
non_normal | ||||
.iter() | ||||
|
r43227 | .map(|v| PyBytes::new(py, v.as_ref())) | ||
|
r42999 | .collect::<Vec<PyBytes>>() | ||
.to_py_object(py), | ||||
)?; | ||||
locals.set_item( | ||||
py, | ||||
"other_parent", | ||||
other_parent | ||||
.iter() | ||||
|
r43227 | .map(|v| PyBytes::new(py, v.as_ref())) | ||
|
r42999 | .collect::<Vec<PyBytes>>() | ||
.to_py_object(py), | ||||
)?; | ||||
py.eval("set(non_normal), set(other_parent)", None, Some(&locals)) | ||||
} | ||||
def hastrackeddir(&self, d: PyObject) -> PyResult<PyBool> { | ||||
let d = d.extract::<PyBytes>(py)?; | ||||
|
r43450 | Ok(self.inner_shared(py).borrow_mut()? | ||
|
r43227 | .has_tracked_dir(HgPath::new(d.data(py))) | ||
|
r42999 | .to_py_object(py)) | ||
} | ||||
def hasdir(&self, d: PyObject) -> PyResult<PyBool> { | ||||
let d = d.extract::<PyBytes>(py)?; | ||||
|
r43450 | Ok(self.inner_shared(py).borrow_mut()? | ||
|
r43227 | .has_dir(HgPath::new(d.data(py))) | ||
|
r42999 | .to_py_object(py)) | ||
} | ||||
def parents(&self, st: PyObject) -> PyResult<PyTuple> { | ||||
|
r43450 | self.inner_shared(py).borrow_mut()? | ||
|
r42999 | .parents(st.extract::<PyBytes>(py)?.data(py)) | ||
.and_then(|d| { | ||||
Ok((PyBytes::new(py, &d.p1), PyBytes::new(py, &d.p2)) | ||||
.to_py_object(py)) | ||||
}) | ||||
.or_else(|_| { | ||||
Err(PyErr::new::<exc::OSError, _>( | ||||
py, | ||||
"Dirstate error".to_string(), | ||||
)) | ||||
}) | ||||
} | ||||
def setparents(&self, p1: PyObject, p2: PyObject) -> PyResult<PyObject> { | ||||
|
r43068 | let p1 = extract_node_id(py, &p1)?; | ||
let p2 = extract_node_id(py, &p2)?; | ||||
|
r42999 | |||
|
r43450 | self.inner_shared(py).borrow_mut()? | ||
|
r43069 | .set_parents(&DirstateParents { p1, p2 }); | ||
|
r42999 | Ok(py.None()) | ||
} | ||||
def read(&self, st: PyObject) -> PyResult<Option<PyObject>> { | ||||
|
r43450 | match self.inner_shared(py).borrow_mut()? | ||
|
r42999 | .read(st.extract::<PyBytes>(py)?.data(py)) | ||
{ | ||||
Ok(Some(parents)) => Ok(Some( | ||||
(PyBytes::new(py, &parents.p1), PyBytes::new(py, &parents.p2)) | ||||
.to_py_object(py) | ||||
.into_object(), | ||||
)), | ||||
Ok(None) => Ok(Some(py.None())), | ||||
Err(_) => Err(PyErr::new::<exc::OSError, _>( | ||||
py, | ||||
"Dirstate error".to_string(), | ||||
)), | ||||
} | ||||
} | ||||
def write( | ||||
&self, | ||||
p1: PyObject, | ||||
p2: PyObject, | ||||
now: PyObject | ||||
) -> PyResult<PyBytes> { | ||||
let now = Duration::new(now.extract(py)?, 0); | ||||
let parents = DirstateParents { | ||||
|
r43068 | p1: extract_node_id(py, &p1)?, | ||
p2: extract_node_id(py, &p2)?, | ||||
|
r42999 | }; | ||
|
r43450 | match self.inner_shared(py).borrow_mut()?.pack(parents, now) { | ||
|
r42999 | Ok(packed) => Ok(PyBytes::new(py, &packed)), | ||
Err(_) => Err(PyErr::new::<exc::OSError, _>( | ||||
py, | ||||
"Dirstate error".to_string(), | ||||
)), | ||||
} | ||||
} | ||||
def filefoldmapasdict(&self) -> PyResult<PyDict> { | ||||
let dict = PyDict::new(py); | ||||
|
r43450 | for (key, value) in | ||
self.inner_shared(py).borrow_mut()?.build_file_fold_map().iter() | ||||
{ | ||||
|
r43227 | dict.set_item(py, key.as_ref().to_vec(), value.as_ref().to_vec())?; | ||
|
r42999 | } | ||
Ok(dict) | ||||
} | ||||
def __len__(&self) -> PyResult<usize> { | ||||
Ok(self.inner(py).borrow().len()) | ||||
} | ||||
def __contains__(&self, key: PyObject) -> PyResult<bool> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | Ok(self.inner(py).borrow().contains_key(HgPath::new(key.data(py)))) | ||
|
r42999 | } | ||
def __getitem__(&self, key: PyObject) -> PyResult<PyObject> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | let key = HgPath::new(key.data(py)); | ||
|
r42999 | match self.inner(py).borrow().get(key) { | ||
Some(entry) => { | ||||
|
r43479 | Ok(make_dirstate_tuple(py, entry)?) | ||
|
r42999 | }, | ||
None => Err(PyErr::new::<exc::KeyError, _>( | ||||
py, | ||||
|
r43227 | String::from_utf8_lossy(key.as_bytes()), | ||
|
r42999 | )), | ||
} | ||||
} | ||||
def keys(&self) -> PyResult<DirstateMapKeysIterator> { | ||||
|
r43578 | let mut leak_handle = | ||
|
r43449 | unsafe { self.inner_shared(py).leak_immutable()? }; | ||
|
r43578 | let leaked_ref = leak_handle.data.take().unwrap(); | ||
|
r42999 | DirstateMapKeysIterator::from_inner( | ||
py, | ||||
|
r43160 | leak_handle, | ||
|
r43158 | leaked_ref.iter(), | ||
|
r42999 | ) | ||
} | ||||
def items(&self) -> PyResult<DirstateMapItemsIterator> { | ||||
|
r43578 | let mut leak_handle = | ||
|
r43449 | unsafe { self.inner_shared(py).leak_immutable()? }; | ||
|
r43578 | let leaked_ref = leak_handle.data.take().unwrap(); | ||
|
r42999 | DirstateMapItemsIterator::from_inner( | ||
py, | ||||
|
r43160 | leak_handle, | ||
|
r43158 | leaked_ref.iter(), | ||
|
r42999 | ) | ||
} | ||||
def __iter__(&self) -> PyResult<DirstateMapKeysIterator> { | ||||
|
r43578 | let mut leak_handle = | ||
|
r43449 | unsafe { self.inner_shared(py).leak_immutable()? }; | ||
|
r43578 | let leaked_ref = leak_handle.data.take().unwrap(); | ||
|
r42999 | DirstateMapKeysIterator::from_inner( | ||
py, | ||||
|
r43160 | leak_handle, | ||
|
r43158 | leaked_ref.iter(), | ||
|
r42999 | ) | ||
} | ||||
def getdirs(&self) -> PyResult<Dirs> { | ||||
// TODO don't copy, share the reference | ||||
|
r43450 | self.inner_shared(py).borrow_mut()?.set_dirs(); | ||
|
r42999 | Dirs::from_inner( | ||
py, | ||||
|
r43070 | DirsMultiset::from_dirstate( | ||
&self.inner(py).borrow(), | ||||
|
r42999 | Some(EntryState::Removed), | ||
), | ||||
) | ||||
} | ||||
def getalldirs(&self) -> PyResult<Dirs> { | ||||
// TODO don't copy, share the reference | ||||
|
r43450 | self.inner_shared(py).borrow_mut()?.set_all_dirs(); | ||
|
r42999 | Dirs::from_inner( | ||
py, | ||||
|
r43070 | DirsMultiset::from_dirstate( | ||
&self.inner(py).borrow(), | ||||
|
r42999 | None, | ||
), | ||||
) | ||||
} | ||||
// TODO all copymap* methods, see docstring above | ||||
def copymapcopy(&self) -> PyResult<PyDict> { | ||||
let dict = PyDict::new(py); | ||||
for (key, value) in self.inner(py).borrow().copy_map.iter() { | ||||
|
r43227 | dict.set_item( | ||
py, | ||||
PyBytes::new(py, key.as_ref()), | ||||
PyBytes::new(py, value.as_ref()), | ||||
)?; | ||||
|
r42999 | } | ||
Ok(dict) | ||||
} | ||||
def copymapgetitem(&self, key: PyObject) -> PyResult<PyBytes> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | match self.inner(py).borrow().copy_map.get(HgPath::new(key.data(py))) { | ||
Some(copy) => Ok(PyBytes::new(py, copy.as_ref())), | ||||
|
r42999 | None => Err(PyErr::new::<exc::KeyError, _>( | ||
py, | ||||
String::from_utf8_lossy(key.data(py)), | ||||
)), | ||||
} | ||||
} | ||||
def copymap(&self) -> PyResult<CopyMap> { | ||||
CopyMap::from_inner(py, self.clone_ref(py)) | ||||
} | ||||
def copymaplen(&self) -> PyResult<usize> { | ||||
Ok(self.inner(py).borrow().copy_map.len()) | ||||
} | ||||
def copymapcontains(&self, key: PyObject) -> PyResult<bool> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | Ok(self | ||
.inner(py) | ||||
.borrow() | ||||
.copy_map | ||||
.contains_key(HgPath::new(key.data(py)))) | ||||
|
r42999 | } | ||
def copymapget( | ||||
&self, | ||||
key: PyObject, | ||||
default: Option<PyObject> | ||||
) -> PyResult<Option<PyObject>> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | match self | ||
.inner(py) | ||||
.borrow() | ||||
.copy_map | ||||
.get(HgPath::new(key.data(py))) | ||||
{ | ||||
Some(copy) => Ok(Some( | ||||
PyBytes::new(py, copy.as_ref()).into_object(), | ||||
)), | ||||
|
r42999 | None => Ok(default), | ||
} | ||||
} | ||||
def copymapsetitem( | ||||
&self, | ||||
key: PyObject, | ||||
value: PyObject | ||||
) -> PyResult<PyObject> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
let value = value.extract::<PyBytes>(py)?; | ||||
|
r43450 | self.inner_shared(py).borrow_mut()?.copy_map.insert( | ||
|
r43227 | HgPathBuf::from_bytes(key.data(py)), | ||
HgPathBuf::from_bytes(value.data(py)), | ||||
); | ||||
|
r42999 | Ok(py.None()) | ||
} | ||||
def copymappop( | ||||
&self, | ||||
key: PyObject, | ||||
default: Option<PyObject> | ||||
) -> PyResult<Option<PyObject>> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | match self | ||
|
r43450 | .inner_shared(py) | ||
.borrow_mut()? | ||||
|
r43227 | .copy_map | ||
.remove(HgPath::new(key.data(py))) | ||||
{ | ||||
|
r42999 | Some(_) => Ok(None), | ||
None => Ok(default), | ||||
} | ||||
} | ||||
def copymapiter(&self) -> PyResult<CopyMapKeysIterator> { | ||||
|
r43578 | let mut leak_handle = | ||
|
r43449 | unsafe { self.inner_shared(py).leak_immutable()? }; | ||
|
r43578 | let leaked_ref = leak_handle.data.take().unwrap(); | ||
|
r42999 | CopyMapKeysIterator::from_inner( | ||
py, | ||||
|
r43160 | leak_handle, | ||
|
r43158 | leaked_ref.copy_map.iter(), | ||
|
r42999 | ) | ||
} | ||||
def copymapitemsiter(&self) -> PyResult<CopyMapItemsIterator> { | ||||
|
r43578 | let mut leak_handle = | ||
|
r43449 | unsafe { self.inner_shared(py).leak_immutable()? }; | ||
|
r43578 | let leaked_ref = leak_handle.data.take().unwrap(); | ||
|
r42999 | CopyMapItemsIterator::from_inner( | ||
py, | ||||
|
r43160 | leak_handle, | ||
|
r43158 | leaked_ref.copy_map.iter(), | ||
|
r42999 | ) | ||
} | ||||
}); | ||||
impl DirstateMap { | ||||
|
r43567 | pub fn get_inner<'a>( | ||
&'a self, | ||||
py: Python<'a>, | ||||
) -> Ref<'a, RustDirstateMap> { | ||||
self.inner_shared(py).borrow() | ||||
} | ||||
|
r42999 | fn translate_key( | ||
py: Python, | ||||
|
r43227 | res: (&HgPathBuf, &DirstateEntry), | ||
|
r42999 | ) -> PyResult<Option<PyBytes>> { | ||
|
r43227 | Ok(Some(PyBytes::new(py, res.0.as_ref()))) | ||
|
r42999 | } | ||
fn translate_key_value( | ||||
py: Python, | ||||
|
r43227 | res: (&HgPathBuf, &DirstateEntry), | ||
|
r42999 | ) -> PyResult<Option<(PyBytes, PyObject)>> { | ||
let (f, entry) = res; | ||||
Ok(Some(( | ||||
|
r43227 | PyBytes::new(py, f.as_ref()), | ||
|
r43479 | make_dirstate_tuple(py, entry)?, | ||
|
r42999 | ))) | ||
} | ||||
} | ||||
|
r43448 | py_shared_ref!(DirstateMap, RustDirstateMap, inner, inner_shared); | ||
|
r42999 | |||
|
r43159 | py_shared_iterator!( | ||
|
r42999 | DirstateMapKeysIterator, | ||
|
r43578 | PyLeakedRef<&'static RustDirstateMap>, | ||
|
r43158 | StateMapIter<'static>, | ||
|
r42999 | DirstateMap::translate_key, | ||
Option<PyBytes> | ||||
); | ||||
|
r43159 | py_shared_iterator!( | ||
|
r42999 | DirstateMapItemsIterator, | ||
|
r43578 | PyLeakedRef<&'static RustDirstateMap>, | ||
|
r43158 | StateMapIter<'static>, | ||
|
r42999 | DirstateMap::translate_key_value, | ||
Option<(PyBytes, PyObject)> | ||||
); | ||||
|
r43068 | |||
fn extract_node_id(py: Python, obj: &PyObject) -> PyResult<[u8; PARENT_SIZE]> { | ||||
let bytes = obj.extract::<PyBytes>(py)?; | ||||
match bytes.data(py).try_into() { | ||||
Ok(s) => Ok(s), | ||||
Err(e) => Err(PyErr::new::<exc::ValueError, _>(py, e.to_string())), | ||||
} | ||||
} | ||||