bail on existing version | modify test

Author: stupendoussuperpowers

src/cargo/ops/registry/publish.rs

@@ -139,6 +139,35 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
     )?;
     verify_dependencies(pkg, &registry, source_ids.original)?;
 
+    // Bail before packaging and uploading if same version already exists in the registry
+
+    let mut source = SourceConfigMap::empty(opts.gctx)?.load(reg_ids.original, &HashSet::new())?;
+
+    let query = Dependency::parse(pkg.name(), Some(&ver), reg_ids.original)?;
+
+    let _lock = opts
+        .gctx
+        .acquire_package_cache_lock(CacheLockMode::DownloadExclusive)?;
+
+    let duplicate_query = loop {
+        match source.query_vec(&query, QueryKind::Exact) {
+            std::task::Poll::Ready(res) => {
+                break res?;
+            }
+            std::task::Poll::Pending => source.block_until_ready()?,
+        }
+    };
+
+    drop(_lock);
+
+    if !duplicate_query.is_empty() {
+        bail!(
+            "crate {} already has version {}. Aborting publish.",
+            pkg.name(),
+            pkg.version()
+        );
+    }
+
     // Prepare a tarball, with a non-suppressible warning if metadata
     // is missing since this is being put online.
     let tarball = ops::package_one(

tests/testsuite/publish.rs

@@ -132,14 +132,18 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
 
 #[cargo_test]
 fn duplicate_version() {
+    let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
     let registry_dupl = RegistryBuilder::new()
         .http_api()
         .http_index()
-        .add_responder("/api/v1/crates/new", move |_req, _server| Response {
-            code: 200,
-            headers: vec![],
-            body: br#"{"errors": [{"detail": "crate version `0.0.1` is already uploaded"}]}"#
-                .to_vec(),
+        .add_responder("/index/3/f/foo", move |req, server| {
+            let mut lock = arc.lock().unwrap();
+            *lock += 1;
+            if *lock <= 1 {
+                server.not_found(req)
+            } else {
+                server.index(req)
+            }
         })
         .build();
 
@@ -158,23 +162,17 @@ fn duplicate_version() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
+    p.cargo("publish")
+        .replace_crates_io(registry_dupl.index_url())
+        .without_status()
+        .run();
+
     p.cargo("publish")
         .replace_crates_io(registry_dupl.index_url())
         .with_stderr(
             "\
 [UPDATING] crates.io index
-[WARNING] [..]
-See [..]
-[PACKAGING] foo v0.0.1 ([CWD])
-[VERIFYING] foo v0.0.1 ([CWD])
-[..]
-[..]
-[..]
-[UPLOADING] foo v0.0.1 ([CWD])
-error: failed to publish [..]
-
-Caused by:
-[..] is already uploaded
+error: crate foo already has version 0.0.1. Aborting publish.
 ",
         )
         .with_status(101)