feat(manifest): allow git dependency alongside alternative registry

Author: enricobolzonello

src/cargo/util/toml/mod.rs

@@ -2362,21 +2362,17 @@ fn to_dependency_source_id<P: ResolveToPath + Clone>(
         orig.registry.as_deref(),
         orig.registry_index.as_ref(),
     ) {
-        (Some(_git), _, Some(_registry), _) | (Some(_git), _, _, Some(_registry)) => bail!(
-            "dependency ({name_in_toml}) specification is ambiguous. \
-                 Only one of `git` or `registry` is allowed.",
-        ),
-        (_, _, Some(_registry), Some(_registry_index)) => bail!(
-            "dependency ({name_in_toml}) specification is ambiguous. \
-                 Only one of `registry` or `registry-index` is allowed.",
-        ),
-        (Some(_git), Some(_path), None, None) => {
+        (Some(_git), Some(_path), _, _) => {
             bail!(
                 "dependency ({name_in_toml}) specification is ambiguous. \
                      Only one of `git` or `path` is allowed.",
             );
         }
-        (Some(git), None, None, None) => {
+        (_, _, Some(_registry), Some(_registry_index)) => bail!(
+            "dependency ({name_in_toml}) specification is ambiguous. \
+                 Only one of `registry` or `registry-index` is allowed.",
+        ),
+        (Some(git), None, _, _) => {
             let n_details = [&orig.branch, &orig.tag, &orig.rev]
                 .iter()
                 .filter(|d| d.is_some())

src/doc/src/reference/specifying-dependencies.md

@@ -389,11 +389,11 @@ The use of `path` and `version` keys together is explained in the [Multiple loca
 
 ## Multiple locations
 
-It is possible to specify both a registry version and a `git` or `path`
-location. The `git` or `path` dependency will be used locally (in which case
-the `version` is checked against the local copy), and when published to a
-registry like [crates.io], it will use the registry version. Other
-combinations are not allowed. Examples:
+It is possible to specify both a `git` or `path` location and either a
+registry version or an alternative registry. The `git` or `path` dependency
+will be used locally, and when published to a registry it will use the
+registry version. If a `version` is specified, it is checked against the
+local copy. Other combinations are not allowed. Examples:
 
 ```toml
 [dependencies]
@@ -405,6 +405,11 @@ bitflags = { path = "my-bitflags", version = "1.0" }
 # version 1.0 from crates.io when published.
 smallvec = { git = "https://github.com/servo/rust-smallvec.git", version = "1.0" }
 
+# Uses the given git repo when used locally, and uses
+# version 1.0 from `my-registry` when published.
+# See [the alternate registry chapter](registries.md#using-an-alternate-registry) for how to use an alternate registry.
+smallvec = { git = "https://github.com/servo/rust-smallvec.git", version = "1.0", registry = "my-registry" }
+
 # Note: if a version doesn't match, Cargo will fail to compile!
 ```
 

tests/testsuite/alt_registry.rs

@@ -274,12 +274,12 @@ fn registry_and_git_dep_works() {
     Package::new("bar", "0.0.1").alternative(true).publish();
 
     p.cargo("check")
-        .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] failed to parse manifest at `[ROOT]/foo/Cargo.toml`
-
-Caused by:
-  dependency (bar) specification is ambiguous. Only one of `git` or `registry` is allowed.
+[UPDATING] git repository `[ROOTURL]/bar`
+[LOCKING] 1 package to latest compatible version
+[CHECKING] bar v0.0.1 ([ROOTURL]/bar#[..])
+[CHECKING] foo v0.0.1 ([ROOT]/foo)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
         .run();
@@ -720,15 +720,62 @@ fn publish_with_git_and_registry_dep() {
     Package::new("bar", "0.0.1").alternative(true).publish();
 
     p.cargo("publish --registry alternative")
-        .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] failed to parse manifest at `[ROOT]/foo/Cargo.toml`
-
-Caused by:
-  dependency (bar) specification is ambiguous. Only one of `git` or `registry` is allowed.
+[UPDATING] `alternative` index
+[PACKAGING] foo v0.0.1 ([ROOT]/foo)
+[UPDATING] `alternative` index
+[PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
+[VERIFYING] foo v0.0.1 ([ROOT]/foo)
+[DOWNLOADING] crates ...
+[DOWNLOADED] bar v0.0.1 (registry `alternative`)
+[COMPILING] bar v0.0.1 (registry `alternative`)
+[COMPILING] foo v0.0.1 ([ROOT]/foo/target/package/foo-0.0.1)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[UPLOADING] foo v0.0.1 ([ROOT]/foo)
+[UPLOADED] foo v0.0.1 to registry `alternative`
+[NOTE] waiting for foo v0.0.1 to be available at registry `alternative`
+[HELP] you may press ctrl-c to skip waiting; the crate should be available shortly
+[PUBLISHED] foo v0.0.1 at registry `alternative`
 
 "#]])
         .run();
+
+    validate_alt_upload(
+        r#"{
+            "authors": [],
+            "badges": {},
+            "categories": [],
+            "deps": [
+                {
+                    "default_features": true,
+                    "features": [],
+                    "kind": "normal",
+                    "name": "bar",
+                    "optional": false,
+                    "target": null,
+                    "version_req": "^0.0.1"
+                }
+            ],
+            "description": null,
+            "documentation": null,
+            "features": {},
+            "homepage": null,
+            "keywords": [],
+            "license": null,
+            "license_file": null,
+            "links": null,
+            "name": "foo",
+            "readme": null,
+            "readme_file": null,
+            "repository": null,
+            "homepage": null,
+            "documentation": null,
+            "rust_version": null,
+            "vers": "0.0.1"
+        }"#,
+        "foo-0.0.1.crate",
+        &["Cargo.lock", "Cargo.toml", "Cargo.toml.orig", "src/main.rs"],
+    );
 }
 
 #[cargo_test]

tests/testsuite/cargo_add/git_registry/mod.rs

@@ -46,7 +46,6 @@ fn case() {
         ])
         .current_dir(cwd)
         .assert()
-        .failure()
         .stdout_eq(str![""])
         .stderr_eq(file!["stderr.term.svg"]);