From f2307d56cfc3b7180099942ad7c049db4617e6bd Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Sat, 14 Aug 2010 11:11:46 +0100 Subject: Make --visible work with --matching --- src/clients/cave/cmd_find_candidates.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc index 62754b51b..5be86deb1 100644 --- a/src/clients/cave/cmd_find_candidates.cc +++ b/src/clients/cave/cmd_find_candidates.cc @@ -225,6 +225,12 @@ FindCandidatesCommand::run_hosted( step("Searching matches"); std::shared_ptr match_generator; + std::shared_ptr mask_filter; + + if (search_options.a_visible.specified()) + mask_filter = std::make_shared(); + else + mask_filter = std::make_shared(); for (args::StringSetArg::ConstIterator k(search_options.a_matching.begin_args()), k_end(search_options.a_matching.end_args()) ; @@ -241,13 +247,13 @@ FindCandidatesCommand::run_hosted( if (search_options.a_all_versions.specified()) { const std::shared_ptr ids((*env)[selection::AllVersionsUnsorted( - *match_generator)]); + *match_generator | *mask_filter)]); check_candidates(yield, step, ids); } else { const std::shared_ptr ids((*env)[selection::BestVersionOnly( - *match_generator)]); + *match_generator | *mask_filter)]); check_candidates(yield, step, ids); } } -- cgit v1.2.3