Skip to content

Commit f6c2ef9

Browse files
andyrinne12Wyverald
authored and
copybara-github
committed
Rename modquery to mod
- Since we're considering adding more subcommands that don't exactly "query", such as `bazel mod upgrade` etc. - `bazel modquery show` is renamed to `bazel mod show_repo` (`show_extension` is unchanged) - `bazel modquery tree` is renamed to `bazel mod graph`. #15365 Co-authored-by: Xùdōng Yáng <wyverald@gmail.com> PiperOrigin-RevId: 547553222 Change-Id: I74145fdb87c05761692391e6ba47ce8d975f90a9
1 parent 5a502a1 commit f6c2ef9

25 files changed

Lines changed: 276 additions & 283 deletions

‎src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import com.google.devtools.build.lib.bazel.bzlmod.SingleExtensionUsagesFunction;
5252
import com.google.devtools.build.lib.bazel.bzlmod.YankedVersionsUtil;
5353
import com.google.devtools.build.lib.bazel.commands.FetchCommand;
54-
import com.google.devtools.build.lib.bazel.commands.ModqueryCommand;
54+
import com.google.devtools.build.lib.bazel.commands.ModCommand;
5555
import com.google.devtools.build.lib.bazel.commands.SyncCommand;
5656
import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformFunction;
5757
import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformRule;
@@ -206,7 +206,7 @@ public byte[] get(
206206
@Override
207207
public void serverInit(OptionsParsingResult startupOptions, ServerBuilder builder) {
208208
builder.addCommands(new FetchCommand());
209-
builder.addCommands(new ModqueryCommand());
209+
builder.addCommands(new ModCommand());
210210
builder.addCommands(new SyncCommand());
211211
builder.addInfoItems(new RepositoryCacheInfoItem(repositoryCache));
212212
}

‎src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package(
88
filegroup(
99
name = "srcs",
1010
srcs = glob(["*"]) + [
11-
"//src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery:srcs",
11+
"//src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand:srcs",
1212
],
1313
visibility = ["//src:__subpackages__"],
1414
)

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery/BUILD renamed to src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ filegroup(
1212
)
1313

1414
java_library(
15-
name = "modquery",
15+
name = "modcommand",
1616
srcs = glob(["*.java"]),
1717
deps = [
1818
"//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:common",

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery/ExtensionArg.java renamed to src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ExtensionArg.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
package com.google.devtools.build.lib.bazel.bzlmod.modquery;
14+
package com.google.devtools.build.lib.bazel.bzlmod.modcommand;
1515

1616
import com.google.auto.value.AutoValue;
1717
import com.google.common.collect.ImmutableBiMap;
@@ -22,12 +22,12 @@
2222
import com.google.devtools.build.lib.bazel.bzlmod.BazelModuleInspectorValue.AugmentedModule;
2323
import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtensionId;
2424
import com.google.devtools.build.lib.bazel.bzlmod.ModuleKey;
25-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModuleArg.ModuleArgConverter;
25+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModuleArg.ModuleArgConverter;
2626
import com.google.devtools.build.lib.cmdline.Label;
2727
import com.google.devtools.build.lib.cmdline.Label.RepoContext;
2828
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
2929
import com.google.devtools.build.lib.cmdline.RepositoryMapping;
30-
import com.google.devtools.build.lib.server.FailureDetails.ModqueryCommand.Code;
30+
import com.google.devtools.build.lib.server.FailureDetails.ModCommand.Code;
3131
import com.google.devtools.common.options.Converter;
3232
import com.google.devtools.common.options.Converters.CommaSeparatedNonEmptyOptionListConverter;
3333
import com.google.devtools.common.options.OptionsParsingException;

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery/GraphvizOutputFormatter.java renamed to src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.devtools.build.lib.bazel.bzlmod.modquery;
15+
package com.google.devtools.build.lib.bazel.bzlmod.modcommand;
1616

1717
import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
1818

@@ -22,11 +22,11 @@
2222
import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtensionId;
2323
import com.google.devtools.build.lib.bazel.bzlmod.ModuleKey;
2424
import com.google.devtools.build.lib.bazel.bzlmod.Version;
25-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode;
26-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.IsIndirect;
27-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.NodeMetadata;
28-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryOptions.ExtensionShow;
29-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.OutputFormatters.OutputFormatter;
25+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode;
26+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.IsIndirect;
27+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.NodeMetadata;
28+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModOptions.ExtensionShow;
29+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.OutputFormatters.OutputFormatter;
3030
import java.util.ArrayDeque;
3131
import java.util.Deque;
3232
import java.util.HashSet;
@@ -35,8 +35,8 @@
3535
import java.util.Set;
3636

3737
/**
38-
* Outputs graph-based results of {@link ModqueryExecutor} in the Graphviz <i>dot</i> format which
39-
* can be further pipelined to create an image graph visualization.
38+
* Outputs graph-based results of {@link ModExecutor} in the Graphviz <i>dot</i> format which can be
39+
* further pipelined to create an image graph visualization.
4040
*/
4141
public class GraphvizOutputFormatter extends OutputFormatter {
4242
private StringBuilder str;

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery/InvalidArgumentException.java renamed to src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/InvalidArgumentException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// limitations under the License.
1414
//
1515

16-
package com.google.devtools.build.lib.bazel.bzlmod.modquery;
16+
package com.google.devtools.build.lib.bazel.bzlmod.modcommand;
1717

18-
import com.google.devtools.build.lib.server.FailureDetails.ModqueryCommand.Code;
18+
import com.google.devtools.build.lib.server.FailureDetails.ModCommand.Code;
1919

2020
/**
2121
* Exception thrown when a user-input argument is invalid (wrong number of arguments or the

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery/JsonOutputFormatter.java renamed to src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.devtools.build.lib.bazel.bzlmod.modquery;
15+
package com.google.devtools.build.lib.bazel.bzlmod.modcommand;
1616

1717
import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
1818

@@ -21,21 +21,21 @@
2121
import com.google.devtools.build.lib.bazel.bzlmod.BazelModuleInspectorValue.AugmentedModule;
2222
import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtensionId;
2323
import com.google.devtools.build.lib.bazel.bzlmod.ModuleKey;
24-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode;
25-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.IsCycle;
26-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.IsExpanded;
27-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.IsIndirect;
28-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.NodeMetadata;
29-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryOptions.ExtensionShow;
30-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.OutputFormatters.OutputFormatter;
24+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode;
25+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.IsCycle;
26+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.IsExpanded;
27+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.IsIndirect;
28+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.NodeMetadata;
29+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModOptions.ExtensionShow;
30+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.OutputFormatters.OutputFormatter;
3131
import com.google.gson.GsonBuilder;
3232
import com.google.gson.JsonArray;
3333
import com.google.gson.JsonObject;
3434
import java.util.HashSet;
3535
import java.util.Map.Entry;
3636
import java.util.Set;
3737

38-
/** Outputs graph-based results of {@link ModqueryExecutor} in JSON format. */
38+
/** Outputs graph-based results of {@link ModExecutor} in JSON format. */
3939
public class JsonOutputFormatter extends OutputFormatter {
4040
private Set<ModuleExtensionId> seenExtensions;
4141

src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modquery/ModqueryExecutor.java renamed to src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.devtools.build.lib.bazel.bzlmod.modquery;
15+
package com.google.devtools.build.lib.bazel.bzlmod.modcommand;
1616

1717
import static com.google.common.collect.ImmutableSet.toImmutableSet;
1818
import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
@@ -35,9 +35,9 @@
3535
import com.google.devtools.build.lib.bazel.bzlmod.ModuleKey;
3636
import com.google.devtools.build.lib.bazel.bzlmod.Tag;
3737
import com.google.devtools.build.lib.bazel.bzlmod.Version;
38-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.IsExpanded;
39-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.IsIndirect;
40-
import com.google.devtools.build.lib.bazel.bzlmod.modquery.ModqueryExecutor.ResultNode.NodeMetadata;
38+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.IsExpanded;
39+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.IsIndirect;
40+
import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode.NodeMetadata;
4141
import com.google.devtools.build.lib.packages.RawAttributeMapper;
4242
import com.google.devtools.build.lib.packages.Rule;
4343
import com.google.devtools.build.lib.query2.query.output.BuildOutputFormatter.AttributeReader;
@@ -62,23 +62,23 @@
6262
import net.starlark.java.eval.Starlark;
6363

6464
/**
65-
* Executes inspection queries for {@link
66-
* com.google.devtools.build.lib.bazel.commands.ModqueryCommand} and prints the resulted output to
67-
* the reporter's output stream using the different defined {@link OutputFormatters}.
65+
* Executes inspection queries for {@link com.google.devtools.build.lib.bazel.commands.ModCommand}
66+
* and prints the resulted output to the reporter's output stream using the different defined {@link
67+
* OutputFormatters}.
6868
*/
69-
public class ModqueryExecutor {
69+
public class ModExecutor {
7070

7171
private final ImmutableMap<ModuleKey, AugmentedModule> depGraph;
7272
private final ImmutableTable<ModuleExtensionId, ModuleKey, ModuleExtensionUsage> extensionUsages;
7373
private final ImmutableSetMultimap<ModuleExtensionId, String> extensionRepos;
7474
private final Optional<MaybeCompleteSet<ModuleExtensionId>> extensionFilter;
75-
private final ModqueryOptions options;
75+
private final ModOptions options;
7676
private final PrintWriter printer;
7777
private ImmutableMap<ModuleExtensionId, ImmutableSetMultimap<String, ModuleKey>>
7878
extensionRepoImports;
7979

80-
public ModqueryExecutor(
81-
ImmutableMap<ModuleKey, AugmentedModule> depGraph, ModqueryOptions options, Writer writer) {
80+
public ModExecutor(
81+
ImmutableMap<ModuleKey, AugmentedModule> depGraph, ModOptions options, Writer writer) {
8282
this(
8383
depGraph,
8484
ImmutableTable.of(),
@@ -88,12 +88,12 @@ public ModqueryExecutor(
8888
writer);
8989
}
9090

91-
public ModqueryExecutor(
91+
public ModExecutor(
9292
ImmutableMap<ModuleKey, AugmentedModule> depGraph,
9393
ImmutableTable<ModuleExtensionId, ModuleKey, ModuleExtensionUsage> extensionUsages,
9494
ImmutableSetMultimap<ModuleExtensionId, String> extensionRepos,
9595
Optional<MaybeCompleteSet<ModuleExtensionId>> extensionFilter,
96-
ModqueryOptions options,
96+
ModOptions options,
9797
Writer writer) {
9898
this.depGraph = depGraph;
9999
this.extensionUsages = extensionUsages;
@@ -106,7 +106,7 @@ public ModqueryExecutor(
106106
this.extensionRepoImports = computeRepoImportsTable(depGraph.keySet());
107107
}
108108

109-
public void tree(ImmutableSet<ModuleKey> from) {
109+
public void graph(ImmutableSet<ModuleKey> from) {
110110
ImmutableMap<ModuleKey, ResultNode> result =
111111
expandAndPrune(from, computeExtensionFilterTargets(), false);
112112
OutputFormatters.getFormatter(options.outputFormat)
@@ -129,7 +129,7 @@ public void allPaths(ImmutableSet<ModuleKey> from, ImmutableSet<ModuleKey> to) {
129129
.output(result, depGraph, extensionRepos, extensionRepoImports, printer, options);
130130
}
131131

132-
public void show(ImmutableMap<String, BzlmodRepoRuleValue> targetRepoRuleValues) {
132+
public void showRepo(ImmutableMap<String, BzlmodRepoRuleValue> targetRepoRuleValues) {
133133
RuleDisplayOutputter outputter = new RuleDisplayOutputter(printer);
134134
for (Entry<String, BzlmodRepoRuleValue> e : targetRepoRuleValues.entrySet()) {
135135
printer.printf("## %s:\n", e.getKey());
@@ -230,9 +230,9 @@ private class ResultGraphPruner {
230230
/**
231231
* Constructs a ResultGraphPruner to prune the result graph after the specified depth.
232232
*
233-
* @param targets If not complete, it means that the result tree contains paths to some specific
234-
* targets. This will cause some branches to contain, after the specified depths, some
235-
* targets or target parents. As any other nodes omitted, transitive edges (embedding
233+
* @param targets If not complete, it means that the result graph contains paths to some
234+
* specific targets. This will cause some branches to contain, after the specified depths,
235+
* some targets or target parents. As any other nodes omitted, transitive edges (embedding
236236
* multiple edges) will be stored as <i>indirect</i>.
237237
* @param oldResult The unpruned result graph.
238238
*/
@@ -559,8 +559,7 @@ public abstract static class NodeMetadata {
559559

560560
private static NodeMetadata create(
561561
IsExpanded isExpanded, IsIndirect isIndirect, IsCycle isCycle) {
562-
return new AutoValue_ModqueryExecutor_ResultNode_NodeMetadata(
563-
isExpanded, isIndirect, isCycle);
562+
return new AutoValue_ModExecutor_ResultNode_NodeMetadata(isExpanded, isIndirect, isCycle);
564563
}
565564
}
566565

@@ -583,7 +582,7 @@ public ImmutableSortedSet<Entry<ModuleKey, NodeMetadata>> getChildrenSortedByEdg
583582
}
584583

585584
static ResultNode.Builder builder() {
586-
return new AutoValue_ModqueryExecutor_ResultNode.Builder().setTarget(false);
585+
return new AutoValue_ModExecutor_ResultNode.Builder().setTarget(false);
587586
}
588587

589588
@AutoValue.Builder

0 commit comments

Comments
 (0)