From 8f9677e40fe7e8e23d07da0b06be04ed10d3f649 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Wed, 23 Jul 2025 11:15:33 +0200 Subject: improve the patch subcommand a little closes https://github.com/exaexa/werge/issues/1 --- Opts.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'Opts.hs') diff --git a/Opts.hs b/Opts.hs index 94b0065..fdded5a 100644 --- a/Opts.hs +++ b/Opts.hs @@ -229,7 +229,7 @@ data Command , diffUnified :: Maybe Int } | CmdPatch - { patchMy :: FilePath + { patchTarget :: Maybe FilePath , patchInput :: Maybe FilePath } | CmdBreak @@ -295,7 +295,15 @@ cmdDiff = do cmdPatch :: Parser Command cmdPatch = do - patchMy <- strArgument $ metavar "MYFILE" <> help "File to be modified" + patchTarget <- + asum + [ Just <$> strArgument (metavar "MYFILE" <> help "File to be patched") + , flag' Nothing + $ long "format" + <> short 'f' + <> help + "Do not patch anything, only format the patch using conflict marks on joined tokens" + ] patchInput <- optional . strOption $ long "patch" -- cgit v1.2.3