diff options
| author | Mirek Kratochvil <exa.exa@gmail.com> | 2025-07-17 20:44:40 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <exa.exa@gmail.com> | 2025-07-17 20:44:40 +0200 |
| commit | 49fcd0ca44bc3dd49019386543e32e2189d39c7f (patch) | |
| tree | 17831481698ca98abca4faccd39f4b3f57f3b34b /Opts.hs | |
| parent | ecdaa9511d277b8adca6928a40d1e48955894441 (diff) | |
| download | werge-49fcd0ca44bc3dd49019386543e32e2189d39c7f.tar.gz werge-49fcd0ca44bc3dd49019386543e32e2189d39c7f.tar.bz2 | |
clean up
Diffstat (limited to 'Opts.hs')
| -rw-r--r-- | Opts.hs | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -16,6 +16,7 @@ data Tokenizer | TokenizeCharCategorySimple deriving (Show) +tokenizer :: Parser Tokenizer tokenizer = asum [ TokenizeFilter @@ -44,6 +45,7 @@ data ConflictMask = ConflictMask , cmResolveSeparate :: Bool } deriving (Show) +conflictMask :: String -> String -> Parser ConflictMask conflictMask label objs = do cmResolveOverlaps' <- fmap not . switch @@ -70,6 +72,7 @@ data Resolution | ResolveYour deriving (Show, Eq) +resolutionMode :: String -> Either String Resolution resolutionMode x | x `isPrefixOf` "keep" = Right ResolveKeep | x `isPrefixOf` "my" = Right ResolveMy @@ -86,6 +89,7 @@ data SpaceResolution | SpaceSpecial Resolution deriving (Show, Eq) +spaceMode :: String -> Either String SpaceResolution spaceMode x | x `isPrefixOf` "normal" = Right SpaceNormal | Right y <- resolutionMode x = Right (SpaceSpecial y) @@ -110,6 +114,7 @@ data Config = Config , cfgLabelEnd :: String } deriving (Show) +config :: Parser Config config = do cfgTokenizer <- tokenizer cfgZealous <- @@ -212,6 +217,7 @@ data Command } deriving (Show) +cmdDiff3 :: Parser Command cmdDiff3 = do d3my <- strArgument $ metavar "MYFILE" <> help "Version with local edits" d3old <- strArgument $ metavar "OLDFILE" <> help "Original file version" @@ -219,13 +225,15 @@ cmdDiff3 = do strArgument $ metavar "YOURFILE" <> help "Version with other people's edits" pure CmdDiff3 {..} +cmdGitMerge :: Parser Command cmdGitMerge = do gmFiles <- asum [ fmap Just . some $ strArgument $ metavar "UNMERGED" - <> help "Unmerged file tracked by git (can be specified repeatedly)" + <> help + "Unmerged file tracked by git (can be specified repeatedly)" , flag' Nothing (long "unmerged" @@ -246,6 +254,7 @@ cmdGitMerge = do -- TODO have some option to output the (partially merged) my/old/your files so -- that folks can continue with external program or so (such as meld) +cmd :: Parser Command cmd = hsubparser $ mconcat |