commit 96c8a9073807c9e97635ddafe2ed0365a9318d6f
author Googler <noreply@google.com> Mon Mar 14 08:05:57 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 14 08:07:23 2022 -0700
tree 4c5347e836d7f3b5f0bddbaf6079a05ed9c2a41e
parent 5b545886fcd5bd95678567b0ca45d2a5e524beab

BEGIN_PUBLIC
    remove --master_bazelrc from our codebase + update documentation.
END_PUBLIC

PiperOrigin-RevId: 434466313

src/main/cpp/bazel_startup_options.cc

diff --git a/src/main/cpp/bazel_startup_options.cc b/src/main/cpp/bazel_startup_options.cc
index 3d702e3..1de82ed 100644
--- a/src/main/cpp/bazel_startup_options.cc
+++ b/src/main/cpp/bazel_startup_options.cc
@@ -27,11 +27,8 @@
       user_bazelrc_(""),
       use_system_rc(true),
       use_workspace_rc(true),
-      use_home_rc(true),
-      use_master_bazelrc_(true) {
+      use_home_rc(true) {
   RegisterNullaryStartupFlagNoRc("home_rc", &use_home_rc);
-  RegisterNullaryStartupFlagNoRc("master_bazelrc", &use_master_bazelrc_);
-  OverrideOptionSourcesKey("master_bazelrc", "blazerc");
   RegisterNullaryStartupFlagNoRc("system_rc", &use_system_rc);
   RegisterNullaryStartupFlagNoRc("workspace_rc", &use_workspace_rc);
   RegisterUnaryStartupFlag("bazelrc");

src/main/cpp/bazel_startup_options.h

diff --git a/src/main/cpp/bazel_startup_options.h b/src/main/cpp/bazel_startup_options.h
index 14d4132..1bbc746 100644
--- a/src/main/cpp/bazel_startup_options.h
+++ b/src/main/cpp/bazel_startup_options.h
@@ -42,8 +42,6 @@
   bool use_system_rc;
   bool use_workspace_rc;
   bool use_home_rc;
-  // TODO(b/36168162): Remove the master rc flag.
-  bool use_master_bazelrc_;
 };
 
 }  // namespace blaze

src/main/cpp/startup_options.h

diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h
index d6c8d02..208e4bc 100644
--- a/src/main/cpp/startup_options.h
+++ b/src/main/cpp/startup_options.h
@@ -386,20 +386,20 @@
   // lazily). Not guarded by a mutex - StartupOptions is not thread-safe.
   mutable std::pair<blaze_util::Path, JavabaseType> default_server_javabase_;
 
-  // Startup flags that don't expect a value, e.g. "master_bazelrc".
-  // Valid uses are "--master_bazelrc" are "--nomaster_bazelrc".
-  // Keys are positive and negative flag names (e.g. "--master_bazelrc" and
-  // "--nomaster_bazelrc"), values are pointers to the boolean to mutate.
+  // Startup flags that don't expect a value, e.g. "home_rc".
+  // Valid uses are "--home_rc" are "--nohome_rc".
+  // Keys are positive and negative flag names (e.g. "--home_rc" and
+  // "--nohome_rc"), values are pointers to the boolean to mutate.
   std::unordered_map<std::string, bool *> all_nullary_startup_flags_;
 
   // Subset of 'all_nullary_startup_flags_'.
-  // Contains positive and negative names (e.g. "--master_bazelrc" and
-  // "--nomaster_bazelrc") of flags that must not appear in .bazelrc files.
+  // Contains positive and negative names (e.g. "--home_rc" and
+  // "--nohome_rc") of flags that must not appear in .bazelrc files.
   std::unordered_set<std::string> no_rc_nullary_startup_flags_;
 
   // Subset of 'all_nullary_startup_flags_'.
-  // Contains positive and negative names (e.g. "--master_bazelrc" and
-  // "--nomaster_bazelrc") of flags that have a special handler.
+  // Contains positive and negative names (e.g. "--home_rc" and
+  // "--nohome_rc") of flags that have a special handler.
   // Can be used for tri-state flags where omitting the flag completely means
   // leaving the tri-state as "auto".
   std::unordered_map<std::string, SpecialNullaryFlagHandler>