release: Default to shared version for the selection UI when all current versions are identical

Author: tek

packages/hix/lib/Hix/Managed/Release/ReleasePlan.hs

@@ -13,7 +13,8 @@ import Hix.Managed.Data.Packages (Packages)
 import Hix.Managed.Data.ReleaseConfig (ReleaseConfig (..), ReleaseVersion (..))
 import Hix.Managed.Data.ReleaseContext (ReleaseContext (..), ReleasePackage (..))
 import Hix.Managed.Release.Data.ReleasePlan (ConfiguredTarget (..))
-import Hix.Managed.Release.Data.SelectedVersion (SelectedVersion, explicitVersion, keepVersion)
+import Hix.Managed.Release.Data.SelectedVersion (SelectedVersion, explicitVersion, implicitVersion, keepVersion)
+
 import Hix.Managed.Release.Data.TargetSpec (TargetSpec (..), targetSpecName, targetSpecVersion)
 import Hix.Managed.Report (plural)
 import Hix.Managed.VersionIncrement (incrementVersion)
@@ -104,6 +105,13 @@ configuredReleaseVersions ReleaseContext {packages} config =
         sequence (updateVersion <$> currentSharedVersion selected <*> config.version)
       else pure Nothing
     targets <- nViaA (traverse (configuredTarget config explicitVersions sharedVersion)) selected
-    pure (sharedVersion, nMap excludedTarget excluded <> targets)
+    -- When no --version was specified but all packages share the same current version,
+    -- provide that as an implicit shared version so the UI can default to shared mode.
+    -- Only do this when there are no explicit per-package versions, since the implicit shared version
+    -- would cause batch mode to enter the SharedVersion path, ignoring per-package overrides.
+    let uiSharedVersion
+          | nNull explicitVersions = sharedVersion <|> (implicitVersion <$> currentSharedVersion selected)
+          | otherwise = sharedVersion
+    pure (uiSharedVersion, nMap excludedTarget excluded <> targets)
   where
     allTargets pkgs = pure RestrictedTargets {selected = pkgs, excluded = [], explicitVersions = []}

packages/integration/test/Hix/Integration/ReleaseFlowTest.hs

@@ -449,3 +449,55 @@ releaseFlowInitialRenderTest = do
 test_releaseFlowInitialRender :: TestT IO ()
 test_releaseFlowInitialRender =
   tmuxTest True 10 releaseFlowInitialRenderTest
+
+-- | Context proto with packages at the same version and no --version flag.
+-- This should default to shared mode in the UI.
+sharedDefaultContext :: ReleaseContextProto
+sharedDefaultContext =
+  ReleaseContextProto {
+    packages = [
+      ("local1", ReleasePackage {name = "local1", version = [0, 5, 0, 0], path = [reldir|local1|]}),
+      ("local2", ReleasePackage {name = "local2", version = [0, 5, 0, 0], path = [reldir|local2|]})
+    ],
+    hackage = [unsafeCentralHackageContextFixed],
+    hooks = [],
+    commitExtraArgs = [],
+    tagExtraArgs = [],
+    managed = True
+  }
+
+sharedDefaultConfig :: ReleaseConfig
+sharedDefaultConfig =
+  def {
+    publish = bothArtifacts,
+    targets = Just ["local1", "local2"],
+    version = Nothing,
+    interactive = True
+  }
+
+sharedDefaultVersionBox :: Text
+sharedDefaultVersionBox =
+  [exon|┌──────────────────────────────────┐
+│██ Choose release versions        │
+│                                  │
+│● All packages 0.5.0.0      bump b│
+│                          shared s│
+│○ local1       0.5.0.0      quit q│
+│○ local2       0.5.0.0      help ?│
+└──────────────────────────────────┘
+|]
+
+sharedDefaultFlowTest :: TmuxTest M ()
+sharedDefaultFlowTest = do
+  debug <- tmuxLiftM brickDebug
+  handlers <- tmuxLiftM (handlersFlowTest defaultTestConfig debug)
+  withAsync (tmuxLiftM (void (release handlers sharedDefaultConfig sharedDefaultContext))) \ _ -> do
+    runStep debug FlowStep {
+      label = "version-selection (shared default)",
+      expected = sharedDefaultVersionBox,
+      keys = [KEnter]
+    }
+
+test_releaseFlowSharedDefault :: TestT IO ()
+test_releaseFlowSharedDefault =
+  tmuxTest True 10 sharedDefaultFlowTest