exa/adiff
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

move merge to merge

Browse source
This commit is contained in:
Mirek Kratochvil 2020-09-27 15:55:22 +02:00
parent 94b5950ca5
commit efae03223e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Diff3.hs
View file

@ -3,6 +3,7 @@ module Diff3 where
import Diff import Diff
import Types import Types
import Merge
data Origin data Origin
= Stable = Stable
@ -10,8 +11,8 @@ data Origin
| Your | Your
deriving (Show, Eq) deriving (Show, Eq)
--diff3Toks :: TV -> TV -> TV -> Diff diff3Toks :: MergeOpts -> TV -> TV -> TV -> Diff
diff3Toks tMine tOrig tYour = diff3Toks mo tMine tOrig tYour =
conflict $ align (diffToks tOrig tMine) (diffToks tOrig tYour) conflict $ align (diffToks tOrig tMine) (diffToks tOrig tYour)
where where
align :: Diff -> Diff -> [(Origin, (Op, Tok))] align :: Diff -> Diff -> [(Origin, (Op, Tok))]

7
src/Main.hs
View file

@ -101,7 +101,7 @@ actionOption =
adiffOptions = ADiffOptions <$> redfaOption <*> actionOption adiffOptions = ADiffOptions <$> redfaOption <*> actionOption
loadToks redfa f = loadToks redfa f =
mmapFileByteString f Nothing >>= (V.fromList <$> redfaTokenize redfa) V.fromList <$> (mmapFileByteString f Nothing >>= redfaTokenize redfa)
main :: IO () main :: IO ()
main = main =
@ -125,9 +125,8 @@ main =
CmdDiff3 ctxt f1 f2 f3 mo -> do CmdDiff3 ctxt f1 f2 f3 mo -> do
[toksMine, toksOld, toksYour] <- [toksMine, toksOld, toksYour] <-
traverse (loadToks redfa) [f1, f2, f3] traverse (loadToks redfa) [f1, f2, f3]
let d3 = diff3Toks toksMine toksOld toksYour let d3 = diff3Toks mo toksMine toksOld toksYour
BB.hPutBuilder stdout $ BB.hPutBuilder stdout $
if mergeDoMerge mo if mergeDoMerge mo
then fmtMerged mo d3 then fmtMerged mo d3
else pprHunks $ else pprHunks $ hunks (max 0 ctxt) d3
hunks (max 0 ctxt) $ diff3Toks toksMine toksOld toksYour