Do not fail if a branch has other commits than the lock file (#112)

coralogix · Oct 31, 2023 · d2a6918 · d2a6918
1 parent a03b024
commit d2a6918
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/src/fetch.rs b/src/fetch.rs
@@ -54,6 +54,7 @@ pub fn lock(
                         .resolve(
                             &dependency.coordinate,
                             &dependency.specification,
+                            None,
                             &dependency.name,
                         )
                         .map_err(FetchError::Resolver)?;
@@ -194,6 +195,7 @@ mod tests {
             &self,
             coordinate: &Coordinate,
             specification: &RevisionSpecification,
+            _: Option<&str>,
             _: &DependencyName,
         ) -> anyhow::Result<ResolvedModule> {
             Ok(self

diff --git a/src/resolver/git.rs b/src/resolver/git.rs
@@ -1,6 +1,6 @@
 use crate::{
     cache::{ProtofetchGitCache, RepositoryCache},
-    model::protofetch::{Coordinate, DependencyName, RevisionSpecification},
+    model::protofetch::{Coordinate, DependencyName, Revision, RevisionSpecification},
 };
 
 use super::{ModuleResolver, ResolvedModule};
@@ -10,10 +10,19 @@ impl ModuleResolver for ProtofetchGitCache {
         &self,
         coordinate: &Coordinate,
         specification: &RevisionSpecification,
+        commit_hash: Option<&str>,
         name: &DependencyName,
     ) -> anyhow::Result<ResolvedModule> {
         let repository = self.clone_or_update(coordinate)?;
-        let commit_hash = repository.resolve_commit_hash(specification)?;
+        let commit_hash = if specification.revision == Revision::Arbitrary {
+            if let Some(commit_hash) = commit_hash {
+                commit_hash.to_owned()
+            } else {
+                repository.resolve_commit_hash(specification)?
+            }
+        } else {
+            repository.resolve_commit_hash(specification)?
+        };
         let descriptor = repository.extract_descriptor(name, &commit_hash)?;
         Ok(ResolvedModule {
             commit_hash,

diff --git a/src/resolver/lock.rs b/src/resolver/lock.rs
@@ -29,6 +29,7 @@ where
         &self,
         coordinate: &Coordinate,
         specification: &RevisionSpecification,
+        commit_hash: Option<&str>,
         name: &DependencyName,
     ) -> anyhow::Result<ResolvedModule> {
         let dependency = self.lock_file.dependencies.iter().find(|dependency| {
@@ -40,10 +41,20 @@ where
                     "Dependency {} {} found in the lock file with commit {}",
                     coordinate, specification, dependency.commit_hash
                 );
-                let commit_hash = dependency.commit_hash.clone();
-                let resolved = self.inner.resolve(coordinate, specification, name)?;
-                if resolved.commit_hash != commit_hash {
-                    bail!("Commit hash of {} {} changed: the lock file specifies {}, but the actual commit hash is {}", coordinate, specification, commit_hash, resolved.commit_hash);
+                let resolved = self.inner.resolve(
+                    coordinate,
+                    specification,
+                    commit_hash.or(Some(&dependency.commit_hash)),
+                    name,
+                )?;
+                if resolved.commit_hash != dependency.commit_hash {
+                    bail!(
+                        "Commit hash of {} {} changed: the lock file specifies {}, but the actual commit hash is {}",
+                        coordinate,
+                        specification,
+                        dependency.commit_hash,
+                        resolved.commit_hash
+                    );
                 }
                 Ok(resolved)
             }
@@ -59,7 +70,8 @@ where
                     "Dependency {} {} not found in the lock file",
                     coordinate, specification
                 );
-                self.inner.resolve(coordinate, specification, name)
+                self.inner
+                    .resolve(coordinate, specification, commit_hash, name)
             }
         }
     }

diff --git a/src/resolver/mod.rs b/src/resolver/mod.rs
@@ -10,6 +10,7 @@ pub trait ModuleResolver {
         &self,
         coordinate: &Coordinate,
         specification: &RevisionSpecification,
+        commit_hash: Option<&str>,
         name: &DependencyName,
     ) -> anyhow::Result<ResolvedModule>;
 }
@@ -28,8 +29,9 @@ where
         &self,
         coordinate: &Coordinate,
         specification: &RevisionSpecification,
+        commit_hash: Option<&str>,
         name: &DependencyName,
     ) -> anyhow::Result<ResolvedModule> {
-        T::resolve(self, coordinate, specification, name)
+        T::resolve(self, coordinate, specification, commit_hash, name)
     }
 }