rust-narrow: fix loop that never loops

This was caught by `clippy`. I guess the narrow tests leave something to be
desired, since this previously only checked the first valid pattern.

rust/hg-core/src/narrow.rs

@@ -1,111 +1,111 b''
 use std::path::Path;
 
 use crate::{
     errors::HgError,
     exit_codes,
     filepatterns::parse_pattern_file_contents,
     matchers::{
         AlwaysMatcher, DifferenceMatcher, IncludeMatcher, Matcher,
         NeverMatcher,
     },
     repo::Repo,
     requirements::NARROW_REQUIREMENT,
     sparse::{self, SparseConfigError, SparseWarning},
 };
 
 /// The file in .hg/store/ that indicates which paths exit in the store
 const FILENAME: &str = "narrowspec";
 /// The file in .hg/ that indicates which paths exit in the dirstate
 const DIRSTATE_FILENAME: &str = "narrowspec.dirstate";
 
 /// Pattern prefixes that are allowed in narrow patterns. This list MUST
 /// only contain patterns that are fast and safe to evaluate. Keep in mind
 /// that patterns are supplied by clients and executed on remote servers
 /// as part of wire protocol commands. That means that changes to this
 /// data structure influence the wire protocol and should not be taken
 /// lightly - especially removals.
 const VALID_PREFIXES: [&str; 2] = ["path:", "rootfilesin:"];
 
 /// Return the matcher for the current narrow spec, and all configuration
 /// warnings to display.
 pub fn matcher(
     repo: &Repo,
 ) -> Result<(Box<dyn Matcher + Sync>, Vec<SparseWarning>), SparseConfigError> {
     let mut warnings = vec![];
     if !repo.requirements().contains(NARROW_REQUIREMENT) {
         return Ok((Box::new(AlwaysMatcher), warnings));
     }
     // Treat "narrowspec does not exist" the same as "narrowspec file exists
     // and is empty".
     let store_spec = repo.store_vfs().try_read(FILENAME)?.unwrap_or(vec![]);
     let working_copy_spec =
         repo.hg_vfs().try_read(DIRSTATE_FILENAME)?.unwrap_or(vec![]);
     if store_spec != working_copy_spec {
         return Err(HgError::abort(
             "working copy's narrowspec is stale",
             exit_codes::STATE_ERROR,
             Some("run 'hg tracked --update-working-copy'".into()),
         )
         .into());
     }
 
     let config = sparse::parse_config(
         &store_spec,
         sparse::SparseConfigContext::Narrow,
     )?;
 
     warnings.extend(config.warnings);
 
     if !config.profiles.is_empty() {
         // TODO (from Python impl) maybe do something with profiles?
         return Err(SparseConfigError::IncludesInNarrow);
     }
     validate_patterns(&config.includes)?;
     validate_patterns(&config.excludes)?;
 
     if config.includes.is_empty() {
         return Ok((Box::new(NeverMatcher), warnings));
     }
 
     let (patterns, subwarnings) = parse_pattern_file_contents(
         &config.includes,
         Path::new(""),
         None,
         false,
     )?;
     warnings.extend(subwarnings.into_iter().map(From::from));
 
     let mut m: Box<dyn Matcher + Sync> =
         Box::new(IncludeMatcher::new(patterns)?);
 
     let (patterns, subwarnings) = parse_pattern_file_contents(
         &config.excludes,
         Path::new(""),
         None,
         false,
     )?;
     if !patterns.is_empty() {
         warnings.extend(subwarnings.into_iter().map(From::from));
         let exclude_matcher = Box::new(IncludeMatcher::new(patterns)?);
         m = Box::new(DifferenceMatcher::new(m, exclude_matcher));
     }
 
     Ok((m, warnings))
 }
 
 fn validate_patterns(patterns: &[u8]) -> Result<(), SparseConfigError> {
     for pattern in patterns.split(|c| *c == b'\n') {
         if pattern.is_empty() {
             continue;
         }
         for prefix in VALID_PREFIXES.iter() {
             if pattern.starts_with(prefix.as_bytes()) {
-                break;
+                return Ok(());
             }
-            return Err(SparseConfigError::InvalidNarrowPrefix(
-                pattern.to_owned(),
-            ));
         }
+        return Err(SparseConfigError::InvalidNarrowPrefix(
+            pattern.to_owned(),
+        ));
     }
     Ok(())
 }

tests/test-narrow-clone.t

@@ -1,299 +1,311 b''
   $ . "$TESTDIR/narrow-library.sh"
 
   $ hg init master
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [narrow]
   > serveellipses=True
   > EOF
   $ mkdir dir
   $ mkdir dir/src
   $ cd dir/src
   $ for x in `$TESTDIR/seq.py 20`; do echo $x > "f$x"; hg add "f$x"; hg commit -m "Commit src $x"; done
   $ cd ..
   $ mkdir tests
   $ cd tests
   $ for x in `$TESTDIR/seq.py 20`; do echo $x > "t$x"; hg add "t$x"; hg commit -m "Commit test $x"; done
   $ cd ../../..
 
 Only path: and rootfilesin: pattern prefixes are allowed
 
   $ hg clone --narrow ssh://user@dummy/master badnarrow --noupdate --include 'glob:**'
   abort: invalid prefix on narrow pattern: glob:**
   (narrow patterns must begin with one of the following: path:, rootfilesin:)
   [255]
 
   $ hg clone --narrow ssh://user@dummy/master badnarrow --noupdate --exclude 'set:ignored'
   abort: invalid prefix on narrow pattern: set:ignored
   (narrow patterns must begin with one of the following: path:, rootfilesin:)
   [255]
 
+rootfilesin: patterns work
+
+  $ hg clone --narrow ssh://user@dummy/master rootfilesin --noupdate --include 'rootfilesin:dir'
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 0 changes to 0 files
+  new changesets 26ce255d5b5d
+  $ hg tracked -R rootfilesin
+  I rootfilesin:dir
+
 narrow clone a file, f10
 
   $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/f10"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1 changes to 1 files
   new changesets *:* (glob)
   $ cd narrow
   $ hg debugrequires | grep -v generaldelta
   dotencode
   dirstate-v2 (dirstate-v2 !)
   fncache
   narrowhg-experimental
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
   revlogv1
   share-safe
   sparserevlog
   store
   testonly-simplestore (reposimplestore !)
 
   $ hg tracked
   I path:dir/src/f10
   $ hg tracked
   I path:dir/src/f10
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/src
   dir/src/f10
   $ cat dir/src/f10
   10
 
   $ cd ..
 
 local-to-local narrow clones work
 
   $ hg clone --narrow master narrow-via-localpeer --noupdate --include "dir/src/f10"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1 changes to 1 files
   new changesets 5d21aaea77f8:26ce255d5b5d
   $ hg tracked -R narrow-via-localpeer
   I path:dir/src/f10
   $ rm -Rf narrow-via-localpeer
 
 narrow clone with a newline should fail
 
   $ hg clone --narrow ssh://user@dummy/master narrow_fail --noupdate --include 'dir/src/f10
   > '
   abort: newlines are not allowed in narrowspec paths
   [255]
 
 narrow clone a directory, tests/, except tests/t19
 
   $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 21 changesets with 19 changes to 19 files
   new changesets *:* (glob)
   $ cd narrowdir
   $ hg tracked
   I path:dir/tests
   X path:dir/tests/t19
   $ hg tracked
   I path:dir/tests
   X path:dir/tests/t19
   $ hg update
   19 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/tests
   dir/tests/t1
   dir/tests/t10
   dir/tests/t11
   dir/tests/t12
   dir/tests/t13
   dir/tests/t14
   dir/tests/t15
   dir/tests/t16
   dir/tests/t17
   dir/tests/t18
   dir/tests/t2
   dir/tests/t20
   dir/tests/t3
   dir/tests/t4
   dir/tests/t5
   dir/tests/t6
   dir/tests/t7
   dir/tests/t8
   dir/tests/t9
 
   $ cd ..
 
 narrow clone everything but a directory (tests/)
 
   $ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests"
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 21 changesets with 20 changes to 20 files
   new changesets *:* (glob)
   $ cd narrowroot
   $ hg tracked
   I path:.
   X path:dir/tests
   $ hg tracked
   I path:.
   X path:dir/tests
   $ hg update
   20 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ find * | sort
   dir
   dir/src
   dir/src/f1
   dir/src/f10
   dir/src/f11
   dir/src/f12
   dir/src/f13
   dir/src/f14
   dir/src/f15
   dir/src/f16
   dir/src/f17
   dir/src/f18
   dir/src/f19
   dir/src/f2
   dir/src/f20
   dir/src/f3
   dir/src/f4
   dir/src/f5
   dir/src/f6
   dir/src/f7
   dir/src/f8
   dir/src/f9
 
   $ cd ..
 
 narrow clone no paths at all
 
   $ hg clone --narrow ssh://user@dummy/master narrowempty --noupdate
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 0 files
   new changesets * (glob)
   $ cd narrowempty
   $ hg tracked
   $ hg update
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ ls -A
   .hg
 
   $ cd ..
 
 simple clone
   $ hg clone ssh://user@dummy/master simpleclone
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 40 changesets with 40 changes to 40 files
   new changesets * (glob)
   updating to branch default
   40 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd simpleclone
   $ find * | sort
   dir
   dir/src
   dir/src/f1
   dir/src/f10
   dir/src/f11
   dir/src/f12
   dir/src/f13
   dir/src/f14
   dir/src/f15
   dir/src/f16
   dir/src/f17
   dir/src/f18
   dir/src/f19
   dir/src/f2
   dir/src/f20
   dir/src/f3
   dir/src/f4
   dir/src/f5
   dir/src/f6
   dir/src/f7
   dir/src/f8
   dir/src/f9
   dir/tests
   dir/tests/t1
   dir/tests/t10
   dir/tests/t11
   dir/tests/t12
   dir/tests/t13
   dir/tests/t14
   dir/tests/t15
   dir/tests/t16
   dir/tests/t17
   dir/tests/t18
   dir/tests/t19
   dir/tests/t2
   dir/tests/t20
   dir/tests/t3
   dir/tests/t4
   dir/tests/t5
   dir/tests/t6
   dir/tests/t7
   dir/tests/t8
   dir/tests/t9
 
   $ cd ..
 
 Testing the --narrowspec flag to clone
 
   $ cat >> narrowspecs <<EOF
   > %include foo
   > [include]
   > path:dir/tests/
   > path:dir/src/f12
   > EOF
 
   $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs
   reading narrowspec from '$TESTTMP/narrowspecs'
   config error: cannot specify other files using '%include' in narrowspec
   [30]
 
   $ cat > narrowspecs <<EOF
   > [include]
   > path:dir/tests/
   > path:dir/src/f12
   > EOF
 
   $ hg clone ssh://user@dummy/master specfile --narrowspec narrowspecs
   reading narrowspec from '$TESTTMP/narrowspecs'
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 23 changesets with 21 changes to 21 files
   new changesets c13e3773edb4:26ce255d5b5d
   updating to branch default
   21 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd specfile
   $ hg tracked
   I path:dir/src/f12
   I path:dir/tests
   $ cd ..
 
 Narrow spec with invalid patterns is rejected
 
   $ cat > narrowspecs <<EOF
   > [include]
   > glob:**
   > EOF
 
   $ hg clone ssh://user@dummy/master badspecfile --narrowspec narrowspecs
   reading narrowspec from '$TESTTMP/narrowspecs'
   abort: invalid prefix on narrow pattern: glob:**
   (narrow patterns must begin with one of the following: path:, rootfilesin:)
   [255]