dirstate_map.rs
590 lines
| 18.8 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. | ||||
|
r47882 | use std::cell::{RefCell, RefMut}; | ||
|
r42999 | use std::convert::TryInto; | ||
use cpython::{ | ||||
|
r44836 | exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList, | ||
|
r47891 | PyObject, PyResult, PySet, PyString, Python, PythonObject, ToPyObject, | ||
UnsafePyLeaked, | ||||
|
r42999 | }; | ||
use crate::{ | ||||
dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator}, | ||||
|
r44903 | dirstate::non_normal_entries::{ | ||
NonNormalEntries, NonNormalEntriesIterator, | ||||
}, | ||||
|
r47893 | dirstate::owning::OwningDirstateMap, | ||
|
r43479 | dirstate::{dirs_multiset::Dirs, make_dirstate_tuple}, | ||
|
r47337 | parsers::dirstate_parents_to_pytuple, | ||
|
r42999 | }; | ||
use hg::{ | ||||
|
r47871 | dirstate::parsers::Timestamp, | ||
|
r47863 | dirstate_tree::dispatch::DirstateMapMethods, | ||
|
r48126 | dirstate_tree::on_disk::DirstateV2ParseError, | ||
|
r47169 | errors::HgError, | ||
|
r47337 | revlog::Node, | ||
|
r47879 | utils::files::normalize_case, | ||
|
r43227 | utils::hg_path::{HgPath, HgPathBuf}, | ||
|
r47892 | DirsMultiset, DirstateEntry, DirstateError, | ||
|
r48126 | DirstateMap as RustDirstateMap, DirstateParents, EntryState, StateMapIter, | ||
|
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| { | ||||
|
r47863 | @shared data inner: Box<dyn DirstateMapMethods + Send>; | ||
|
r42999 | |||
|
r47892 | /// Returns a `(dirstate_map, parents)` tuple | ||
@staticmethod | ||||
|
r48055 | def new( | ||
use_dirstate_tree: bool, | ||||
use_dirstate_v2: bool, | ||||
on_disk: PyBytes, | ||||
) -> PyResult<PyObject> { | ||||
let dirstate_error = |e: DirstateError| { | ||||
PyErr::new::<exc::OSError, _>(py, format!("Dirstate error: {:?}", e)) | ||||
|
r47892 | }; | ||
|
r48055 | let (inner, parents) = if use_dirstate_tree || use_dirstate_v2 { | ||
|
r47893 | let (map, parents) = | ||
|
r48055 | OwningDirstateMap::new(py, on_disk, use_dirstate_v2) | ||
|
r47893 | .map_err(dirstate_error)?; | ||
|
r47892 | (Box::new(map) as _, parents) | ||
|
r47865 | } else { | ||
|
r47893 | let bytes = on_disk.data(py); | ||
|
r47892 | let mut map = RustDirstateMap::default(); | ||
let parents = map.read(bytes).map_err(dirstate_error)?; | ||||
(Box::new(map) as _, parents) | ||||
|
r47865 | }; | ||
|
r47892 | let map = Self::create_instance(py, inner)?; | ||
let parents = parents.map(|p| dirstate_parents_to_pytuple(py, &p)); | ||||
Ok((map, parents).to_py_object(py).into_object()) | ||||
|
r42999 | } | ||
def clear(&self) -> PyResult<PyObject> { | ||||
|
r44702 | self.inner(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)?; | ||||
|
r48126 | match self | ||
.inner(py) | ||||
.borrow() | ||||
.get(HgPath::new(key.data(py))) | ||||
.map_err(|e| v2_error(py, e))? | ||||
{ | ||||
|
r42999 | Some(entry) => { | ||
|
r48123 | 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> { | ||||
|
r44702 | self.inner(py).borrow_mut().add_file( | ||
|
r43227 | HgPath::new(f.extract::<PyBytes>(py)?.data(py)), | ||
|
r42999 | oldstate.extract::<PyBytes>(py)?.data(py)[0] | ||
.try_into() | ||||
|
r47169 | .map_err(|e: HgError| { | ||
|
r42999 | PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||
})?, | ||||
DirstateEntry { | ||||
state: state.extract::<PyBytes>(py)?.data(py)[0] | ||||
.try_into() | ||||
|
r47169 | .map_err(|e: HgError| { | ||
|
r42999 | PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||
})?, | ||||
mode: mode.extract(py)?, | ||||
size: size.extract(py)?, | ||||
mtime: mtime.extract(py)?, | ||||
}, | ||||
|
r48126 | ).and(Ok(py.None())).or_else(|e: DirstateError| { | ||
|
r44227 | Err(PyErr::new::<exc::ValueError, _>(py, e.to_string())) | ||
}) | ||||
|
r42999 | } | ||
def removefile( | ||||
&self, | ||||
f: PyObject, | ||||
oldstate: PyObject, | ||||
size: PyObject | ||||
) -> PyResult<PyObject> { | ||||
|
r44702 | self.inner(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() | ||||
|
r47169 | .map_err(|e: HgError| { | ||
|
r42999 | 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> { | ||||
|
r44702 | self.inner(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() | ||||
|
r47169 | .map_err(|e: HgError| { | ||
|
r42999 | PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||
})?, | ||||
) | ||||
.and_then(|b| Ok(b.to_py_object(py))) | ||||
|
r46185 | .or_else(|e| { | ||
|
r42999 | Err(PyErr::new::<exc::OSError, _>( | ||
py, | ||||
|
r46185 | format!("Dirstate error: {}", e.to_string()), | ||
|
r42999 | )) | ||
}) | ||||
} | ||||
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(); | ||||
|
r48126 | self.inner(py) | ||
.borrow_mut() | ||||
.clear_ambiguous_times(files?, now.extract(py)?) | ||||
.map_err(|e| v2_error(py, e))?; | ||||
|
r42999 | Ok(py.None()) | ||
} | ||||
|
r44836 | def other_parent_entries(&self) -> PyResult<PyObject> { | ||
|
r44779 | let mut inner_shared = self.inner(py).borrow_mut(); | ||
|
r47653 | let set = PySet::empty(py)?; | ||
|
r47864 | for path in inner_shared.iter_other_parent_paths() { | ||
|
r48126 | let path = path.map_err(|e| v2_error(py, e))?; | ||
|
r47653 | set.add(py, PyBytes::new(py, path.as_bytes()))?; | ||
} | ||||
Ok(set.into_object()) | ||||
|
r44836 | } | ||
def non_normal_entries(&self) -> PyResult<NonNormalEntries> { | ||||
NonNormalEntries::from_inner(py, self.clone_ref(py)) | ||||
} | ||||
def non_normal_entries_contains(&self, key: PyObject) -> PyResult<bool> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r48126 | self.inner(py) | ||
|
r44779 | .borrow_mut() | ||
|
r48126 | .non_normal_entries_contains(HgPath::new(key.data(py))) | ||
.map_err(|e| v2_error(py, e)) | ||||
|
r44836 | } | ||
def non_normal_entries_display(&self) -> PyResult<PyString> { | ||||
|
r48126 | let mut inner = self.inner(py).borrow_mut(); | ||
let paths = inner | ||||
.iter_non_normal_paths() | ||||
.collect::<Result<Vec<_>, _>>() | ||||
.map_err(|e| v2_error(py, e))?; | ||||
let formatted = format!("NonNormalEntries: {}", hg::utils::join_display(paths, ", ")); | ||||
Ok(PyString::new(py, &formatted)) | ||||
|
r44836 | } | ||
def non_normal_entries_remove(&self, key: PyObject) -> PyResult<PyObject> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
self | ||||
|
r44779 | .inner(py) | ||
.borrow_mut() | ||||
|
r44836 | .non_normal_entries_remove(HgPath::new(key.data(py))); | ||
Ok(py.None()) | ||||
} | ||||
|
r47864 | def non_normal_or_other_parent_paths(&self) -> PyResult<PyList> { | ||
let mut inner = self.inner(py).borrow_mut(); | ||||
|
r44836 | |||
let ret = PyList::new(py, &[]); | ||||
|
r47864 | for filename in inner.non_normal_or_other_parent_paths() { | ||
|
r48126 | let filename = filename.map_err(|e| v2_error(py, e))?; | ||
|
r44836 | let as_pystring = PyBytes::new(py, filename.as_bytes()); | ||
|
r44779 | ret.append(py, as_pystring.into_object()); | ||
|
r44836 | } | ||
Ok(ret) | ||||
|
r42999 | } | ||
|
r44903 | def non_normal_entries_iter(&self) -> PyResult<NonNormalEntriesIterator> { | ||
// Make sure the sets are defined before we no longer have a mutable | ||||
// reference to the dmap. | ||||
self.inner(py) | ||||
.borrow_mut() | ||||
.set_non_normal_other_parent_entries(false); | ||||
let leaked_ref = self.inner(py).leak_immutable(); | ||||
NonNormalEntriesIterator::from_inner(py, unsafe { | ||||
leaked_ref.map(py, |o| { | ||||
|
r47864 | o.iter_non_normal_paths_panic() | ||
|
r44903 | }) | ||
}) | ||||
} | ||||
|
r42999 | def hastrackeddir(&self, d: PyObject) -> PyResult<PyBool> { | ||
let d = d.extract::<PyBytes>(py)?; | ||||
|
r44702 | Ok(self.inner(py).borrow_mut() | ||
|
r43227 | .has_tracked_dir(HgPath::new(d.data(py))) | ||
|
r44315 | .map_err(|e| { | ||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})? | ||||
|
r42999 | .to_py_object(py)) | ||
} | ||||
def hasdir(&self, d: PyObject) -> PyResult<PyBool> { | ||||
let d = d.extract::<PyBytes>(py)?; | ||||
|
r44702 | Ok(self.inner(py).borrow_mut() | ||
|
r43227 | .has_dir(HgPath::new(d.data(py))) | ||
|
r44315 | .map_err(|e| { | ||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})? | ||||
|
r42999 | .to_py_object(py)) | ||
} | ||||
def write( | ||||
&self, | ||||
|
r48055 | use_dirstate_v2: bool, | ||
|
r42999 | p1: PyObject, | ||
p2: PyObject, | ||||
now: PyObject | ||||
) -> PyResult<PyBytes> { | ||||
|
r47871 | let now = Timestamp(now.extract(py)?); | ||
|
r42999 | let parents = DirstateParents { | ||
|
r43068 | p1: extract_node_id(py, &p1)?, | ||
p2: extract_node_id(py, &p2)?, | ||||
|
r42999 | }; | ||
|
r48055 | let mut inner = self.inner(py).borrow_mut(); | ||
let result = if use_dirstate_v2 { | ||||
inner.pack_v2(parents, now) | ||||
} else { | ||||
inner.pack_v1(parents, now) | ||||
}; | ||||
match result { | ||||
|
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); | ||||
|
r48126 | for item in self.inner(py).borrow_mut().iter() { | ||
let (path, entry) = item.map_err(|e| v2_error(py, e))?; | ||||
|
r47879 | if entry.state != EntryState::Removed { | ||
let key = normalize_case(path); | ||||
let value = path; | ||||
dict.set_item( | ||||
py, | ||||
PyBytes::new(py, key.as_bytes()).into_object(), | ||||
PyBytes::new(py, value.as_bytes()).into_object(), | ||||
)?; | ||||
} | ||||
|
r42999 | } | ||
Ok(dict) | ||||
} | ||||
def __len__(&self) -> PyResult<usize> { | ||||
|
r44702 | Ok(self.inner(py).borrow().len()) | ||
|
r42999 | } | ||
def __contains__(&self, key: PyObject) -> PyResult<bool> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r48126 | self.inner(py) | ||
.borrow() | ||||
.contains_key(HgPath::new(key.data(py))) | ||||
.map_err(|e| v2_error(py, e)) | ||||
|
r42999 | } | ||
def __getitem__(&self, key: PyObject) -> PyResult<PyObject> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | let key = HgPath::new(key.data(py)); | ||
|
r48126 | match self | ||
.inner(py) | ||||
.borrow() | ||||
.get(key) | ||||
.map_err(|e| v2_error(py, e))? | ||||
{ | ||||
|
r42999 | Some(entry) => { | ||
|
r48123 | 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> { | ||||
|
r44702 | let leaked_ref = self.inner(py).leak_immutable(); | ||
|
r42999 | DirstateMapKeysIterator::from_inner( | ||
py, | ||||
|
r43579 | unsafe { leaked_ref.map(py, |o| o.iter()) }, | ||
|
r42999 | ) | ||
} | ||||
def items(&self) -> PyResult<DirstateMapItemsIterator> { | ||||
|
r44702 | let leaked_ref = self.inner(py).leak_immutable(); | ||
|
r42999 | DirstateMapItemsIterator::from_inner( | ||
py, | ||||
|
r43579 | unsafe { leaked_ref.map(py, |o| o.iter()) }, | ||
|
r42999 | ) | ||
} | ||||
def __iter__(&self) -> PyResult<DirstateMapKeysIterator> { | ||||
|
r44702 | let leaked_ref = self.inner(py).leak_immutable(); | ||
|
r42999 | DirstateMapKeysIterator::from_inner( | ||
py, | ||||
|
r43579 | unsafe { leaked_ref.map(py, |o| o.iter()) }, | ||
|
r42999 | ) | ||
} | ||||
def getdirs(&self) -> PyResult<Dirs> { | ||||
// TODO don't copy, share the reference | ||||
|
r44702 | self.inner(py).borrow_mut().set_dirs() | ||
|
r44315 | .map_err(|e| { | ||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?; | ||||
|
r42999 | Dirs::from_inner( | ||
py, | ||||
|
r43070 | DirsMultiset::from_dirstate( | ||
|
r47863 | self.inner(py).borrow().iter(), | ||
|
r42999 | Some(EntryState::Removed), | ||
|
r44315 | ) | ||
.map_err(|e| { | ||||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?, | ||||
|
r42999 | ) | ||
} | ||||
def getalldirs(&self) -> PyResult<Dirs> { | ||||
// TODO don't copy, share the reference | ||||
|
r44702 | self.inner(py).borrow_mut().set_all_dirs() | ||
|
r44315 | .map_err(|e| { | ||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?; | ||||
|
r42999 | Dirs::from_inner( | ||
py, | ||||
|
r43070 | DirsMultiset::from_dirstate( | ||
|
r47863 | self.inner(py).borrow().iter(), | ||
|
r42999 | None, | ||
|
r44315 | ).map_err(|e| { | ||
PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
})?, | ||||
|
r42999 | ) | ||
} | ||||
// TODO all copymap* methods, see docstring above | ||||
def copymapcopy(&self) -> PyResult<PyDict> { | ||||
let dict = PyDict::new(py); | ||||
|
r48126 | for item in self.inner(py).borrow().copy_map_iter() { | ||
let (key, value) = item.map_err(|e| v2_error(py, e))?; | ||||
|
r43227 | dict.set_item( | ||
py, | ||||
|
r45500 | PyBytes::new(py, key.as_bytes()), | ||
PyBytes::new(py, value.as_bytes()), | ||||
|
r43227 | )?; | ||
|
r42999 | } | ||
Ok(dict) | ||||
} | ||||
def copymapgetitem(&self, key: PyObject) -> PyResult<PyBytes> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r48126 | match self | ||
.inner(py) | ||||
.borrow() | ||||
.copy_map_get(HgPath::new(key.data(py))) | ||||
.map_err(|e| v2_error(py, e))? | ||||
{ | ||||
|
r45500 | Some(copy) => Ok(PyBytes::new(py, copy.as_bytes())), | ||
|
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> { | ||||
|
r47863 | Ok(self.inner(py).borrow().copy_map_len()) | ||
|
r42999 | } | ||
def copymapcontains(&self, key: PyObject) -> PyResult<bool> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r48126 | self.inner(py) | ||
|
r43227 | .borrow() | ||
|
r48126 | .copy_map_contains_key(HgPath::new(key.data(py))) | ||
.map_err(|e| v2_error(py, e)) | ||||
|
r42999 | } | ||
def copymapget( | ||||
&self, | ||||
key: PyObject, | ||||
default: Option<PyObject> | ||||
) -> PyResult<Option<PyObject>> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | match self | ||
|
r44702 | .inner(py) | ||
|
r43227 | .borrow() | ||
|
r47863 | .copy_map_get(HgPath::new(key.data(py))) | ||
|
r48126 | .map_err(|e| v2_error(py, e))? | ||
|
r43227 | { | ||
Some(copy) => Ok(Some( | ||||
|
r45500 | PyBytes::new(py, copy.as_bytes()).into_object(), | ||
|
r43227 | )), | ||
|
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)?; | ||||
|
r48126 | self.inner(py) | ||
.borrow_mut() | ||||
.copy_map_insert( | ||||
HgPathBuf::from_bytes(key.data(py)), | ||||
HgPathBuf::from_bytes(value.data(py)), | ||||
) | ||||
.map_err(|e| v2_error(py, e))?; | ||||
|
r42999 | Ok(py.None()) | ||
} | ||||
def copymappop( | ||||
&self, | ||||
key: PyObject, | ||||
default: Option<PyObject> | ||||
) -> PyResult<Option<PyObject>> { | ||||
let key = key.extract::<PyBytes>(py)?; | ||||
|
r43227 | match self | ||
|
r44702 | .inner(py) | ||
|
r44685 | .borrow_mut() | ||
|
r47863 | .copy_map_remove(HgPath::new(key.data(py))) | ||
|
r48126 | .map_err(|e| v2_error(py, e))? | ||
|
r43227 | { | ||
|
r42999 | Some(_) => Ok(None), | ||
None => Ok(default), | ||||
} | ||||
} | ||||
def copymapiter(&self) -> PyResult<CopyMapKeysIterator> { | ||||
|
r44702 | let leaked_ref = self.inner(py).leak_immutable(); | ||
|
r42999 | CopyMapKeysIterator::from_inner( | ||
py, | ||||
|
r47863 | unsafe { leaked_ref.map(py, |o| o.copy_map_iter()) }, | ||
|
r42999 | ) | ||
} | ||||
def copymapitemsiter(&self) -> PyResult<CopyMapItemsIterator> { | ||||
|
r44702 | let leaked_ref = self.inner(py).leak_immutable(); | ||
|
r42999 | CopyMapItemsIterator::from_inner( | ||
py, | ||||
|
r47863 | unsafe { leaked_ref.map(py, |o| o.copy_map_iter()) }, | ||
|
r42999 | ) | ||
} | ||||
}); | ||||
impl DirstateMap { | ||||
|
r47882 | pub fn get_inner_mut<'a>( | ||
|
r43567 | &'a self, | ||
py: Python<'a>, | ||||
|
r47882 | ) -> RefMut<'a, Box<dyn DirstateMapMethods + Send>> { | ||
self.inner(py).borrow_mut() | ||||
|
r43567 | } | ||
|
r42999 | fn translate_key( | ||
py: Python, | ||||
|
r48126 | res: Result<(&HgPath, DirstateEntry), DirstateV2ParseError>, | ||
|
r42999 | ) -> PyResult<Option<PyBytes>> { | ||
|
r48126 | let (f, _entry) = res.map_err(|e| v2_error(py, e))?; | ||
Ok(Some(PyBytes::new(py, f.as_bytes()))) | ||||
|
r42999 | } | ||
fn translate_key_value( | ||||
py: Python, | ||||
|
r48126 | res: Result<(&HgPath, DirstateEntry), DirstateV2ParseError>, | ||
|
r42999 | ) -> PyResult<Option<(PyBytes, PyObject)>> { | ||
|
r48126 | let (f, entry) = res.map_err(|e| v2_error(py, e))?; | ||
|
r42999 | Ok(Some(( | ||
|
r45500 | PyBytes::new(py, f.as_bytes()), | ||
|
r46185 | make_dirstate_tuple(py, &entry)?, | ||
))) | ||||
} | ||||
|
r42999 | } | ||
|
r43159 | py_shared_iterator!( | ||
|
r42999 | DirstateMapKeysIterator, | ||
|
r44703 | UnsafePyLeaked<StateMapIter<'static>>, | ||
|
r42999 | DirstateMap::translate_key, | ||
Option<PyBytes> | ||||
); | ||||
|
r43159 | py_shared_iterator!( | ||
|
r42999 | DirstateMapItemsIterator, | ||
|
r44703 | UnsafePyLeaked<StateMapIter<'static>>, | ||
|
r42999 | DirstateMap::translate_key_value, | ||
Option<(PyBytes, PyObject)> | ||||
); | ||||
|
r43068 | |||
|
r47337 | fn extract_node_id(py: Python, obj: &PyObject) -> PyResult<Node> { | ||
|
r43068 | 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())), | ||||
} | ||||
} | ||||
|
r48126 | |||
pub(super) fn v2_error(py: Python<'_>, _: DirstateV2ParseError) -> PyErr { | ||||
PyErr::new::<exc::ValueError, _>(py, "corrupted dirstate-v2") | ||||
} | ||||