1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
{-# LANGUAGE ApplicativeDo #-}
{-# LANGUAGE RecordWildCards #-}
module Opts where
import Data.List
import Data.Version (showVersion)
import Options.Applicative
import Paths_werge (version)
data Tokenizer
= TokenizerFilter String
| TokenizeCharClass
| TokenizeCharClassSimple
deriving (Show)
tokenizer =
asum
[ TokenizerFilter
<$> strOption
(long "tok-filter"
<> short 'F'
<> metavar "FILTER"
<> help "external program to separate the text to tokens")
, flag'
TokenizeCharClassSimple
(long "simple-tokens"
<> short 'i'
<> help
"use wider character class to separate the tokens (results in larger tokens and ignores case)")
, flag'
TokenizeCharClass
(long "full-tokens"
<> short 'I'
<> help
"separate characters by all known character classes (default)")
, pure TokenizeCharClass
]
data Spaces
= SpacesNormal
| SpacesConflict
| SpacesMy
| SpacesOld
| SpacesYour
deriving (Show, Eq)
spaceMode x
| x `isPrefixOf` "normal" = Right SpacesNormal
| x `isPrefixOf` "conflict" = Right SpacesConflict
| x `isPrefixOf` "my" = Right SpacesMy
| x `isPrefixOf` "old" = Right SpacesOld
| x `isPrefixOf` "your" = Right SpacesYour
| otherwise =
Left
$ "could not parse value `"
++ x
++ "', use one of `normal', `conflict', `my', `old', and `your'"
data Config = Config
{ cfgTokenizer :: Tokenizer
, cfgSpaces :: Spaces
, cfgContext :: Int
, cfgZealous :: Bool
, cfgLabelStart :: String
, cfgLabelMyOld :: String
, cfgLabelOldYour :: String
, cfgLabelEnd :: String
, cfgResolveSpaces :: Bool
, cfgResolveOverlaps :: Bool
, cfgResolveSeparate :: Bool
} deriving (Show)
config = do
cfgTokenizer <- tokenizer
cfgSpaces <-
option (eitherReader spaceMode)
$ long "spaces"
<> short 's'
<> metavar "(normal|conflict|my|old|your)"
<> help
"mode of merging the space-only changes; instead of usual resolution one may choose to always conflict or to default the space from the source files (default: normal)"
<> value SpacesNormal
cfgContext <-
option auto
$ long "expand-context"
<> short 'C'
<> metavar "N"
<> value 1
<> showDefault
<> help
"Consider changes that are at most N tokens apart to be a single change. Zero may cause bad resolutions of near conflicting edits."
cfgZealous <-
asum
[ flag' False $ long "no-zeal" <> help "avoid zealous mode (default)"
, flag' True
$ long "zeal"
<> short 'z'
<> help
"try to zealously minify conflicts, potentially resolving them"
, pure False
]
cfgLabelStart <-
strOption
$ long "label-start"
<> metavar "STRING"
<> value "<<<<<"
<> showDefault
<> help "label for beginning of the conflict"
cfgLabelMyOld <-
strOption
$ long "label-mo"
<> metavar "STRING"
<> value "|||||"
<> showDefault
<> help "separator of local edits and original"
cfgLabelOldYour <-
strOption
$ long "label-oy"
<> metavar "STRING"
<> value "====="
<> showDefault
<> help "separator of original and other people's edits"
cfgLabelEnd <-
strOption
$ long "label-end"
<> metavar "STRING"
<> value ">>>>>"
<> showDefault
<> help "label for end of the conflict"
cfgResolveOverlaps <-
fmap not . switch
$ long "conflict-overlaps" <> help "do not resolve overlapping changes"
cfgResolveSeparate <-
fmap not . switch
$ long "conflict-separate"
<> help "do not resolve separate (non-overlapping) changes"
pure Config {..}
data Command
= CmdDiff3
{ d3my :: FilePath
, d3old :: FilePath
, d3your :: FilePath
}
| CmdGitMergetool
{ gmtFiles :: Maybe [FilePath]
, gmtDoAdd :: Bool
}
deriving (Show)
cmdDiff3 = do
d3my <- strArgument $ metavar "MYFILE" <> help "version with local edits"
d3old <- strArgument $ metavar "OLDFILE" <> help "original file version"
d3your <-
strArgument $ metavar "YOURFILE" <> help "version with other people's edits"
pure CmdDiff3 {..}
cmdGitMergetool = do
gmtFiles <-
asum
[ fmap Just . many
$ strArgument
$ metavar "UNMERGED"
<> help "unmerged git file (can be specified repeatedly"
, flag'
Nothing
(long "unmerged"
<> short 'u'
<> help "process all files marked as unmerged by git")
]
gmtDoAdd <-
asum
[ flag'
False
(long "add"
<> short 'a'
<> help "run `git add' for fully merged files")
, flag' True (long "no-add" <> help "prevent running `git add'")
, pure False
]
pure CmdGitMergetool {..}
cmd =
hsubparser
$ mconcat
[ command "merge"
$ info cmdDiff3
$ progDesc "diff3-style merge of changes"
, command "git"
$ info cmdGitMergetool
$ progDesc "try to merge unmerged git tree"
]
parseOpts :: IO (Config, Command)
parseOpts =
customExecParser (prefs subparserInline)
$ info
(liftA2 (,) config cmd
<**> helper
<**> simpleVersioner (showVersion version))
(fullDesc
<> header
"werge -- blanks-friendly mergetool for tiny interdwindled changes"
<> (footer $ "werge is a free software, use it accordingly."))
|
