Ignore all cycles and be happy if we have found at least one actual odb

I think this will make the implementation more user friendly, while seeding out cycles that lead to nothing usable.

Sebastian Thiel committed 6 years ago

Commit 1effdfd1 parent 08f9ec41 file · +8 −4Browse files

Unified · Split

     let mut out = Vec::new();
     let mut seen = Vec::new();
     while let Some((depth, dir)) = dirs.pop() {
-        if seen.contains(&dir) {
-            return Err(Error::Cycle(seen));
-        }
-        seen.push(dir.clone());
         match fs::read(dir.join("info").join("alternates")) {
             Ok(content) => {
+                if seen.contains(&dir) {
+                    continue;
+                }
+                seen.push(dir.clone());
                 dirs.push((
                     depth + 1,
                     content
             Err(err) => return Err(err.into()),
         };
     }
+    if out.is_empty() && !seen.is_empty() {
+        return Err(Error::Cycle(seen));
+    }
     Ok(out)
 }