Mercurial > hg

comparison rust/hg-cpython/src/dirstate/dirstate_map.rs @ 47530:a1745a292885

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop `state` to `_addpath` All its value are inferred within the dirstatemap now. Differential Revision: https://phab.mercurial-scm.org/D10972
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 01:59:41 +0200
parents c6b91a9c242a
children 6025353c9c55
comparison
equal deleted inserted replaced
47529:d3cf20328abd 47530:a1745a292885
106 } 106 }
107 107
108 def addfile( 108 def addfile(
109 &self, 109 &self,
110 f: PyObject, 110 f: PyObject,
111 state: PyObject,
112 mode: PyObject, 111 mode: PyObject,
113 size: PyObject, 112 size: PyObject,
114 mtime: PyObject, 113 mtime: PyObject,
115 added: PyObject, 114 added: PyObject,
116 merged: PyObject, 115 merged: PyObject,
117 from_p2: PyObject, 116 from_p2: PyObject,
118 possibly_dirty: PyObject, 117 possibly_dirty: PyObject,
119 ) -> PyResult<PyObject> { 118 ) -> PyResult<PyObject> {
120 let f = f.extract::<PyBytes>(py)?; 119 let f = f.extract::<PyBytes>(py)?;
121 let filename = HgPath::new(f.data(py)); 120 let filename = HgPath::new(f.data(py));
122 let state = if state.is_none(py) {
123 // Arbitrary default value
124 EntryState::Normal
125 } else {
126 state.extract::<PyBytes>(py)?.data(py)[0]
127 .try_into()
128 .map_err(|e: HgError| {
129 PyErr::new::<exc::ValueError, _>(py, e.to_string())
130 })?
131 };
132 let mode = if mode.is_none(py) { 121 let mode = if mode.is_none(py) {
133 // fallback default value 122 // fallback default value
134 0 123 0
135 } else { 124 } else {
136 mode.extract(py)? 125 mode.extract(py)?
146 MTIME_UNSET 135 MTIME_UNSET
147 } else { 136 } else {
148 mtime.extract(py)? 137 mtime.extract(py)?
149 }; 138 };
150 let entry = DirstateEntry { 139 let entry = DirstateEntry {
151 state: state, 140 // XXX Arbitrary default value since the value is determined later
141 state: EntryState::Normal,
152 mode: mode, 142 mode: mode,
153 size: size, 143 size: size,
154 mtime: mtime, 144 mtime: mtime,
155 }; 145 };
156 let added = added.extract::<PyBool>(py)?.is_true(); 146 let added = added.extract::<PyBool>(py)?.is_true();