Mercurial > public > mercurial-scm > hg

diff rust/hg-core/src/dirstate_tree/dispatch.rs @ 47110:9c6b458a08e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct Instead of having `status()` returning a tuple of those paths and `DirstateStatus`. Differential Revision: https://phab.mercurial-scm.org/D10494
author Simon Sapin <simon.sapin@octobus.net>
date Tue, 06 Apr 2021 15:14:19 +0200
parents 33e5511b571a
children d5956136d19d
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs	Tue Apr 13 17:02:58 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dispatch.rs	Tue Apr 06 15:14:19 2021 +0200
@@ -11,7 +11,6 @@
 use crate::DirstateParents;
 use crate::DirstateStatus;
 use crate::EntryState;
-use crate::HgPathCow;
 use crate::PatternFileWarning;
 use crate::StateMapIter;
 use crate::StatusError;
@@ -102,13 +101,7 @@
         root_dir: PathBuf,
         ignore_files: Vec<PathBuf>,
         options: StatusOptions,
-    ) -> Result<
-        (
-            (Vec<HgPathCow<'a>>, DirstateStatus<'a>),
-            Vec<PatternFileWarning>,
-        ),
-        StatusError,
-    >;
+    ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>;
 
     fn copy_map_len(&self) -> usize;
 
@@ -270,13 +263,8 @@
         root_dir: PathBuf,
         ignore_files: Vec<PathBuf>,
         options: StatusOptions,
-    ) -> Result<
-        (
-            (Vec<HgPathCow<'a>>, DirstateStatus<'a>),
-            Vec<PatternFileWarning>,
-        ),
-        StatusError,
-    > {
+    ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>
+    {
         crate::status(self, matcher, root_dir, ignore_files, options)
     }