solver3: Upgrade by source package

Implement the "APT::Get::Upgrade-By-Source-Package" option as
the classic solver does.

Here this is equally straight forward now: We enqueue optional, but
eager, clauses of the form

    foo=2 -> foo-data=2

for each sibling in the source version, assuming they are currently
installed, and the selection is not the current version.

This softly enforces upgrades of already installed siblings, but
in non-strict-pinning mode it will not affect the selection of
new packages to be installed.

A more complete solution to version selection by source package
also seems feasible, where we change the "priority" of versions
in the solver dynamically - currently they are statically evaluated.
Such that, when you select foo=2, and something installs foo-data,
foo-data would be installed in version 2 even if version 3 were its
candidate.

3 files changed, 50 insertions, 34 deletions

diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken
index 0e2005d60..671e49dd8 100644
--- a/test/integration/solver3.broken
+++ b/test/integration/solver3.broken
@@ -1,5 +1,4 @@
 test-allow-scores-for-all-dependency-types                  # TBD: We are lacking single-sided conflicts preferences
-test-apt-get-upgrade-by-source                              # TBD: Upgrading by source is not supported yet, mostly same issue as above
 test-apt-install-order-matters-a-bit                        # Wontfix: Cannot fix, the order is not recorded in the depcache
 test-bug-470115-new-and-tighten-recommends                  # TBD: Calculation of what is already satisfied Recommends is broken
 test-prevent-markinstall-multiarch-same-versionscrew        # TBD: We consider the skewed ones obsolete and remove them...
diff --git a/test/integration/test-apt-get-upgrade-by-source b/test/integration/test-apt-get-upgrade-by-source
index bac91f04a..8118ac1c3 100755
--- a/test/integration/test-apt-get-upgrade-by-source
+++ b/test/integration/test-apt-get-upgrade-by-source
@@ -22,6 +22,54 @@ noprogress() {
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
+Solving dependencies...Install pkg:arm64 ()
+[0] Install:pkg:arm64=2 ()
+Install pkg-bar:arm64 ()
+Install pkg-foo:arm64 ()
+[0] Reject:pkg:arm64=1 (pkg:arm64=2)
+[0] Install:pkg:arm64 (pkg:arm64=2)
+[1] Install:pkg-bar:arm64 ()
+[2] Install:pkg-foo:arm64 ()
+[3] Install:pkg-bar:arm64=2 (pkg:arm64=2)
+[3] Reject:pkg-bar:arm64=1 (pkg:arm64=2 -> pkg-bar:arm64=2)
+[4] Install:pkg-foo:arm64=2 (pkg:arm64=2)
+[4] Reject:pkg-foo:arm64=1 (pkg:arm64=2 -> pkg-foo:arm64=2)
+
+The following additional packages will be installed:
+  pkg-bar pkg-foo
+The following packages will be upgraded:
+  pkg pkg-bar pkg-foo
+3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Inst pkg [1] (2 unstable [all])
+Inst pkg-bar [1] (2 unstable [all])
+Inst pkg-foo [1] (2 unstable [all])
+Conf pkg (2 unstable [all])
+Conf pkg-bar (2 unstable [all])
+Conf pkg-foo (2 unstable [all])" aptget install pkg -o debug::apt::solver=1 --solver 3.0 -s
+
+testsuccessequal "Reading package lists...
+Building dependency tree...
+Solving dependencies...Install pkg:arm64 ()
+[0] Install:pkg:arm64=2 ()
+Install pkg-bar:arm64 ()
+Install pkg-foo:arm64 ()
+[0] Reject:pkg:arm64=1 (pkg:arm64=2)
+[0] Install:pkg:arm64 (pkg:arm64=2)
+[1] Install:pkg-bar:arm64 ()
+[2] Install:pkg-foo:arm64 ()
+[3] Install:pkg-bar:arm64=1 (pkg-bar:arm64)
+[3] Reject:pkg-bar:arm64=2 (pkg-bar:arm64 -> pkg-bar:arm64=1)
+[4] Install:pkg-foo:arm64=1 (pkg-foo:arm64)
+[4] Reject:pkg-foo:arm64=2 (pkg-foo:arm64 -> pkg-foo:arm64=1)
+
+The following packages will be upgraded:
+  pkg
+1 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
+Inst pkg [1] (2 unstable [all])
+Conf pkg (2 unstable [all])" aptget install pkg -o debug::apt::solver=1 -o APT::Get::Upgrade-By-Source-Package=0 --solver 3.0 -s
+
+testsuccessequal "Reading package lists...
+Building dependency tree...
   MarkInstall pkg:arm64 < 1 -> 2 @ii pumU > FU=1
   Upgrading pkg-bar:arm64 < 1 | 2 @ii umH > due to pkg:arm64
   Upgrading pkg-foo:arm64 < 1 | 2 @ii umH > due to pkg:arm64
@@ -38,7 +86,7 @@ Inst pkg-bar [1] (2 unstable [all])
 Inst pkg-foo [1] (2 unstable [all])
 Conf pkg (2 unstable [all])
 Conf pkg-bar (2 unstable [all])
-Conf pkg-foo (2 unstable [all])" aptget install pkg -o debug::pkgdepcache::marker=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::AutoInstall=1 -s
+Conf pkg-foo (2 unstable [all])" aptget install pkg -o debug::pkgdepcache::marker=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::AutoInstall=1 -s --solver internal
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
@@ -50,4 +98,4 @@ The following packages will be upgraded:
   pkg
 1 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
 Inst pkg [1] (2 unstable [all])
-Conf pkg (2 unstable [all])" aptget install pkg -o debug::pkgdepcache::marker=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::AutoInstall=1 -o APT::Get::Upgrade-By-Source-Package=0 -s
+Conf pkg (2 unstable [all])" aptget install pkg -o debug::pkgdepcache::marker=1 -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::AutoInstall=1 -o APT::Get::Upgrade-By-Source-Package=0 -s --solver internal
diff --git a/test/integration/test-solver3-evaluation b/test/integration/test-solver3-evaluation
index 06edb4962..b750b9245 100755
--- a/test/integration/test-solver3-evaluation
+++ b/test/integration/test-solver3-evaluation
@@ -185,34 +185,3 @@ ErrorMessage:
 AptSolverDump:
 $(cat rootdir/var/log/apt/edsp.log.zst | base64 | sed 's#^# #')" cat rootdir/var/crash/apt-edsp.$(id -u).crash
 
-msgmsg "Test that more upgrades are not better in installs"
-# FIXME: This will fail once 3.0 solver tries upgrading by source package.
-insertinstalledpackage 'b' 'all' '2' 'Source: src'
-insertinstalledpackage  'c' 'all' '2' 'Source: src'
-
-# No "Writing error report..."
-testsuccess rm rootdir/var/crash/apt-edsp.$(id -u).crash
-testsuccessequal "Reading package lists...
-Building dependency tree...
-Solving dependencies...
-The following additional packages will be installed:
-  c
-The following packages will be upgraded:
-  b c
-2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Inst b [2] (3 unstable [all])
-Inst c [2] (3 unstable [all])
-Conf b (3 unstable [all])
-Conf c (3 unstable [all])"  apt install --solver internal b  -s
-
-testfailure test -e rootdir/var/crash/apt-edsp.$(id -u).crash
-
-# Safety check to check that the 3.0 result actually looks worse
-testsuccessequal "Reading package lists...
-Building dependency tree...
-Solving dependencies...
-The following packages will be upgraded:
-  b
-1 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
-Inst b [2] (3 unstable [all])
-Conf b (3 unstable [all])"  apt install --solver 3.0 b  -s