1 files changed, 27 insertions, 10 deletions
diff --git a/src/Command/Run.hs b/src/Command/Run.hs
index 9652529..a80e15d 100644
--- a/src/Command/Run.hs
+++ b/src/Command/Run.hs
@@ -126,7 +126,7 @@ mergeSources sources = do
 argumentJobSource :: [ JobName ] -> CommandExec JobSource
 argumentJobSource [] = emptyJobSource
 argumentJobSource names = do
-    ( config, jobsetCommit ) <- getJobRoot >>= \case
+    ( config, jcommit ) <- getJobRoot >>= \case
         JobRootConfig config -> do
             commit <- sequence . fmap createWipCommit =<< tryGetDefaultRepo
             return ( config, commit )
@@ -135,29 +135,46 @@ argumentJobSource names = do
             config <- either fail return =<< loadConfigForCommit =<< getCommitTree commit
             return ( config, Just commit )
 
-    jobtree <- case jobsetCommit of
+    jobtree <- case jcommit of
         Just commit -> (: []) <$> getCommitTree commit
         Nothing -> return []
     let cidPart = map (JobIdTree Nothing "" . treeId) jobtree
-    jobsetJobsEither <- fmap Right $ forM names $ \name ->
+    forM_ names $ \name ->
         case find ((name ==) . jobName) (configJobs config) of
-            Just job -> return job
+            Just _  -> return ()
             Nothing -> tfail $ "job ‘" <> textJobName name <> "’ not found"
-    oneshotJobSource . (: []) =<<
-        cmdEvalWith (\ei -> ei { eiCurrentIdRev = cidPart ++ eiCurrentIdRev ei })
-        (evalJobSet (map ( Nothing, ) jobtree) JobSet {..})
+
+    jset <- cmdEvalWith (\ei -> ei { eiCurrentIdRev = cidPart ++ eiCurrentIdRev ei }) $ do
+        fullSet <- evalJobSet (map ( Nothing, ) jobtree) JobSet
+            { jobsetId = ()
+            , jobsetCommit = jcommit
+            , jobsetJobsEither = Right (configJobs config)
+            }
+        let selectedSet = fullSet { jobsetJobsEither = fmap (filter ((`elem` names) . jobName)) (jobsetJobsEither fullSet) }
+        fillInDependencies selectedSet
+    oneshotJobSource [ jset ]
 
 refJobSource :: [ JobRef ] -> CommandExec JobSource
 refJobSource [] = emptyJobSource
 refJobSource refs = do
-    jobs <- cmdEvalWith id $ mapM evalJobReference refs
-    oneshotJobSource . map (JobSet Nothing . Right . (: [])) $ jobs
+    jobs <- foldl' addJobToList [] <$> cmdEvalWith id (mapM evalJobReference refs)
+    sets <- cmdEvalWith id $ do
+        forM jobs $ \( sid, js ) -> do
+            fillInDependencies $ JobSet sid Nothing (Right $ reverse js)
+    oneshotJobSource sets
+  where
+    addJobToList :: [ ( JobSetId, [ Job ] ) ] -> ( Job, JobSetId ) -> [ ( JobSetId, [ Job ] ) ]
+    addJobToList (( sid, js ) : rest ) ( job, jsid )
+        | sid == jsid             = ( sid, job : js ) : rest
+        | otherwise               = ( sid, js ) : addJobToList rest ( job, jsid )
+    addJobToList [] ( job, jsid ) = [ ( jsid, [ job ] ) ]
 
 loadJobSetFromRoot :: (MonadIO m, MonadFail m) => JobRoot -> Commit -> m DeclaredJobSet
 loadJobSetFromRoot root commit = case root of
     JobRootRepo _ -> loadJobSetForCommit commit
     JobRootConfig config -> return JobSet
-        { jobsetCommit = Just commit
+        { jobsetId = ()
+        , jobsetCommit = Just commit
         , jobsetJobsEither = Right $ configJobs config
         }