fix(add): Update the lock file

epage · epage · commit 5789c12e45c8 · 2022-07-26T14:59:07.000-05:00
This is done in the command, rather than in the op, - To consistently construct the `Workspace` - It is more composable as an API A downside is we update the git dependencies a second time. We are not rolling back on error. - For some errors, the user might want to debug what went wrong - Rollback adds its own complications and risks, including since its non-atomic Fixes #10901
diff --git a/src/bin/cargo/commands/add.rs b/src/bin/cargo/commands/add.rs
@@ -7,6 +7,7 @@ use cargo::ops::cargo_add::add;
 use cargo::ops::cargo_add::AddOptions;
 use cargo::ops::cargo_add::DepOp;
 use cargo::ops::cargo_add::DepTable;
+use cargo::ops::resolve_ws;
 use cargo::util::command_prelude::*;
 use cargo::util::interning::InternedString;
 use cargo::CargoResult;
@@ -193,6 +194,12 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     };
     add(&ws, &options)?;
 
+    if !dry_run {
+        // Reload the workspace since we've changed dependencies
+        let ws = args.workspace(config)?;
+        resolve_ws(&ws)?;
+    }
+
     Ok(())
 }
 
diff --git a/tests/testsuite/cargo_add/git/stderr.log b/tests/testsuite/cargo_add/git/stderr.log
@@ -1,2 +1,3 @@
     Updating git repository `[ROOTURL]/git-package`
       Adding git-package (git) to dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/git_branch/stderr.log b/tests/testsuite/cargo_add/git_branch/stderr.log
@@ -1,2 +1,3 @@
     Updating git repository `[ROOTURL]/git-package`
       Adding git-package (git) to dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/git_dev/stderr.log b/tests/testsuite/cargo_add/git_dev/stderr.log
@@ -1,2 +1,3 @@
     Updating git repository `[ROOTURL]/git-package`
       Adding git-package (git) to dev-dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/git_inferred_name/stderr.log b/tests/testsuite/cargo_add/git_inferred_name/stderr.log
@@ -1,3 +1,4 @@
     Updating git repository `[ROOTURL]/git-package`
     Updating git repository `[ROOTURL]/git-package`
       Adding git-package (git) to dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/git_multiple_names/stderr.log b/tests/testsuite/cargo_add/git_multiple_names/stderr.log
@@ -1,3 +1,4 @@
     Updating git repository `[ROOTURL]/git-package`
       Adding my-package1 (git) to dependencies.
       Adding my-package2 (git) to dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs
@@ -32,7 +32,7 @@ fn git_registry() {
         ])
         .current_dir(cwd)
         .assert()
-        .success()
+        .failure()
         .stdout_matches_path(curr_dir!().join("stdout.log"))
         .stderr_matches_path(curr_dir!().join("stderr.log"));
 
diff --git a/tests/testsuite/cargo_add/git_registry/stderr.log b/tests/testsuite/cargo_add/git_registry/stderr.log
@@ -1,2 +1,6 @@
     Updating git repository `[ROOTURL]/versioned-package`
       Adding versioned-package (git) to dependencies.
+error: failed to parse manifest at `[ROOT]/case/Cargo.toml`
+
+Caused by:
+  dependency (versioned-package) specification is ambiguous. Only one of `git` or `registry` is allowed.
diff --git a/tests/testsuite/cargo_add/git_rev/stderr.log b/tests/testsuite/cargo_add/git_rev/stderr.log
@@ -1,2 +1,3 @@
     Updating git repository `[ROOTURL]/git-package`
       Adding git-package (git) to dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/git_tag/stderr.log b/tests/testsuite/cargo_add/git_tag/stderr.log
@@ -1,2 +1,3 @@
     Updating git repository `[ROOTURL]/git-package`
       Adding git-package (git) to dependencies.
+    Updating git repository `[ROOTURL]/git-package`
diff --git a/tests/testsuite/cargo_add/list_features_path/stderr.log b/tests/testsuite/cargo_add/list_features_path/stderr.log
@@ -4,3 +4,4 @@
              + nose
              - eyes
              - optional-dependency
+    Updating `dummy-registry` index
diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.log
@@ -4,3 +4,4 @@
              - mouth
              - nose
              - optional-dependency
+    Updating `dummy-registry` index
diff --git a/tests/testsuite/cargo_add/locked_unchanged/in/Cargo.lock b/tests/testsuite/cargo_add/locked_unchanged/in/Cargo.lock
diff --git a/tests/testsuite/cargo_add/lockfile_updated/in/Cargo.lock b/tests/testsuite/cargo_add/lockfile_updated/in/Cargo.lock
diff --git a/tests/testsuite/cargo_add/lockfile_updated/in/Cargo.toml b/tests/testsuite/cargo_add/lockfile_updated/in/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+
+[dependencies]
+unrelateed-crate = "0.2.0"
diff --git a/tests/testsuite/cargo_add/lockfile_updated/in/src/lib.rs b/tests/testsuite/cargo_add/lockfile_updated/in/src/lib.rs
diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs
@@ -0,0 +1,25 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::prelude::*;
+use cargo_test_support::Project;
+
+use crate::cargo_add::init_registry;
+use cargo_test_support::curr_dir;
+
+#[cargo_test]
+fn lockfile_updated() {
+    init_registry();
+    let project = Project::from_template(curr_dir!().join("in"));
+    let project_root = project.root();
+    let cwd = &project_root;
+
+    snapbox::cmd::Command::cargo_ui()
+        .arg("add")
+        .arg_line("my-package")
+        .current_dir(cwd)
+        .assert()
+        .success()
+        .stdout_matches_path(curr_dir!().join("stdout.log"))
+        .stderr_matches_path(curr_dir!().join("stderr.log"));
+
+    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+}
diff --git a/tests/testsuite/cargo_add/lockfile_updated/out/Cargo.lock b/tests/testsuite/cargo_add/lockfile_updated/out/Cargo.lock
diff --git a/tests/testsuite/cargo_add/lockfile_updated/out/Cargo.toml b/tests/testsuite/cargo_add/lockfile_updated/out/Cargo.toml
@@ -0,0 +1,9 @@
+[workspace]
+
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+
+[dependencies]
+my-package = "99999.0.0"
+unrelateed-crate = "0.2.0"
diff --git a/tests/testsuite/cargo_add/lockfile_updated/stderr.log b/tests/testsuite/cargo_add/lockfile_updated/stderr.log
@@ -0,0 +1,2 @@
+    Updating `dummy-registry` index
+      Adding my-package v99999.0.0 to dependencies.
diff --git a/tests/testsuite/cargo_add/lockfile_updated/stdout.log b/tests/testsuite/cargo_add/lockfile_updated/stdout.log
diff --git a/tests/testsuite/cargo_add/mod.rs b/tests/testsuite/cargo_add/mod.rs
@@ -50,6 +50,7 @@ mod list_features_path;
 mod list_features_path_no_default;
 mod locked_changed;
 mod locked_unchanged;
+mod lockfile_updated;
 mod manifest_path_package;
 mod merge_activated_features;
 mod multiple_conflicts_with_features;
@@ -133,6 +134,9 @@ fn add_registry_packages(alt: bool) {
         cargo_test_support::registry::Package::new(name, "0.1.1+my-package")
             .alternative(alt)
             .publish();
+        cargo_test_support::registry::Package::new(name, "0.2.0+my-package")
+            .alternative(alt)
+            .publish();
         cargo_test_support::registry::Package::new(name, "0.2.3+my-package")
             .alternative(alt)
             .publish();
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.log
@@ -1,2 +1,3 @@
     Updating git repository `[ROOTURL]/versioned-package`
       Adding versioned-package (git) to optional dependencies.
+    Updating git repository `[ROOTURL]/versioned-package`

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	Updating git repository `[ROOTURL]/git-package`
`2`	`2`	`Adding git-package (git) to dependencies.`
	`3`	+ Updating git repository `[ROOTURL]/git-package`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	Updating git repository `[ROOTURL]/git-package`
`2`	`2`	`Adding git-package (git) to dev-dependencies.`
	`3`	+ Updating git repository `[ROOTURL]/git-package`