Show More
@@ -12,7 +12,7 b'' | |||||
12 |
|
12 | |||
13 | use cpython::{ |
|
13 | use cpython::{ | |
14 | exc, PyBytes, PyDict, PyErr, PyInt, PyModule, PyObject, PyResult, |
|
14 | exc, PyBytes, PyDict, PyErr, PyInt, PyModule, PyObject, PyResult, | |
15 | PySequence, PyTuple, Python, ToPyObject, |
|
15 | PySequence, PythonObject, PyTuple, Python, ToPyObject, | |
16 | }; |
|
16 | }; | |
17 | use hg::{ |
|
17 | use hg::{ | |
18 | pack_dirstate, parse_dirstate, CopyVecEntry, DirstateEntry, |
|
18 | pack_dirstate, parse_dirstate, CopyVecEntry, DirstateEntry, | |
@@ -153,7 +153,7 b' fn pack_dirstate_wrapper(' | |||||
153 | &dirstate_vec?, |
|
153 | &dirstate_vec?, | |
154 | &copies?, |
|
154 | &copies?, | |
155 | DirstateParents { p1, p2 }, |
|
155 | DirstateParents { p1, p2 }, | |
156 | now.value(py) as i32, |
|
156 | now.as_object().extract::<i32>(py)?, | |
157 | ) { |
|
157 | ) { | |
158 | Ok((packed, new_dirstate_vec)) => { |
|
158 | Ok((packed, new_dirstate_vec)) => { | |
159 | for ( |
|
159 | for ( |
General Comments 0
You need to be logged in to leave comments.
Login now