feat(m0.6-r5): pinned Git packages and materialized environments
- add content-addressed Git checkout cache for exact revisions; no hooks, submodules or floating branches - resolve transitive @alias imports from each package's own manifest - materialize locked path/Git packages into .marqdo/env atomically and prefer a matching env copy in the resolver - make sync a real environment sync while keeping lock immutable - kill Unix foreign-kernel process groups so grandchildren do not survive - add Git/env/transitive integration tests and update package/security specs
This commit is contained in:
1 parent
b5a28a9825
commit
54c7b43d15
12 files changed
+862
-118
No files matched your search
@@ -1111,6 +1111,13 @@ pub fn sync(locked: bool, json: bool) -> i32 {
|
||||
);
|
||||
return 1;
|
||||
}
|
||||
let resolver =
|
||||
marqdo_package::PackageResolver::new(root, Some(manifest.clone()), Some(lockfile))
|
||||
.with_fetch(true);
|
||||
if let Err(error) = resolver.materialize_env(&manifest, &expected) {
|
||||
eprintln!("error: cannot materialize project environment: {error}");
|
||||
return 1;
|
||||
}
|
||||
if json {
|
||||
output::print_json(&json!({
|
||||
"command": "sync",
|
||||
@@ -1120,9 +1127,10 @@ pub fn sync(locked: bool, json: bool) -> i32 {
|
||||
}));
|
||||
} else {
|
||||
println!(
|
||||
"synchronized {} package(s){}",
|
||||
"synchronized {} package(s){} into {}",
|
||||
expected.packages.len(),
|
||||
if locked { " (locked)" } else { "" }
|
||||
if locked { " (locked)" } else { "" },
|
||||
resolver.env_root().display()
|
||||
);
|
||||
}
|
||||
0
|
||||
@@ -1143,7 +1151,8 @@ fn build_lockfile(
|
||||
root: &Path,
|
||||
manifest: &marqdo_package::Manifest,
|
||||
) -> Result<marqdo_package::LockFile, String> {
|
||||
let resolver = marqdo_package::PackageResolver::new(root, Some(manifest.clone()), None);
|
||||
let resolver =
|
||||
marqdo_package::PackageResolver::new(root, Some(manifest.clone()), None).with_fetch(true);
|
||||
let mut packages = Vec::new();
|
||||
for name in manifest.dependencies.keys() {
|
||||
let resolved = resolver.resolve_alias(name)?;
|
||||
|
||||
@@ -254,7 +254,7 @@ impl Loader {
|
||||
|
||||
for (alias, target, span) in imports {
|
||||
let resolved = if let Some(alias_name) = target.strip_prefix('@') {
|
||||
self.resolver.resolve_alias(alias_name)
|
||||
self.resolver.resolve_alias_from(package, alias_name)
|
||||
} else {
|
||||
self.resolver.resolve_relative(package, &path, &target)
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user