From aee821280bed7eefb176aa819ef99e885713b20d Mon Sep 17 00:00:00 2001
From: William Page <william.page@savant.com>
Date: Mon, 8 Aug 2022 14:40:57 -0700
Subject: [PATCH] Add '--directory,-C' flag for changing current dir before
 build

This implements the suggestion in #10098 to make cargo change cwd before
completing config processing and starting the build. It is also an
alternative to --manifest-path that resolves the issue described
in #2930.
---
 src/bin/cargo/cli.rs         | 17 ++++++++++++++++-
 src/cargo/util/config/mod.rs | 17 +++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs
index 592a13345f4c..0fc4b2b1caef 100644
--- a/src/bin/cargo/cli.rs
+++ b/src/bin/cargo/cli.rs
@@ -1,4 +1,4 @@
-use anyhow::anyhow;
+use anyhow::{anyhow, Context as _};
 use cargo::core::shell::Shell;
 use cargo::core::{features, CliUnstable};
 use cargo::{self, drop_print, drop_println, CliResult, Config};
@@ -32,6 +32,14 @@ pub fn main(config: &mut LazyConfig) -> CliResult {
     // the [alias] table).
     let config = config.get_mut();
 
+    if let Some(new_cwd) = args.get_one::<std::path::PathBuf>("directory") {
+        // Change the configured directory to work in, before any config files are read
+        assert_eq!(config.is_init(), false);
+        config
+            .set_cwd(new_cwd.as_path())
+            .with_context(|| "could not change to requested directory")?;
+    }
+
     let (expanded_args, global_args) = expand_aliases(config, args, vec![])?;
 
     if expanded_args
@@ -467,6 +475,13 @@ See 'cargo help <command>' for more information on a specific command.\n",
                 .value_name("WHEN")
                 .global(true),
         )
+        .arg(
+            opt("directory", "Change to DIRECTORY before doing anything")
+                .short('C')
+                .value_name("DIRECTORY")
+                .value_hint(clap::ValueHint::DirPath)
+                .value_parser(clap::builder::ValueParser::path_buf()),
+        )
         .arg(flag("frozen", "Require Cargo.lock and cache are up to date").global(true))
         .arg(flag("locked", "Require Cargo.lock is up to date").global(true))
         .arg(flag("offline", "Run without accessing the network").global(true))
diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs
index 731ea6cd6a07..cfcc8848b3fc 100644
--- a/src/cargo/util/config/mod.rs
+++ b/src/cargo/util/config/mod.rs
@@ -551,6 +551,23 @@ impl Config {
         Ok(())
     }
 
+    /// Updates the application's notion of current working directory, both in
+    /// the process environment as well as the configuration data
+    pub fn set_cwd(&mut self, new_cwd: &Path) -> CargoResult<()> {
+        // Update the process-level notion of cwd
+        std::env::set_current_dir(&new_cwd)?;
+        // Update struct members derived from the process-wide cwd
+        // processing occurs
+        self.cwd = new_cwd.to_path_buf();
+        self.home_path = Filesystem::new(homedir(new_cwd).ok_or_else(|| {
+            anyhow!(
+                "Cargo couldn't find your home directory. \
+                     This probably means that $HOME was not set."
+            )
+        })?);
+        Ok(())
+    }
+
     /// The current working directory.
     pub fn cwd(&self) -> &Path {
         &self.cwd