blob: 1558a4acd3b1282a29c722846fa1487c9bd85903 [file] [log] [blame]
use crate::prelude::*;
use cargo_test_support::registry::Package;
use cargo_test_support::{basic_manifest, git, paths, project};
use crate::git_gc::find_index;
#[derive(Copy, Clone, Debug)]
enum Backend {
Git2,
Gitoxide,
GitCli,
}
impl Backend {
fn to_arg(&self) -> &'static str {
match self {
Backend::Git2 => "",
Backend::Gitoxide => "-Zgitoxide=fetch",
Backend::GitCli => "--config=net.git-fetch-with-cli=true",
}
}
fn to_trace_log(&self) -> &str {
match self {
Backend::Git2 => r#"[..]git-fetch: backend="libgit2"[..]"#,
Backend::Gitoxide => r#"[..]git-fetch: backend="gitoxide"[..]"#,
Backend::GitCli => r#"[..]git-fetch: backend="git-cli"[..]"#,
}
}
}
#[derive(Copy, Clone, Debug)]
enum RepoMode {
Shallow,
Complete,
}
impl RepoMode {
fn to_deps_arg(&self) -> &'static str {
match self {
RepoMode::Complete => "",
RepoMode::Shallow => "-Zgit=shallow-deps",
}
}
fn to_index_arg(&self) -> &'static str {
match self {
RepoMode::Complete => "",
RepoMode::Shallow => "-Zgit=shallow-index",
}
}
#[track_caller]
fn assert_index(self, repo: &gix::Repository, shallow_depth: usize, complete_depth: usize) {
let commit_count = repo
.rev_parse_single("origin/HEAD")
.unwrap()
.ancestors()
.all()
.unwrap()
.count();
match self {
RepoMode::Shallow => {
assert_eq!(commit_count, shallow_depth,);
assert!(repo.is_shallow());
}
RepoMode::Complete => {
assert_eq!(commit_count, complete_depth,);
assert!(!repo.is_shallow());
}
}
}
}
#[cargo_test]
fn gitoxide_fetch_shallow_dep_two_revs() {
fetch_dep_two_revs(Backend::Gitoxide)
}
#[cargo_test]
fn git_cli_fetch_shallow_dep_two_revs() {
fetch_dep_two_revs(Backend::GitCli)
}
fn fetch_dep_two_revs(backend: Backend) {
let bar = git::new("meta-dep", |project| {
project
.file("Cargo.toml", &basic_manifest("bar", "0.0.0"))
.file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
});
let repo = git2::Repository::open(&bar.root()).unwrap();
let rev1 = repo.revparse_single("HEAD").unwrap().id();
// Commit the changes and make sure we trigger a recompile
bar.change_file("src/lib.rs", "pub fn bar() -> i32 { 2 }");
git::add(&repo);
let rev2 = git::commit(&repo);
let foo = project()
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "foo"
version = "0.0.0"
authors = []
[dependencies.bar]
git = '{}'
rev = "{}"
[dependencies.baz]
path = "../baz"
"#,
bar.url(),
rev1
),
)
.file(
"src/main.rs",
r#"
extern crate bar;
extern crate baz;
fn main() {
assert_eq!(bar::bar(), 1);
assert_eq!(baz::baz(), 2);
}
"#,
)
.build();
let _baz = project()
.at("baz")
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "baz"
version = "0.0.0"
authors = []
[dependencies.bar]
git = '{}'
rev = "{}"
"#,
bar.url(),
rev2
),
)
.file(
"src/lib.rs",
r#"
extern crate bar;
pub fn baz() -> i32 { bar::bar() }
"#,
)
.build();
foo.cargo("check -v")
.arg_line(backend.to_arg())
.arg_line(RepoMode::Shallow.to_deps_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0") // respect `backend`
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
}
#[cargo_test]
fn gitoxide_fetch_shallow_dep_branch_and_rev() -> anyhow::Result<()> {
fetch_shallow_dep_branch_and_rev(Backend::Gitoxide)
}
#[cargo_test]
fn git_cli_fetch_shallow_dep_branch_and_rev() -> anyhow::Result<()> {
fetch_shallow_dep_branch_and_rev(Backend::GitCli)
}
fn fetch_shallow_dep_branch_and_rev(backend: Backend) -> anyhow::Result<()> {
let (bar, bar_repo) = git::new_repo("bar", |p| {
p.file("Cargo.toml", &basic_manifest("bar", "1.0.0"))
.file("src/lib.rs", "")
});
// this commit would not be available in a shallow fetch.
let first_commit_pre_change = bar_repo.head().unwrap().target().unwrap();
bar.change_file("src/lib.rs", "// change");
git::add(&bar_repo);
git::commit(&bar_repo);
let p = project()
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar-renamed = {{ package = "bar", git = "{}", rev = "{}" }}
bar = {{ git = "{}", branch = "master" }}
"#,
bar.url(),
first_commit_pre_change,
bar.url(),
),
)
.file("src/lib.rs", "")
.build();
p.cargo("check")
.arg_line(backend.to_arg())
.arg_line(RepoMode::Shallow.to_deps_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
let db_paths = glob::glob(paths::home().join(".cargo/git/db/bar-*").to_str().unwrap())?
.map(Result::unwrap)
.collect::<Vec<_>>();
assert_eq!(
db_paths.len(),
1,
"only one db checkout source is used per dependency"
);
let db_clone = gix::open_opts(&db_paths[0], gix::open::Options::isolated())?;
assert!(
db_clone.is_shallow(),
"the repo is shallow while having all data it needs"
);
Ok(())
}
#[cargo_test]
fn gitoxide_fetch_shallow_dep_branch_to_rev() -> anyhow::Result<()> {
fetch_shallow_dep_branch_to_rev(Backend::Gitoxide)
}
#[cargo_test]
fn git_cli_fetch_shallow_dep_branch_to_rev() -> anyhow::Result<()> {
fetch_shallow_dep_branch_to_rev(Backend::GitCli)
}
fn fetch_shallow_dep_branch_to_rev(backend: Backend) -> anyhow::Result<()> {
// db exists from previous build, then dependency changes to refer to revision that isn't
// available in the shallow fetch.
let (bar, bar_repo) = git::new_repo("bar", |p| {
p.file("Cargo.toml", &basic_manifest("bar", "1.0.0"))
.file("src/lib.rs", "")
});
// this commit would not be available in a shallow fetch.
let first_commit_pre_change = bar_repo.head().unwrap().target().unwrap();
bar.change_file("src/lib.rs", "// change");
git::add(&bar_repo);
git::commit(&bar_repo);
let p = project()
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = {{ git = "{}", branch = "master" }}
"#,
bar.url(),
),
)
.file("src/lib.rs", "")
.build();
p.cargo("check")
.arg_line(backend.to_arg())
.arg_line(RepoMode::Shallow.to_deps_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
let db_clone = gix::open_opts(
find_bar_db(RepoMode::Shallow),
gix::open::Options::isolated(),
)?;
assert!(db_clone.is_shallow());
let p = project()
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = {{ git = "{}", rev = "{}" }}
"#,
bar.url(),
first_commit_pre_change
),
)
.file("src/lib.rs", "")
.build();
p.cargo("check")
.arg_line(backend.to_arg())
.arg_line(RepoMode::Shallow.to_deps_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
assert!(
db_clone.is_shallow(),
"we maintain shallowness and never unshallow"
);
Ok(())
}
#[cargo_test]
fn gitoxide_fetch_shallow_index_then_git2_fetch_complete() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::Gitoxide,
RepoMode::Shallow,
Backend::Git2,
RepoMode::Complete,
)
}
#[cargo_test]
fn gitoxide_fetch_shallow_index_then_git_cli_fetch_shallow() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::Gitoxide,
RepoMode::Shallow,
Backend::GitCli,
RepoMode::Shallow,
)
}
#[cargo_test]
fn gitoxide_fetch_complete_index_then_git_cli_fetch_shallow() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::Gitoxide,
RepoMode::Complete,
Backend::GitCli,
RepoMode::Shallow,
)
}
#[cargo_test]
fn gitoxide_fetch_shallow_index_then_git_cli_fetch_complete() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::Gitoxide,
RepoMode::Shallow,
Backend::GitCli,
RepoMode::Complete,
)
}
#[cargo_test]
fn git_cli_fetch_shallow_index_then_git2_fetch_complete() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::GitCli,
RepoMode::Shallow,
Backend::Git2,
RepoMode::Complete,
)
}
#[cargo_test]
fn git_cli_fetch_shallow_index_then_gitoxide_fetch_shallow() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::GitCli,
RepoMode::Shallow,
Backend::Gitoxide,
RepoMode::Shallow,
)
}
#[cargo_test]
fn git_cli_fetch_shallow_complete_then_gitoxide_fetch_complete() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::GitCli,
RepoMode::Complete,
Backend::Gitoxide,
RepoMode::Shallow,
)
}
#[cargo_test]
fn git_cli_fetch_shallow_index_then_gitoxide_fetch_complete() -> anyhow::Result<()> {
fetch_index_then_fetch(
Backend::GitCli,
RepoMode::Shallow,
Backend::Gitoxide,
RepoMode::Complete,
)
}
fn fetch_index_then_fetch(
backend_1st: Backend,
mode_1st: RepoMode,
backend_2nd: Backend,
mode_2nd: RepoMode,
) -> anyhow::Result<()> {
Package::new("bar", "1.0.0").publish();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = "1.0"
"#,
)
.file("src/lib.rs", "")
.build();
p.cargo("fetch")
.arg_line(backend_1st.to_arg())
.arg_line(mode_1st.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend_1st.to_trace_log())
.run();
let repo = gix::open_opts(find_remote_index(mode_1st), gix::open::Options::isolated())?;
let complete_depth = 2; // initial commit, bar@1.0.0
mode_1st.assert_index(&repo, 1, complete_depth);
Package::new("bar", "1.1.0").publish();
p.cargo("update")
.arg_line(backend_2nd.to_arg())
.arg_line(mode_2nd.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend_2nd.to_trace_log())
.run();
let repo = gix::open_opts(find_remote_index(mode_2nd), gix::open::Options::isolated())?;
let complete_depth = 3; // initial commit, bar@1.0.0, and bar@1.1.0
mode_2nd.assert_index(&repo, 1, complete_depth);
Ok(())
}
#[cargo_test]
fn gitoxide_fetch_shallow_dep_then_git2_fetch_complete() -> anyhow::Result<()> {
fetch_shallow_dep_then_fetch_complete(Backend::Gitoxide, Backend::Git2)
}
#[cargo_test]
fn git_cli_fetch_shallow_dep_then_git2_fetch_complete() -> anyhow::Result<()> {
fetch_shallow_dep_then_fetch_complete(Backend::GitCli, Backend::Git2)
}
#[cargo_test]
fn gitoxide_fetch_shallow_dep_then_gitoxide_fetch_complete() -> anyhow::Result<()> {
fetch_shallow_dep_then_fetch_complete(Backend::Gitoxide, Backend::Gitoxide)
}
#[cargo_test]
fn git_cli_fetch_shallow_dep_then_gitoxide_fetch_complete() -> anyhow::Result<()> {
fetch_shallow_dep_then_fetch_complete(Backend::GitCli, Backend::Gitoxide)
}
#[cargo_test]
fn gitoxide_fetch_shallow_dep_then_git_cli_fetch_complete() -> anyhow::Result<()> {
fetch_shallow_dep_then_fetch_complete(Backend::Gitoxide, Backend::GitCli)
}
#[cargo_test]
fn git_cli_fetch_shallow_dep_then_git_cli_fetch_complete() -> anyhow::Result<()> {
fetch_shallow_dep_then_fetch_complete(Backend::GitCli, Backend::GitCli)
}
fn fetch_shallow_dep_then_fetch_complete(
backend_1st: Backend,
backend_2nd: Backend,
) -> anyhow::Result<()> {
// Example where an old lockfile with an explicit branch="master" in Cargo.toml.
Package::new("bar", "1.0.0").publish();
let (bar, bar_repo) = git::new_repo("bar", |p| {
p.file("Cargo.toml", &basic_manifest("bar", "1.0.0"))
.file("src/lib.rs", "")
});
bar.change_file("src/lib.rs", "// change");
git::add(&bar_repo);
git::commit(&bar_repo);
{
let mut walk = bar_repo.revwalk()?;
walk.push_head()?;
assert_eq!(
walk.count(),
2,
"original repo has initial commit and change commit"
);
}
let p = project()
.file(
"Cargo.toml",
&format!(
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = {{ version = "1.0", git = "{}", branch = "master" }}
"#,
bar.url()
),
)
.file("src/lib.rs", "")
.build();
p.cargo("update")
.arg_line(backend_1st.to_arg())
.arg_line(RepoMode::Shallow.to_deps_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend_1st.to_trace_log())
.run();
let db_clone = gix::open_opts(
find_bar_db(RepoMode::Shallow),
gix::open::Options::isolated(),
)?;
assert!(db_clone.is_shallow());
assert_eq!(
db_clone
.rev_parse_single("origin/master")?
.ancestors()
.all()?
.count(),
1,
"db fetch are shallow and have a shortened history"
);
let dep_checkout = gix::open_opts(
find_lexicographically_first_bar_checkout(),
gix::open::Options::isolated(),
)?;
assert!(dep_checkout.is_shallow());
assert_eq!(
dep_checkout.head_id()?.ancestors().all()?.count(),
1,
"db checkouts are hard-linked fetches with the shallow file copied separately."
);
bar.change_file("src/lib.rs", "// another change");
git::add(&bar_repo);
git::commit(&bar_repo);
{
let mut walk = bar_repo.revwalk()?;
walk.push_head()?;
assert_eq!(
walk.count(),
3,
"original repo has initial commit and change commit, and another change"
);
}
p.cargo("update")
.arg_line(backend_2nd.to_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend_2nd.to_trace_log())
.run();
let db_clone = gix::open_opts(
find_bar_db(RepoMode::Complete),
gix::open::Options::isolated(),
)?;
assert_eq!(
db_clone
.rev_parse_single("origin/master")?
.ancestors()
.all()?
.count(),
3,
"the db clone was re-initialized and has all commits"
);
assert!(
!db_clone.is_shallow(),
"shallow-ness was removed as git2 does not support it"
);
assert_eq!(
dep_checkout.head_id()?.ancestors().all()?.count(),
1,
"the original dep checkout didn't change - there is a new one for each update we get locally"
);
let max_history_depth = glob::glob(
paths::home()
.join(".cargo/git/checkouts/bar-*/*/.git")
.to_str()
.unwrap(),
)?
.map(|path| -> anyhow::Result<usize> {
let dep_checkout = gix::open_opts(path?, gix::open::Options::isolated())?;
let depth = dep_checkout.head_id()?.ancestors().all()?.count();
assert_eq!(dep_checkout.is_shallow(), depth == 1, "the first checkout is done with gitoxide and shallow, the second one is git2 non-shallow");
Ok(depth)
})
.map(Result::unwrap)
.max()
.expect("two checkout repos");
assert_eq!(
max_history_depth, 3,
"the new checkout sees all commits of the non-shallow DB repository"
);
Ok(())
}
#[cargo_test]
fn gitoxide_fetch_shallow_index_then_preserve_shallow() -> anyhow::Result<()> {
fetch_shallow_index_then_preserve_shallow(Backend::Gitoxide)
}
#[cargo_test]
fn git_cli_fetch_shallow_index_then_preserve_shallow() -> anyhow::Result<()> {
fetch_shallow_index_then_preserve_shallow(Backend::GitCli)
}
fn fetch_shallow_index_then_preserve_shallow(backend: Backend) -> anyhow::Result<()> {
Package::new("bar", "1.0.0").publish();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = "1.0"
"#,
)
.file("src/lib.rs", "")
.build();
p.cargo("fetch")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"shallow fetches always start at depth of 1 to minimize download size"
);
assert!(repo.is_shallow());
Package::new("bar", "1.1.0").publish();
p.cargo("update")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg()) // NOTE: the flag needs to be consistent or else a different index is created
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"subsequent shallow fetches wont' fetch what's inbetween, only the single commit that we need while leveraging existing commits"
);
assert!(repo.is_shallow());
Package::new("bar", "1.2.0").publish();
Package::new("bar", "1.3.0").publish();
p.cargo("update")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"shallow boundaries are moved with each fetch to maintain only a single commit of history"
);
assert!(repo.is_shallow());
Ok(())
}
/// If there is shallow *and* non-shallow fetches, non-shallow will naturally be returned due to sort order.
#[cargo_test]
fn gitoxide_fetch_complete_index_then_shallow() -> anyhow::Result<()> {
fetch_complete_index_then_shallow(Backend::Gitoxide)
}
#[cargo_test]
fn git_cli_fetch_complete_index_then_shallow() -> anyhow::Result<()> {
fetch_complete_index_then_shallow(Backend::GitCli)
}
fn fetch_complete_index_then_shallow(backend: Backend) -> anyhow::Result<()> {
Package::new("bar", "1.0.0").publish();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = "1.0"
"#,
)
.file("src/lib.rs", "")
.build();
p.cargo("fetch")
.arg_line(backend.to_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
2,
"initial commit and the first crate"
);
assert!(!repo.is_shallow());
Package::new("bar", "1.1.0").publish();
p.cargo("update")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
let shallow_repo = gix::open_opts(
find_remote_index(RepoMode::Shallow),
gix::open::Options::isolated(),
)?;
assert_eq!(
shallow_repo
.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"the follow up fetch an entirely new index which is now shallow and which is in its own location"
);
assert!(shallow_repo.is_shallow());
Package::new("bar", "1.2.0").publish();
Package::new("bar", "1.3.0").publish();
p.cargo("update")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
assert_eq!(
shallow_repo
.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"subsequent shallow fetches wont' fetch what's inbetween, only the single commit that we need while leveraging existing commits"
);
assert!(shallow_repo.is_shallow());
p.cargo("update")
.arg_line(backend.to_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
5,
"we can separately fetch the non-shallow index as well and it sees all commits"
);
Ok(())
}
#[cargo_test]
fn gitoxide_fetch_shallow_index_then_abort_and_update() -> anyhow::Result<()> {
fetch_shallow_index_then_abort_and_update(Backend::Gitoxide)
}
// Git CLI cannot recover from stale lock files like Gitoxide can.
// This test simulates an aborted fetch by creating a stale shallow.lock file.
// Gitoxide can detect and recover from this, but Git CLI will fail with:
//
// ```text
// fatal: Unable to create \'/path/to/.git/shallow.lock\': File exists.
//
// Another git process seems to be running in this repository, e.g.
// an editor opened by \'git commit\'. Please make sure all processes
// are terminated then try again. If it still fails, a git process
// may have crashed in this repository earlier:
// remove the file manually to continue.
// ```
#[cargo_test]
#[ignore = "Git CLI cannot recover from stale lock files"]
fn git_cli_fetch_shallow_index_then_abort_and_update() -> anyhow::Result<()> {
fetch_shallow_index_then_abort_and_update(Backend::GitCli)
}
fn fetch_shallow_index_then_abort_and_update(backend: Backend) -> anyhow::Result<()> {
Package::new("bar", "1.0.0").publish();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
[dependencies]
bar = "1.0"
"#,
)
.file("src/lib.rs", "")
.build();
p.cargo("fetch")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
let repo = gix::open_opts(find_index(), gix::open::Options::isolated())?;
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"shallow fetches always start at depth of 1 to minimize download size"
);
assert!(repo.is_shallow());
let shallow_lock = repo.shallow_file().with_extension("lock");
// adding a lock file and deleting the original simulates a left-over fetch that was aborted, leaving a lock file
// in place without ever having moved it to the right location.
std::fs::write(&shallow_lock, &[])?;
std::fs::remove_file(repo.shallow_file())?;
Package::new("bar", "1.1.0").publish();
p.cargo("update")
.arg_line(backend.to_arg())
.arg(RepoMode::Shallow.to_index_arg())
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0")
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-index"])
.env("CARGO_LOG", "git-fetch=debug")
.with_stderr_contains(backend.to_trace_log())
.run();
assert!(!shallow_lock.is_file(), "the repository was re-initialized");
assert!(repo.is_shallow());
assert_eq!(
repo.rev_parse_single("origin/HEAD")?
.ancestors()
.all()?
.count(),
1,
"it's a fresh shallow fetch - otherwise it would have 2 commits if the previous shallow fetch would still be present"
);
Ok(())
}
fn find_lexicographically_first_bar_checkout() -> std::path::PathBuf {
glob::glob(
paths::home()
.join(".cargo/git/checkouts/bar-*/*/.git")
.to_str()
.unwrap(),
)
.unwrap()
.next()
.unwrap()
.unwrap()
.to_owned()
}
fn find_remote_index(mode: RepoMode) -> std::path::PathBuf {
glob::glob(
paths::home()
.join(".cargo/registry/index/*")
.to_str()
.unwrap(),
)
.unwrap()
.map(Result::unwrap)
.filter(|p| p.to_string_lossy().ends_with("-shallow") == matches!(mode, RepoMode::Shallow))
.next()
.unwrap()
}
/// Find a checkout directory for bar, `shallow` or not.
fn find_bar_db(mode: RepoMode) -> std::path::PathBuf {
glob::glob(paths::home().join(".cargo/git/db/bar-*").to_str().unwrap())
.unwrap()
.map(Result::unwrap)
.filter(|p| p.to_string_lossy().ends_with("-shallow") == matches!(mode, RepoMode::Shallow))
.next()
.unwrap()
.to_owned()
}