Accept tildes in --override_module

keith · copybara-github · commit 094a0aabed1e · 2023-01-18T06:04:47.000-08:00
This is useful for adding this in your global ~/.bazelrc file for easy rules debugging. See also bazelbuild#15417 Closes bazelbuild#17218. PiperOrigin-RevId: 502854597 Change-Id: Ic26289c6497edd31187dde2c7cda78c2177a56c4
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java
@@ -350,12 +350,12 @@ public ModuleOverride convert(String input) throws OptionsParsingException {
       OptionsUtils.AbsolutePathFragmentConverter absolutePathFragmentConverter =
           new OptionsUtils.AbsolutePathFragmentConverter();
       try {
-        var unused = absolutePathFragmentConverter.convert(pieces[1]);
+        var path = absolutePathFragmentConverter.convert(pieces[1]);
+        return ModuleOverride.create(pieces[0], path.toString());
       } catch (OptionsParsingException e) {
         throw new OptionsParsingException(
             "Module override directory must be an absolute path", input, e);
       }
-      return ModuleOverride.create(pieces[0], pieces[1]);
     }
 
     @Override
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptionsTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptionsTest.java
@@ -17,6 +17,8 @@
 import static com.google.common.base.StandardSystemProperty.USER_HOME;
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.devtools.build.lib.bazel.repository.RepositoryOptions.ModuleOverride;
+import com.google.devtools.build.lib.bazel.repository.RepositoryOptions.ModuleOverrideConverter;
 import com.google.devtools.build.lib.bazel.repository.RepositoryOptions.RepositoryOverride;
 import com.google.devtools.build.lib.bazel.repository.RepositoryOptions.RepositoryOverrideConverter;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
@@ -60,6 +62,14 @@ public void testOverridePathWithTilde() throws Exception {
     assertThat(actual.path()).isEqualTo(PathFragment.create(USER_HOME.value() + "/bar"));
   }
 
+  @Test
+  public void testModuleOverridePathWithTilde() throws Exception {
+    var converter = new ModuleOverrideConverter();
+    ModuleOverride actual = converter.convert("foo=~/bar");
+    assertThat(PathFragment.create(actual.path()))
+        .isEqualTo(PathFragment.create(USER_HOME.value() + "/bar"));
+  }
+
   @Test
   public void testInvalidOverride() throws Exception {
     expectedException.expect(OptionsParsingException.class);

Original file line number	Diff line number	Diff line change
`@@ -350,12 +350,12 @@ public ModuleOverride convert(String input) throws OptionsParsingException {`
`350`	`350`	`OptionsUtils.AbsolutePathFragmentConverter absolutePathFragmentConverter =`
`351`	`351`	`new OptionsUtils.AbsolutePathFragmentConverter();`
`352`	`352`	`try {`
`353`		`- var unused = absolutePathFragmentConverter.convert(pieces[1]);`
	`353`	`+ var path = absolutePathFragmentConverter.convert(pieces[1]);`
	`354`	`+ return ModuleOverride.create(pieces[0], path.toString());`
`354`	`355`	`} catch (OptionsParsingException e) {`
`355`	`356`	`throw new OptionsParsingException(`
`356`	`357`	`"Module override directory must be an absolute path", input, e);`
`357`	`358`	`}`
`358`		`- return ModuleOverride.create(pieces[0], pieces[1]);`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`@Override`