fix(add): Update the lock file

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

Author: epage

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::generate_lockfile;
 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)?;
+        generate_lockfile(&ws)?;
+    }
+
     Ok(())
 }
 

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`

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`

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`

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`

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`

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"));
 

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.

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`

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`