Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 48 additions & 60 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ edition = "2021"
[workspace.dependencies]
pyo3 = { version = "0.28" }
#subversion = { version = ">=0.0.5" }
subversion = { version = "0.1.10" }
subversion = { version = "0.1.11" }
#subversion = { path = "../subversion-rs" }
pyo3-filelike = { version = "0.5" }
7 changes: 5 additions & 2 deletions ra/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,10 @@ impl RemoteAccess {
_old_path_rev: Option<(&str, subversion::Revnum)>,
_new_path_rev: Option<(&str, subversion::Revnum)>,
_prop_diffs: &std::collections::HashMap<String, Vec<u8>>|
-> Result<(), subversion::Error> {
-> Result<
Option<subversion::ra::TxDeltaHandler>,
subversion::Error,
> {
Python::attach(|py| {
let py_rev_props = subvertpy_util::properties::props_to_py_dict(py, rev_props)
.map_err(|e| {
Expand All @@ -900,7 +903,7 @@ impl RemoteAccess {
subversion::Error::from_message(&format!("Python callback error: {}", e))
})?;

Ok(())
Ok(None)
})
};

Expand Down
7 changes: 4 additions & 3 deletions repos/src/fsroot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,21 @@ impl FileSystemRoot {
#[pymethods]
impl FileSystemRoot {
/// Get paths that changed in this revision
fn paths_changed(&self) -> PyResult<pyo3::Py<pyo3::PyAny>> {
fn paths_changed(&mut self) -> PyResult<pyo3::Py<pyo3::PyAny>> {
let changes = self.root.paths_changed().map_err(|e| svn_err_to_py(e))?;

Python::attach(|py| {
let dict = PyDict::new(py);
for (path, change) in changes {
for change in changes {
let change = change.map_err(|e| svn_err_to_py(e))?;
let change_dict = PyDict::new(py);
change_dict.set_item("change_kind", format!("{:?}", change.change_kind()))?;
change_dict.set_item("text_mod", change.text_modified())?;
change_dict.set_item("prop_mod", change.props_modified())?;
let node_kind = change.node_kind();
change_dict.set_item("node_kind", format!("{:?}", node_kind))?;

dict.set_item(path.to_string(), change_dict)?;
dict.set_item(change.path().to_string(), change_dict)?;
}
Ok(dict.into_any().unbind())
})
Expand Down
2 changes: 1 addition & 1 deletion wc/src/adm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use subvertpy_util::error::svn_err_to_py;
#[pyclass(name = "Adm", unsendable)]
pub struct Adm {
#[allow(deprecated)]
pub(crate) inner: subversion::wc::Adm,
pub(crate) inner: subversion::wc::Adm<'static>,
}

#[pymethods]
Expand Down
Loading