Merging upstream version 1.73.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 195 insertions, 0 deletions

diff --git a/src/tools/cargo/tests/testsuite/lockfile_compat.rs b/src/tools/cargo/tests/testsuite/lockfile_compat.rs
index 63148cc07..97dcff123 100644
--- a/src/tools/cargo/tests/testsuite/lockfile_compat.rs
+++ b/src/tools/cargo/tests/testsuite/lockfile_compat.rs
@@ -966,3 +966,198 @@ version = "0.0.1"
     let lock = p.read_lockfile();
     assert_match_exact(lockfile, &lock);
 }
+
+fn create_branch(repo: &git2::Repository, branch: &str, head_id: git2::Oid) {
+    repo.branch(branch, &repo.find_commit(head_id).unwrap(), true)
+        .unwrap();
+}
+
+fn create_tag(repo: &git2::Repository, tag: &str, head_id: git2::Oid) {
+    repo.tag(
+        tag,
+        &repo.find_object(head_id, None).unwrap(),
+        &repo.signature().unwrap(),
+        "make a new tag",
+        false,
+    )
+    .unwrap();
+}
+
+fn v3_and_git_url_encoded(ref_kind: &str, f: impl FnOnce(&git2::Repository, &str, git2::Oid)) {
+    let (git_project, repo) = git::new_repo("dep1", |project| {
+        project
+            .file("Cargo.toml", &basic_lib_manifest("dep1"))
+            .file("src/lib.rs", "")
+    });
+    let url = git_project.url();
+    let head_id = repo.head().unwrap().target().unwrap();
+    // Ref name with special characters
+    let git_ref = "a-_+#$)";
+    f(&repo, git_ref, head_id);
+
+    let lockfile = format!(
+        r#"# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "dep1"
+version = "0.5.0"
+source = "git+{url}?{ref_kind}={git_ref}#{head_id}"
+
+[[package]]
+name = "foo"
+version = "0.0.1"
+dependencies = [
+ "dep1",
+]
+"#,
+    );
+
+    let p = project()
+        .file(
+            "Cargo.toml",
+            &format!(
+                r#"
+                    [package]
+                    name = "foo"
+                    version = "0.0.1"
+
+                    [dependencies]
+                    dep1 = {{ git = '{url}', {ref_kind} = '{git_ref}' }}
+                "#,
+            ),
+        )
+        .file("src/lib.rs", "")
+        .file("Cargo.lock", "version = 3")
+        .build();
+
+    p.cargo("check")
+        .with_stderr(format!(
+            "\
+[UPDATING] git repository `{url}`
+[CHECKING] dep1 v0.5.0 ({url}?{ref_kind}={git_ref}#[..])
+[CHECKING] foo v0.0.1 ([CWD])
+[FINISHED] dev [..]
+"
+        ))
+        .run();
+
+    let lock = p.read_lockfile();
+    assert_match_exact(&lockfile, &lock);
+
+    // v3 doesn't URL-encode URL parameters, but `url` crate does decode as it
+    // was URL-encoded. Therefore Cargo thinks they are from different source
+    // and clones the repository again.
+    p.cargo("check")
+        .with_stderr(format!(
+            "\
+[UPDATING] git repository `{url}`
+[FINISHED] dev [..]
+"
+        ))
+        .run();
+}
+
+#[cargo_test]
+fn v3_and_git_url_encoded_branch() {
+    v3_and_git_url_encoded("branch", create_branch);
+}
+
+#[cargo_test]
+fn v3_and_git_url_encoded_tag() {
+    v3_and_git_url_encoded("tag", create_tag);
+}
+
+#[cargo_test]
+fn v3_and_git_url_encoded_rev() {
+    v3_and_git_url_encoded("rev", create_tag);
+}
+
+fn v4_and_git_url_encoded(ref_kind: &str, f: impl FnOnce(&git2::Repository, &str, git2::Oid)) {
+    let (git_project, repo) = git::new_repo("dep1", |project| {
+        project
+            .file("Cargo.toml", &basic_lib_manifest("dep1"))
+            .file("src/lib.rs", "")
+    });
+    let url = git_project.url();
+    let head_id = repo.head().unwrap().target().unwrap();
+    // Ref name with special characters
+    let git_ref = "a-_+#$)";
+    let encoded_ref = "a-_%2B%23%24%29";
+    f(&repo, git_ref, head_id);
+
+    let lockfile = format!(
+        r#"# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "dep1"
+version = "0.5.0"
+source = "git+{url}?{ref_kind}={encoded_ref}#{head_id}"
+
+[[package]]
+name = "foo"
+version = "0.0.1"
+dependencies = [
+ "dep1",
+]
+"#,
+    );
+
+    let p = project()
+        .file(
+            "Cargo.toml",
+            &format!(
+                r#"
+                    [package]
+                    name = "foo"
+                    version = "0.0.1"
+
+                    [dependencies]
+                    dep1 = {{ git = '{url}', {ref_kind} = '{git_ref}' }}
+                "#,
+            ),
+        )
+        .file("src/lib.rs", "")
+        .file("Cargo.lock", "version = 4")
+        .build();
+
+    p.cargo("check -Znext-lockfile-bump")
+        .masquerade_as_nightly_cargo(&["-Znext-lockfile-bump"])
+        .with_stderr(format!(
+            "\
+[UPDATING] git repository `{url}`
+[CHECKING] dep1 v0.5.0 ({url}?{ref_kind}={git_ref}#[..])
+[CHECKING] foo v0.0.1 ([CWD])
+[FINISHED] dev [..]
+"
+        ))
+        .run();
+
+    let lock = p.read_lockfile();
+    assert_match_exact(&lockfile, &lock);
+
+    // Unlike v3_and_git_url_encoded, v4 encodes URL parameters so no git
+    // repository re-clone happen.
+    p.cargo("check -Znext-lockfile-bump")
+        .masquerade_as_nightly_cargo(&["-Znext-lockfile-bump"])
+        .with_stderr("[FINISHED] dev [..]")
+        .run();
+}
+
+#[cargo_test]
+fn v4_and_git_url_encoded_branch() {
+    v4_and_git_url_encoded("branch", create_branch);
+}
+
+#[cargo_test]
+fn v4_and_git_url_encoded_tag() {
+    v4_and_git_url_encoded("tag", create_tag);
+}
+
+#[cargo_test]
+fn v4_and_git_url_encoded_rev() {
+    v4_and_git_url_encoded("rev", create_tag)
+}