forked from lix-project/lix
3d065192c0
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Change-Id: If18cd5be78da4a70635e3fdcac6326dbfeea71a5
(cherry picked from commit 67eb37c1d0de28160cd25376e51d1ec1b1c8305b)
92 lines
2.8 KiB
C++
92 lines
2.8 KiB
C++
#include "common-args.hh"
|
|
#include "args/root.hh"
|
|
#include "globals.hh"
|
|
#include "loggers.hh"
|
|
|
|
namespace nix {
|
|
|
|
MixCommonArgs::MixCommonArgs(const std::string & programName)
|
|
: programName(programName)
|
|
{
|
|
addFlag({
|
|
.longName = "verbose",
|
|
.shortName = 'v',
|
|
.description = "Increase the logging verbosity level.",
|
|
.category = loggingCategory,
|
|
.handler = {[]() { verbosity = (Verbosity) (verbosity + 1); }},
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "quiet",
|
|
.description = "Decrease the logging verbosity level.",
|
|
.category = loggingCategory,
|
|
.handler = {[]() { verbosity = verbosity > lvlError ? (Verbosity) (verbosity - 1) : lvlError; }},
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "debug",
|
|
.description = "Set the logging verbosity level to 'debug'.",
|
|
.category = loggingCategory,
|
|
.handler = {[]() { verbosity = lvlDebug; }},
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "option",
|
|
.description = "Set the Nix configuration setting *name* to *value* (overriding `nix.conf`).",
|
|
.category = miscCategory,
|
|
.labels = {"name", "value"},
|
|
.handler = {[this](std::string name, std::string value) {
|
|
try {
|
|
globalConfig.set(name, value);
|
|
} catch (UsageError & e) {
|
|
if (!getRoot().completions)
|
|
warn(e.what());
|
|
}
|
|
}},
|
|
.completer = [](AddCompletions & completions, size_t index, std::string_view prefix) {
|
|
if (index == 0) {
|
|
std::map<std::string, Config::SettingInfo> settings;
|
|
globalConfig.getSettings(settings);
|
|
for (auto & s : settings)
|
|
if (s.first.starts_with(prefix))
|
|
completions.add(s.first, fmt("Set the `%s` setting.", s.first));
|
|
}
|
|
}
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "log-format",
|
|
.description = "Set the format of log output; one of `raw`, `internal-json`, `bar` or `bar-with-logs`.",
|
|
.category = loggingCategory,
|
|
.labels = {"format"},
|
|
.handler = {[](std::string format) { setLogFormat(format); }},
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "max-jobs",
|
|
.shortName = 'j',
|
|
.description = "The maximum number of parallel builds.",
|
|
.labels = Strings{"jobs"},
|
|
.handler = {[=](std::string s) {
|
|
settings.set("max-jobs", s);
|
|
}}
|
|
});
|
|
|
|
std::string cat = "Options to override configuration settings";
|
|
globalConfig.convertToArgs(*this, cat);
|
|
|
|
// Backward compatibility hack: nix-env already had a --system flag.
|
|
if (programName == "nix-env") longFlags.erase("system");
|
|
|
|
hiddenCategories.insert(cat);
|
|
}
|
|
|
|
void MixCommonArgs::initialFlagsProcessed()
|
|
{
|
|
initPlugins();
|
|
pluginsInited();
|
|
}
|
|
|
|
|
|
}
|