git.iko.soy/obelisk
on master help sign in
remove ob thunk set
dfd02bchsloan
lib/command/src/Obelisk/Command.hs−3
compare with master
unifiedsplit
@@ -214,7 +214,6 @@ data ThunkCommand
214 = ThunkCommand_Update [FilePath] (Maybe String)
214 = ThunkCommand_Update [FilePath] (Maybe String)
215 | ThunkCommand_Unpack [FilePath]
215 | ThunkCommand_Unpack [FilePath]
216 | ThunkCommand_Pack [FilePath]
216 | ThunkCommand_Pack [FilePath]
217− | ThunkCommand_Set [FilePath] String
218 deriving Show
217 deriving Show
219
218
220thunkCommand :: Parser ThunkCommand
219thunkCommand :: Parser ThunkCommand
@@ -222,7 +221,6 @@ thunkCommand = hsubparser $ mconcat
222 [ command "update" $ info (ThunkCommand_Update <$> some thunkDirectoryParser <*> optional (strOption (long "branch" <> metavar "BRANCH"))) $ progDesc "Update thunk to latest revision available"
221 [ command "update" $ info (ThunkCommand_Update <$> some thunkDirectoryParser <*> optional (strOption (long "branch" <> metavar "BRANCH"))) $ progDesc "Update thunk to latest revision available"
223 , command "unpack" $ info (ThunkCommand_Unpack <$> some thunkDirectoryParser) $ progDesc "Unpack thunk into git checkout of revision it points to"
222 , command "unpack" $ info (ThunkCommand_Unpack <$> some thunkDirectoryParser) $ progDesc "Unpack thunk into git checkout of revision it points to"
224 , command "pack" $ info (ThunkCommand_Pack <$> some thunkDirectoryParser) $ progDesc "Pack git checkout into thunk that points at the current branch's upstream"
223 , command "pack" $ info (ThunkCommand_Pack <$> some thunkDirectoryParser) $ progDesc "Pack git checkout into thunk that points at the current branch's upstream"
225− , command "set" $ info (ThunkCommand_Set <$> some thunkDirectoryParser <*> strOption (long "branch" <> metavar "BRANCH")) $ progDesc "Set upstream branch of thunk"
226 ]
224 ]
227
225
228parserPrefs :: ParserPrefs
226parserPrefs :: ParserPrefs
@@ -351,7 +349,6 @@ ob = \case
351 ThunkCommand_Update thunks mBranch -> mapM_ ((flip updateThunkToLatest) mBranch) thunks
349 ThunkCommand_Update thunks mBranch -> mapM_ ((flip updateThunkToLatest) mBranch) thunks
352 ThunkCommand_Unpack thunks -> mapM_ unpackThunk thunks
350 ThunkCommand_Unpack thunks -> mapM_ unpackThunk thunks
353 ThunkCommand_Pack thunks -> forM_ thunks packThunk
351 ThunkCommand_Pack thunks -> forM_ thunks packThunk
354− ThunkCommand_Set thunks branch -> mapM_ (setThunk branch) thunks
355 ObCommand_Repl -> runRepl
352 ObCommand_Repl -> runRepl
356 ObCommand_Watch -> inNixShell' $ static runWatch
353 ObCommand_Watch -> inNixShell' $ static runWatch
357 ObCommand_Internal icmd -> case icmd of
354 ObCommand_Internal icmd -> case icmd of
lib/selftest/src/Obelisk/SelfTest.hs−8
@@ -213,14 +213,6 @@ main = do
213 void $ unpack
213 void $ unpack
214 testThunkPack (dir </> thunk)
214 testThunkPack (dir </> thunk)
215
215
216− describe "ob thunk set" $ parallel $ do
217− let branch = "develop"
218− it "can set a packed thunk to another packed thunk" $ withTmp $ \dir -> do
219− run_ "git" ["clone", "https://github.com/reflex-frp/reflex.git", toTextIgnore dir, "--branch", "cg-quickref"]
220− run_ "ob" ["thunk", "pack", toTextIgnore dir]
221− run_ "ob" ["thunk", "set", toTextIgnore dir, "--branch", branch]
222−
223−
224-- | Run `ob run` in the given directory (maximum of one level deep)
216-- | Run `ob run` in the given directory (maximum of one level deep)
225testObRunInDir :: Socket.PortNumber -> Socket.PortNumber -> Maybe Shelly.FilePath -> HTTP.Manager -> Sh ()
217testObRunInDir :: Socket.PortNumber -> Socket.PortNumber -> Maybe Shelly.FilePath -> HTTP.Manager -> Sh ()
226testObRunInDir p0 p1 mdir httpManager = handle_sh (\case ExitSuccess -> pure (); e -> throw e) $ do
218testObRunInDir p0 p1 mdir httpManager = handle_sh (\case ExitSuccess -> pure (); e -> throw e) $ do