@@ -33,16 +33,16 @@ impl RepoMode {
33
33
}
34
34
35
35
#[ cargo_test]
36
- fn gitoxide_fetch_shallow_two_revs_same_deps ( ) {
37
- fetch_two_revs_same_deps ( Backend :: Gitoxide , RepoMode :: Shallow )
36
+ fn gitoxide_fetch_shallow_dep_two_revs ( ) {
37
+ fetch_dep_two_revs ( Backend :: Gitoxide , RepoMode :: Shallow )
38
38
}
39
39
40
40
#[ cargo_test]
41
- fn git2_fetch_complete_two_revs_same_deps ( ) {
42
- fetch_two_revs_same_deps ( Backend :: Git2 , RepoMode :: Complete )
41
+ fn git2_fetch_complete_dep_two_revs ( ) {
42
+ fetch_dep_two_revs ( Backend :: Git2 , RepoMode :: Complete )
43
43
}
44
44
45
- fn fetch_two_revs_same_deps ( backend : Backend , mode : RepoMode ) {
45
+ fn fetch_dep_two_revs ( backend : Backend , mode : RepoMode ) {
46
46
let bar = git:: new ( "meta-dep" , |project| {
47
47
project
48
48
. file ( "Cargo.toml" , & basic_manifest ( "bar" , "0.0.0" ) )
@@ -129,7 +129,7 @@ fn fetch_two_revs_same_deps(backend: Backend, mode: RepoMode) {
129
129
}
130
130
131
131
#[ cargo_test]
132
- fn shallow_deps_work_with_revisions_and_branches_mixed_on_same_dependency ( ) -> anyhow:: Result < ( ) > {
132
+ fn gitoxide_fetch_shallow_dep_branch_and_rev ( ) -> anyhow:: Result < ( ) > {
133
133
let ( bar, bar_repo) = git:: new_repo ( "bar" , |p| {
134
134
p. file ( "Cargo.toml" , & basic_manifest ( "bar" , "1.0.0" ) )
135
135
. file ( "src/lib.rs" , "" )
@@ -187,7 +187,7 @@ fn shallow_deps_work_with_revisions_and_branches_mixed_on_same_dependency() -> a
187
187
}
188
188
189
189
#[ cargo_test]
190
- fn gitoxide_git_dependencies_switch_from_branch_to_rev ( ) -> anyhow:: Result < ( ) > {
190
+ fn gitoxide_fetch_shallow_dep_branch_to_rev ( ) -> anyhow:: Result < ( ) > {
191
191
// db exists from previous build, then dependency changes to refer to revision that isn't
192
192
// available in the shallow fetch.
193
193
@@ -266,8 +266,7 @@ fn gitoxide_git_dependencies_switch_from_branch_to_rev() -> anyhow::Result<()> {
266
266
}
267
267
268
268
#[ cargo_test]
269
- fn gitoxide_fetch_registry_with_shallow_protocol_and_follow_up_with_git2_fetch (
270
- ) -> anyhow:: Result < ( ) > {
269
+ fn gitoxide_fetch_shallow_index_then_git2_fetch_complete ( ) -> anyhow:: Result < ( ) > {
271
270
Package :: new ( "bar" , "1.0.0" ) . publish ( ) ;
272
271
let p = project ( )
273
272
. file (
@@ -323,8 +322,7 @@ fn gitoxide_fetch_registry_with_shallow_protocol_and_follow_up_with_git2_fetch(
323
322
}
324
323
325
324
#[ cargo_test]
326
- fn gitoxide_fetch_git_dependency_with_shallow_protocol_and_git2_is_used_for_followup_fetches (
327
- ) -> anyhow:: Result < ( ) > {
325
+ fn gitoxide_fetch_shallow_dep_then_git2_fetch_complete ( ) -> anyhow:: Result < ( ) > {
328
326
// Example where an old lockfile with an explicit branch="master" in Cargo.toml.
329
327
Package :: new ( "bar" , "1.0.0" ) . publish ( ) ;
330
328
let ( bar, bar_repo) = git:: new_repo ( "bar" , |p| {
@@ -461,7 +459,7 @@ fn gitoxide_fetch_git_dependency_with_shallow_protocol_and_git2_is_used_for_foll
461
459
}
462
460
463
461
#[ cargo_test]
464
- fn gitoxide_shallow_fetch_followed_by_non_shallow_update ( ) -> anyhow:: Result < ( ) > {
462
+ fn gitoxide_fetch_shallow_dep_then_gitoxide_fetch_complete ( ) -> anyhow:: Result < ( ) > {
465
463
Package :: new ( "bar" , "1.0.0" ) . publish ( ) ;
466
464
let ( bar, bar_repo) = git:: new_repo ( "bar" , |p| {
467
465
p. file ( "Cargo.toml" , & basic_manifest ( "bar" , "1.0.0" ) )
@@ -600,8 +598,7 @@ fn gitoxide_shallow_fetch_followed_by_non_shallow_update() -> anyhow::Result<()>
600
598
}
601
599
602
600
#[ cargo_test]
603
- fn gitoxide_fetch_registry_with_shallow_protocol_and_follow_up_fetch_maintains_shallowness (
604
- ) -> anyhow:: Result < ( ) > {
601
+ fn gitoxide_fetch_shallow_index_then_preserve_shallow ( ) -> anyhow:: Result < ( ) > {
605
602
Package :: new ( "bar" , "1.0.0" ) . publish ( ) ;
606
603
let p = project ( )
607
604
. file (
@@ -674,8 +671,7 @@ fn gitoxide_fetch_registry_with_shallow_protocol_and_follow_up_fetch_maintains_s
674
671
675
672
/// If there is shallow *and* non-shallow fetches, non-shallow will naturally be returned due to sort order.
676
673
#[ cargo_test]
677
- fn gitoxide_fetch_registry_without_shallow_protocol_and_follow_up_fetch_uses_shallowness (
678
- ) -> anyhow:: Result < ( ) > {
674
+ fn gitoxide_fetch_complete_index_then_shallow ( ) -> anyhow:: Result < ( ) > {
679
675
Package :: new ( "bar" , "1.0.0" ) . publish ( ) ;
680
676
let p = project ( )
681
677
. file (
@@ -765,8 +761,7 @@ fn gitoxide_fetch_registry_without_shallow_protocol_and_follow_up_fetch_uses_sha
765
761
}
766
762
767
763
#[ cargo_test]
768
- fn gitoxide_fetch_registry_with_shallow_protocol_and_aborts_and_updates_again ( ) -> anyhow:: Result < ( ) >
769
- {
764
+ fn gitoxide_fetch_shallow_index_then_abort_and_update ( ) -> anyhow:: Result < ( ) > {
770
765
Package :: new ( "bar" , "1.0.0" ) . publish ( ) ;
771
766
let p = project ( )
772
767
. file (
0 commit comments