Avoid multiple index updates.

This also restores the Cargo.lock update during packaging.

Author: ehuss

src/cargo/ops/cargo_package.rs

@@ -41,6 +41,8 @@ pub struct PackageOpts<'cfg> {
 static VCS_INFO_FILE: &'static str = ".cargo_vcs_info.json";
 
 pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Option<FileLock>> {
+    // Make sure the Cargo.lock is up-to-date and valid.
+    ops::resolve_ws(ws)?;
     let pkg = ws.current()?;
     let config = ws.config();
 

src/cargo/sources/registry/remote.rs

@@ -181,6 +181,12 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
         if self.config.cli_unstable().no_index_update {
             return Ok(());
         }
+        // Make sure the index is only updated once per session since it is an
+        // expensive operation. This generally only happens when the resolver
+        // is run multiple times, such as during `cargo publish`.
+        if self.config.updated_sources().contains(&self.source_id) {
+            return Ok(());
+        }
 
         debug!("updating the index");
 
@@ -208,6 +214,7 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> {
         let repo = self.repo.borrow_mut().unwrap();
         git::fetch(repo, url, refspec, self.config)
             .chain_err(|| format!("failed to fetch `{}`", url))?;
+        self.config.updated_sources().insert(self.source_id);
         Ok(())
     }
 

src/cargo/util/config.rs

@@ -74,6 +74,8 @@ pub struct Config {
     env: HashMap<String, String>,
     /// Profiles loaded from config.
     profiles: LazyCell<ConfigProfiles>,
+    /// Tracks which sources have been updated to avoid multiple updates.
+    updated_sources: LazyCell<RefCell<HashSet<SourceId>>>,
 }
 
 impl Config {
@@ -129,6 +131,7 @@ impl Config {
             target_dir: None,
             env,
             profiles: LazyCell::new(),
+            updated_sources: LazyCell::new(),
         }
     }
 
@@ -271,6 +274,12 @@ impl Config {
         })
     }
 
+    pub fn updated_sources(&self) -> RefMut<'_, HashSet<SourceId>> {
+        self.updated_sources.borrow_with(|| {
+            RefCell::new(HashSet::new())
+        }).borrow_mut()
+    }
+
     pub fn values(&self) -> CargoResult<&HashMap<String, ConfigValue>> {
         self.values.try_borrow_with(|| self.load_values())
     }

tests/testsuite/publish_lockfile.rs

@@ -268,54 +268,6 @@ fn no_warn_workspace_extras() {
         .run();
 }
 
-#[test]
-fn out_of_date_lock_note() {
-    // Dependency is force-changed from an out-of-date Cargo.lock.
-    Package::new("dep", "1.0.0").publish();
-    Package::new("dep", "2.0.0").publish();
-
-    let p = project()
-        .file(
-            "Cargo.toml",
-            &pl_manifest(
-                "foo",
-                "0.0.1",
-                r#"
-                [dependencies]
-                dep = "1.0"
-                "#,
-            ),
-        )
-        .file("src/main.rs", "fn main() {}")
-        .build();
-    p.cargo("generate-lockfile")
-        .masquerade_as_nightly_cargo()
-        .run();
-    p.change_file(
-        "Cargo.toml",
-        &pl_manifest(
-            "foo",
-            "0.0.1",
-            r#"
-            [dependencies]
-            dep = "2.0"
-            "#,
-        ),
-    );
-    p.cargo("package --no-verify -v --allow-dirty")
-        .masquerade_as_nightly_cargo()
-        .with_stderr(
-            "\
-[PACKAGING] foo v0.0.1 ([..])
-[ARCHIVING] Cargo.toml
-[ARCHIVING] src/main.rs
-[UPDATING] `[..]` index
-[NOTE] package `dep v2.0.0` added to the packaged Cargo.lock file, previous version was `1.0.0`
-",
-        )
-        .run();
-}
-
 #[test]
 fn warn_package_with_yanked() {
     Package::new("bar", "0.1.0").publish();
@@ -377,15 +329,13 @@ dependencies = [
         )
         .publish();
 
-    // It is unfortunate that this displays UPDATING twice.
     cargo_process("install --locked foo")
         .with_stderr(
             "\
 [UPDATING] `[..]` index
 [DOWNLOADING] crates ...
 [DOWNLOADED] foo v0.1.0 (registry `[..]`)
 [INSTALLING] foo v0.1.0
-[UPDATING] `[..]` index
 [WARNING] package `bar v0.1.0` in Cargo.lock is yanked in registry \
     `crates.io`, consider running without --locked
 [DOWNLOADING] crates ...