equal
deleted
inserted
replaced
225 let p1 = repo.dirstate_parents()?.p1; |
225 let p1 = repo.dirstate_parents()?.p1; |
226 let manifest = repo.manifest_for_node(p1).map_err(|e| { |
226 let manifest = repo.manifest_for_node(p1).map_err(|e| { |
227 CommandError::from((e, &*format!("{:x}", p1.short()))) |
227 CommandError::from((e, &*format!("{:x}", p1.short()))) |
228 })?; |
228 })?; |
229 for to_check in ds_status.unsure { |
229 for to_check in ds_status.unsure { |
230 if cat_file_is_modified(repo, &manifest, &to_check)? { |
230 if unsure_is_modified(repo, &manifest, &to_check)? { |
231 if display_states.modified { |
231 if display_states.modified { |
232 ds_status.modified.push(to_check); |
232 ds_status.modified.push(to_check); |
233 } |
233 } |
234 } else { |
234 } else { |
235 if display_states.clean { |
235 if display_states.clean { |
302 /// |
302 /// |
303 /// This meant to be used for those that the dirstate cannot resolve, due |
303 /// This meant to be used for those that the dirstate cannot resolve, due |
304 /// to time resolution limits. |
304 /// to time resolution limits. |
305 /// |
305 /// |
306 /// TODO: detect permission bits and similar metadata modifications |
306 /// TODO: detect permission bits and similar metadata modifications |
307 fn cat_file_is_modified( |
307 fn unsure_is_modified( |
308 repo: &Repo, |
308 repo: &Repo, |
309 manifest: &Manifest, |
309 manifest: &Manifest, |
310 hg_path: &HgPath, |
310 hg_path: &HgPath, |
311 ) -> Result<bool, HgError> { |
311 ) -> Result<bool, HgError> { |
312 let entry = manifest |
312 let entry = manifest |