Merge branch 'pu/depends' into 'master'

?depends patterns and friends

See merge request apt-team/apt!146

2 files changed, 100 insertions, 0 deletions

diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index fded7d92f..471e698d6 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -28,6 +28,27 @@ static const constexpr struct
    {"M"_sv, "?automatic"_sv, false},
    {"b"_sv, "?broken"_sv, false},
    {"c"_sv, "?config-files"_sv, false},
+   // FIXME: The words after ~D should be case-insensitive
+   {"DDepends:"_sv, "?depends"_sv, true},
+   {"DPre-Depends:"_sv, "?pre-depends"_sv, true},
+   {"DSuggests:"_sv, "?suggests"_sv, true},
+   {"DRecommends:"_sv, "?recommends"_sv, true},
+   {"DConflicts:"_sv, "?conflicts"_sv, true},
+   {"DReplaces:"_sv, "?replaces"_sv, true},
+   {"DObsoletes:"_sv, "?obsoletes"_sv, true},
+   {"DBreaks:"_sv, "?breaks"_sv, true},
+   {"DEnhances:"_sv, "?enhances"_sv, true},
+   {"D"_sv, "?depends"_sv, true},
+   {"RDepends:"_sv, "?reverse-depends"_sv, true},
+   {"RPre-Depends:"_sv, "?reverse-pre-depends"_sv, true},
+   {"RSuggests:"_sv, "?reverse-suggests"_sv, true},
+   {"RRecommends:"_sv, "?reverse-recommends"_sv, true},
+   {"RConflicts:"_sv, "?reverse-conflicts"_sv, true},
+   {"RReplaces:"_sv, "?reverse-replaces"_sv, true},
+   {"RObsoletes:"_sv, "?reverse-obsoletes"_sv, true},
+   {"RBreaks:"_sv, "?reverse-breaks"_sv, true},
+   {"REnhances:"_sv, "?reverse-enhances"_sv, true},
+   {"R"_sv, "?reverse-depends"_sv, true},
    {"E"_sv, "?essential"_sv, false},
    {"F"_sv, "?false"_sv, false},
    {"g"_sv, "?garbage"_sv, false},
@@ -418,6 +439,42 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<Patterns::PackageIsBroken>(file);
    if (node->matches("?config-files", 0, 0))
       return std::make_unique<Patterns::PackageIsConfigFiles>();
+   if (node->matches("?depends", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]));
+   if (node->matches("?predepends", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::PreDepends);
+   if (node->matches("?suggests", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Suggests);
+   if (node->matches("?recommends", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Recommends);
+   if (node->matches("?conflicts", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Conflicts);
+   if (node->matches("?replaces", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Replaces);
+   if (node->matches("?obsoletes", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Obsoletes);
+   if (node->matches("?breaks", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::DpkgBreaks);
+   if (node->matches("?enhances", 1, 1))
+      return std::make_unique<Patterns::VersionDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Enhances);
+   if (node->matches("?reverse-depends", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]));
+   if (node->matches("?reverse-predepends", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::PreDepends);
+   if (node->matches("?reverse-suggests", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Suggests);
+   if (node->matches("?reverse-recommends", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Recommends);
+   if (node->matches("?reverse-conflicts", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Conflicts);
+   if (node->matches("?reverse-replaces", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Replaces);
+   if (node->matches("?reverse-obsoletes", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Obsoletes);
+   if (node->matches("?reverse-breaks", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::DpkgBreaks);
+   if (node->matches("?reverse-enhances", 1, 1))
+      return std::make_unique<Patterns::PackageReverseDepends>(aPattern(node->arguments[0]), pkgCache::Dep::Enhances);
    if (node->matches("?essential", 0, 0))
       return std::make_unique<Patterns::PackageIsEssential>();
    if (node->matches("?exact-name", 1, 1))
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index d64bc4ccf..e0c48dd12 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -295,6 +295,49 @@ struct APT_HIDDEN VersionIsAllVersions : public Matcher
    }
 };
 
+struct APT_HIDDEN VersionDepends : public VersionAnyMatcher
+{
+   std::unique_ptr<APT::CacheFilter::Matcher> base;
+   pkgCache::Dep::DepType type;
+   VersionDepends(std::unique_ptr<APT::CacheFilter::Matcher> base, pkgCache::Dep::DepType type = pkgCache::Dep::Depends) : base(std::move(base)), type(type) {}
+   bool operator()(pkgCache::GrpIterator const &) override { return false; }
+   bool operator()(pkgCache::VerIterator const &Ver) override
+   {
+      for (auto D = Ver.DependsList(); not D.end(); D++)
+      {
+	 if (D.IsImplicit())
+	    continue;
+	 if (D->Type != type)
+	    continue;
+	 if ((*base)(D.TargetPkg()))
+	    return true;
+      }
+
+      return false;
+   }
+};
+
+struct APT_HIDDEN PackageReverseDepends : public PackageMatcher
+{
+   std::unique_ptr<APT::CacheFilter::Matcher> base;
+   pkgCache::Dep::DepType type;
+   PackageReverseDepends(std::unique_ptr<APT::CacheFilter::Matcher> base, pkgCache::Dep::DepType type = pkgCache::Dep::Depends) : base(std::move(base)), type(type) {}
+   bool operator()(pkgCache::PkgIterator const &Pkg) override
+   {
+      for (auto D = Pkg.RevDependsList(); not D.end(); D++)
+      {
+	 if (D.IsImplicit())
+	    continue;
+	 if (D->Type != type)
+	    continue;
+	 if ((*base)(D.ParentVer()))
+	    return true;
+      }
+
+      return false;
+   }
+};
+
 struct APT_HIDDEN VersionIsAnyVersion : public VersionAnyMatcher
 {
    std::unique_ptr<APT::CacheFilter::Matcher> base;