[vcpkg] Rewriting CmdLineBuilder (2/n) #15627
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I would like, and I think the team would like generally, to switch to using stuff like `posix_spawn`, as opposed to the existing use of `system` and `popen`. This requires a pretty large change to how we use CmdLineBuilder. The first change we have to make is that the execute functions _cannot_ take a StringView anymore. This PR makes that change.
BillyONeal
reviewed
Jan 13, 2021
BillyONeal
reviewed
Jan 13, 2021
ras0219
approved these changes
Jan 13, 2021
toolsrc/src/vcpkg/commands.edit.cpp
Outdated
Comment on lines
265
to
266
| cmd_line = System::CmdLineBuilder("cmd").string_arg("/c").string_arg(cmd_line).raw_arg("<NUL"); | ||
| System::cmd_execute_background(cmd_line); |
There was a problem hiding this comment.
Suggested change
| cmd_line = System::CmdLineBuilder("cmd").string_arg("/c").string_arg(cmd_line).raw_arg("<NUL"); | |
| System::cmd_execute_background(cmd_line); | |
| System::cmd_execute_background(System::CmdLineBuilder("cmd").string_arg("/c").string_arg(cmd_line).raw_arg("<NUL")); |
This also enables cmd_line to be made const again above.
| System::CmdLineBuilder cmd("cmd"); | ||
| if (!args.command_arguments.empty()) | ||
| { | ||
| cmd.string_arg("/c").raw_arg(args.command_arguments.at(0)); |
There was a problem hiding this comment.
I know this is just preserving existing semantics, but I think this would probably be more correct as .string_arg()
| .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory))) | ||
| .string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory))); | ||
| const std::string full_cmd = Strings::concat(std::move(builder).extract(), " ", cmd); | ||
| auto full_cmd = System::CmdLineBuilder(git_exe) |
There was a problem hiding this comment.
This entire function seems really suspect with the new approach; all uses of this should probably be replaced with the make-a-git-CmdLineBuilder-function.
strega-nil
force-pushed
the
fix-cmdlinebuilder
branch
from
5cbc281
to
ec6621e
Compare
strega-nil
force-pushed
the
fix-cmdlinebuilder
branch
2 times, most recently
from
fc7f769
to
0c3f859
Compare
strega-nil
force-pushed
the
fix-cmdlinebuilder
branch
from
0c3f859
to
b84e75e
Compare
JackBoosY
added
category:vcpkg-feature
strega-nil
added a commit
to strega-nil/vcpkg
that referenced
this pull request
May 5, 2021
* [vcpkg] Rewriting CmdLineBuilder (2/n) I would like, and I think the team would like generally, to switch to using stuff like `posix_spawn`, as opposed to the existing use of `system` and `popen`. This requires a pretty large change to how we use CmdLineBuilder. The first change we have to make is that the execute functions _cannot_ take a StringView anymore. This PR makes that change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I would like, and I think the team would like generally,
to switch to using stuff like
posix_spawn, as opposed to theexisting use of
systemandpopen.This requires a pretty large change to how we use CmdLineBuilder.
The first change we have to make is that the execute functions
cannot take a StringView anymore.
This PR makes that change.