-
Notifications
You must be signed in to change notification settings - Fork 392
Recursive needs processing #1212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
VolkerChristian
wants to merge
2
commits into
CLIUtils:main
Choose a base branch
from
SNodeC:Recursive_needs_requirement_check
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1317,10 +1317,22 @@ CLI11_INLINE void App::_process_requirements() { | |
missing_need = opt->get_name(); | ||
} | ||
} | ||
for(const auto &subc : need_subcommands_) { // Process subcommands given on the commandline first | ||
if (subc->count() > 0) { | ||
subc->_process_requirements(); | ||
} | ||
} | ||
for(const auto &subc : need_subcommands_) { | ||
if(subc->count_all() == 0) { | ||
missing_needed = true; | ||
missing_need = subc->get_display_name(); | ||
if (subc->count() == 0) { | ||
try { | ||
subc->_process_requirements(); | ||
} catch (const CLI::RequiresError&) { | ||
throw RequiresError(get_display_name(), subc->name_); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. next you are going to check the subcommands that were not parsed and give priority to missing requirements in those needed subcommands, and make the error clearer. |
||
} | ||
if(subc->count_all() == 0) { | ||
missing_needed = true; | ||
missing_need = subc->get_display_name(); | ||
} | ||
} | ||
} | ||
if(missing_needed) { | ||
|
@@ -1402,7 +1414,7 @@ CLI11_INLINE void App::_process_requirements() { | |
} | ||
} | ||
} | ||
if(sub->count() > 0 || sub->name_.empty()) { | ||
if((sub->count() > 0 || sub->name_.empty()) && need_subcommands_.find(sub.get()) == need_subcommands_.end()) { | ||
sub->_process_requirements(); | ||
} | ||
|
||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So you want to check the subcommands that are needed and were given and make sure all their requirements are met first. This is to get at the lower level errors with priority.