From b52b106ac50a0100e41843e2bd2edcbb74a10b6e Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Wed, 23 Jul 2025 10:50:17 +0200 Subject: allow picking patches from files --- Opts.hs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Opts.hs') diff --git a/Opts.hs b/Opts.hs index 088d089..94b0065 100644 --- a/Opts.hs +++ b/Opts.hs @@ -230,6 +230,7 @@ data Command } | CmdPatch { patchMy :: FilePath + , patchInput :: Maybe FilePath } | CmdBreak | CmdGlue @@ -295,6 +296,12 @@ cmdDiff = do cmdPatch :: Parser Command cmdPatch = do patchMy <- strArgument $ metavar "MYFILE" <> help "File to be modified" + patchInput <- + optional . strOption + $ long "patch" + <> short 'p' + <> metavar "PATCH" + <> help "File with the patch (default: stdin)" pure CmdPatch {..} -- TODO have some option to output the (partially merged) my/old/your files so @@ -314,7 +321,7 @@ cmd = $ progDesc "Find differences between two files" , command "patch" $ info cmdPatch - $ progDesc "Apply a patch from `diff' to file" + $ progDesc "Modify a file using a patch from `diff'" , command "break" $ info (pure CmdBreak) $ progDesc "Break text to tokens" -- cgit v1.2.3