--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs Mon Oct 25 11:36:22 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs Fri Nov 19 03:04:42 2021 +0100
@@ -18,7 +18,7 @@
use crate::{
dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator},
- dirstate::item::{timestamp, DirstateItem},
+ dirstate::item::DirstateItem,
pybytes_deref::PyBytesDeref,
};
use hg::{
@@ -194,16 +194,13 @@
&self,
p1: PyObject,
p2: PyObject,
- now: (u32, u32)
) -> PyResult<PyBytes> {
- let now = timestamp(py, now)?;
-
let mut inner = self.inner(py).borrow_mut();
let parents = DirstateParents {
p1: extract_node_id(py, &p1)?,
p2: extract_node_id(py, &p2)?,
};
- let result = inner.pack_v1(parents, now);
+ let result = inner.pack_v1(parents);
match result {
Ok(packed) => Ok(PyBytes::new(py, &packed)),
Err(_) => Err(PyErr::new::<exc::OSError, _>(
@@ -218,13 +215,10 @@
/// instead of written to a new data file (False).
def write_v2(
&self,
- now: (u32, u32),
can_append: bool,
) -> PyResult<PyObject> {
- let now = timestamp(py, now)?;
-
let mut inner = self.inner(py).borrow_mut();
- let result = inner.pack_v2(now, can_append);
+ let result = inner.pack_v2(can_append);
match result {
Ok((packed, tree_metadata, append)) => {
let packed = PyBytes::new(py, &packed);