This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11489

dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item
ClosedPublic

Authored by SimonSapin on Sep 22 2021, 4:55 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9b2a51b2c36a: dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item
Summary

… so that Python sees a proper ValueError instead of only
SystemError: Rust panic

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 30416

rust/hg-core/src/dirstate_tree/dirstate_map.rs

impl<'on_disk> super::dispatch::DirstateMapMethods for DirstateMap<'on_disk> { impl<'on_disk> super::dispatch::DirstateMapMethods for DirstateMap<'on_disk> {
fn clear(&mut self) { fn clear(&mut self) {
self.root = Default::default(); self.root = Default::default();
self.nodes_with_entry_count = 0; self.nodes_with_entry_count = 0;
self.nodes_with_copy_source_count = 0; self.nodes_with_copy_source_count = 0;
} }
fn set_entry(&mut self, filename: &HgPath, entry: DirstateEntry) { fn set_entry(
let node = &mut self,
self.get_or_insert(&filename).expect("no parse error in v1"); filename: &HgPath,
node.data = NodeData::Entry(entry); entry: DirstateEntry,
) -> Result<(), DirstateV2ParseError> {
self.get_or_insert(&filename)?.data = NodeData::Entry(entry);
Ok(())
} }
fn add_file( fn add_file(
&mut self, &mut self,
filename: &HgPath, filename: &HgPath,
entry: DirstateEntry, entry: DirstateEntry,
added: bool, added: bool,
merged: bool, merged: bool,

rust/hg-core/src/dirstate_tree/dispatch.rs

/// The dirstate map associates paths of files in the working directory to /// The dirstate map associates paths of files in the working directory to
/// various information about the state of those files. /// various information about the state of those files.
pub trait DirstateMapMethods { pub trait DirstateMapMethods {
/// Remove information about all files in this map /// Remove information about all files in this map
fn clear(&mut self); fn clear(&mut self);
/// Add the given filename to the map if it is not already there, and /// Add the given filename to the map if it is not already there, and
/// associate the given entry with it. /// associate the given entry with it.
fn set_entry(&mut self, filename: &HgPath, entry: DirstateEntry); fn set_entry(
&mut self,
filename: &HgPath,
entry: DirstateEntry,
) -> Result<(), DirstateV2ParseError>;
/// Add or change the information associated to a given file. /// Add or change the information associated to a given file.
/// ///
/// `old_state` is the state in the entry that `get` would have returned /// `old_state` is the state in the entry that `get` would have returned
/// before this call, or `EntryState::Unknown` if there was no such entry. /// before this call, or `EntryState::Unknown` if there was no such entry.
/// ///
/// `entry.state` should never be `EntryState::Unknown`. /// `entry.state` should never be `EntryState::Unknown`.
fn add_file( fn add_file(
fn clear(&mut self) { fn clear(&mut self) {
self.clear() self.clear()
} }
/// Used to set a value directory. /// Used to set a value directory.
/// ///
/// XXX Is temporary during a refactor of V1 dirstate and will disappear /// XXX Is temporary during a refactor of V1 dirstate and will disappear
/// shortly. /// shortly.
fn set_entry(&mut self, filename: &HgPath, entry: DirstateEntry) { fn set_entry(
self.set_entry(&filename, entry) &mut self,
filename: &HgPath,
entry: DirstateEntry,
) -> Result<(), DirstateV2ParseError> {
self.set_entry(&filename, entry);
Ok(())
} }
fn add_file( fn add_file(
&mut self, &mut self,
filename: &HgPath, filename: &HgPath,
entry: DirstateEntry, entry: DirstateEntry,
added: bool, added: bool,
merged: bool, merged: bool,

rust/hg-core/src/dirstate_tree/owning_dispatch.rs

use crate::StatusOptions; use crate::StatusOptions;
use std::path::PathBuf; use std::path::PathBuf;
impl DirstateMapMethods for OwningDirstateMap { impl DirstateMapMethods for OwningDirstateMap {
fn clear(&mut self) { fn clear(&mut self) {
self.get_mut().clear() self.get_mut().clear()
} }
fn set_entry(&mut self, filename: &HgPath, entry: DirstateEntry) { fn set_entry(
&mut self,
filename: &HgPath,
entry: DirstateEntry,
) -> Result<(), DirstateV2ParseError> {
self.get_mut().set_entry(filename, entry) self.get_mut().set_entry(filename, entry)
} }
fn add_file( fn add_file(
&mut self, &mut self,
filename: &HgPath, filename: &HgPath,
entry: DirstateEntry, entry: DirstateEntry,
added: bool, added: bool,

rust/hg-cpython/src/dirstate/dirstate_map.rs

def set_dirstate_item( def set_dirstate_item(
&self, &self,
path: PyObject, path: PyObject,
item: DirstateItem item: DirstateItem
) -> PyResult<PyObject> { ) -> PyResult<PyObject> {
let f = path.extract::<PyBytes>(py)?; let f = path.extract::<PyBytes>(py)?;
let filename = HgPath::new(f.data(py)); let filename = HgPath::new(f.data(py));
self.inner(py).borrow_mut().set_entry(filename, item.get_entry(py)); self.inner(py)
.borrow_mut()
.set_entry(filename, item.get_entry(py))
.map_err(|e| v2_error(py, e))?;
Ok(py.None()) Ok(py.None())
} }
def addfile( def addfile(
&self, &self,
f: PyObject, f: PyObject,
mode: PyObject, mode: PyObject,
size: PyObject, size: PyObject,