diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,340 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/Opts.hs b/Opts.hs new file mode 100644 --- /dev/null +++ b/Opts.hs @@ -0,0 +1,73 @@ +{-# LANGUAGE LambdaCase #-} +-- | Option parser + +module Opts + ( Options(..) + , getOpts + ) where + +import Control.Applicative (Alternative(..)) +import Data.Monoid ((<>)) +import qualified Options.Applicative as O +import PPDiff (ColorEnable(..)) +import System.Exit (exitSuccess) +import Version (versionString) + +data Options = Options + { shouldUseEditor :: Bool + , shouldDumpDiffs :: Bool + , shouldDumpDiff2 :: Bool + , shouldUseColor :: Maybe ColorEnable + , shouldSetConflictStyle :: Bool + } + +data CmdArgs = CmdVersion | CmdOptions Options + +parser :: O.Parser CmdArgs +parser = + O.flag' CmdVersion (O.long "version" <> O.help "Print the version and quit") + <|> CmdOptions + <$> ( Options + <$> O.switch + ( O.long "editor" <> O.short 'e' + <> O.help "Execute $EDITOR for each conflicted file that remains conflicted" + ) + <*> O.switch + ( O.long "diff" <> O.short 'd' + <> O.help "Dump the left/right diffs from base in each conflict remaining" + ) + <*> O.switch + ( O.long "diff2" <> O.short '2' + <> O.help "Dump the diff between left and right in each conflict remaining" + ) + <*> ( O.flag' (Just EnableColor) + (O.long "color" <> O.short 'c' <> O.help "Enable color") + <|> O.flag' (Just DisableColor) + (O.long "no-color" <> O.short 'C' <> O.help "Disable color") + <|> pure Nothing + ) + <*> ( O.switch + ( O.long "style" <> O.short 's' + <> O.help "Configure git's global merge.conflictstyle to diff3 if needed" + ) + ) + ) + +opts :: O.ParserInfo CmdArgs +opts = + O.info (O.helper <*> parser) $ + O.fullDesc + <> O.progDesc + "Resolve any git conflicts that have become trivial by editing operations.\n\ + \Go to http://github.com/Peaker/git-mediate for example use." + <> O.header "git-mediate - Become a conflicts hero" + +getOpts :: IO Options +getOpts = + O.execParser opts + >>= \case + CmdVersion -> + do + putStrLn $ "git-mediate version " ++ versionString + exitSuccess + CmdOptions opts -> return opts diff --git a/PPDiff.hs b/PPDiff.hs new file mode 100644 --- /dev/null +++ b/PPDiff.hs @@ -0,0 +1,18 @@ +module PPDiff + ( ColorEnable(..) + , ppDiff + ) where + +import Data.Algorithm.Diff (Diff(..)) +import System.Console.ANSI + +data ColorEnable = EnableColor | DisableColor + +wrap :: ColorEnable -> Color -> String -> String +wrap DisableColor _ str = str +wrap EnableColor color str = setSGRCode [SetColor Foreground Vivid color] ++ str ++ setSGRCode [Reset] + +ppDiff :: ColorEnable -> Diff String -> String +ppDiff c (First x) = wrap c Red $ '-':x +ppDiff c (Second x) = wrap c Green $ '+':x +ppDiff _ (Both x _) = ' ':x diff --git a/Setup.hs b/Setup.hs new file mode 100644 --- /dev/null +++ b/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/git-mediate.cabal b/git-mediate.cabal new file mode 100644 --- /dev/null +++ b/git-mediate.cabal @@ -0,0 +1,38 @@ +-- Initial git-mediate.cabal generated by cabal init. For +-- further documentation, see http://haskell.org/cabal/users-guide/ + +name: git-mediate +version: 1.0 +synopsis: Remove trivial conflict markers in a git repository +description: Remove trivial conflict markers in a git repository +homepage: https://github.com/ElastiLotem/git-mediate +license: GPL-2 +license-file: LICENSE +author: Eyal Lotem +maintainer: eyal.lotem@gmail.com +-- copyright: +category: Development +build-type: Simple +-- extra-source-files: +cabal-version: >=1.10 + +source-repository head + type: git + location: https://github.com/Elastilotem/git-mediate + +executable git-mediate + main-is: git-mediate.hs + other-modules: PPDiff, Opts + -- other-extensions: + build-depends: base >=4.6 && <5 + , base-compat >= 0.8.2 && < 0.10 + , mtl >=2.1 + , directory >=1.2 + , process >=1.2 + , filepath >=1.3 + , unix >=2.7 + , Diff >=0.3 + , ansi-terminal >=0.6.2 + , optparse-applicative >=0.11 && <0.14 + -- hs-source-dirs: + default-language: Haskell2010 diff --git a/git-mediate.hs b/git-mediate.hs new file mode 100644 --- /dev/null +++ b/git-mediate.hs @@ -0,0 +1,428 @@ +{-# OPTIONS -O2 -Wall #-} +{-# LANGUAGE NoImplicitPrelude, FlexibleContexts, RecordWildCards, LambdaCase #-} +module Main (main) where + +import qualified Control.Exception as E +import Control.Monad (when, unless, filterM) +import Control.Monad.State (MonadState, state, evalStateT) +import Control.Monad.Writer (runWriter, tell) +import Data.Algorithm.Diff (Diff, getDiff) +import Data.Foldable (asum, traverse_) +import Data.List (isPrefixOf, isSuffixOf) +import Data.Maybe (mapMaybe) +import qualified Data.Monoid as Monoid +import qualified Opts +import Opts (Options(..)) +import PPDiff (ppDiff, ColorEnable(..)) +import System.Directory (renameFile, removeFile, getCurrentDirectory) +import System.Environment (getEnv) +import System.Exit (ExitCode(..)) +import System.FilePath ((<.>), makeRelative, joinPath, splitPath) +import qualified System.FilePath as FilePath +import qualified System.Posix.Files as PosixFiles +import System.Posix.IO (stdOutput) +import System.Posix.Terminal (queryTerminal) +import System.Process (callProcess, readProcess, readProcessWithExitCode) + +import Prelude.Compat + +data Side = A | B + deriving (Eq, Ord, Show) +type LineNo = Int + +data Conflict = Conflict + { cMarkerA :: (LineNo, String) -- <<<<<<<.... + , cMarkerBase :: (LineNo, String) -- |||||||.... + , cMarkerB :: (LineNo, String) -- =======.... + , cMarkerEnd :: (LineNo, String) -- >>>>>>>.... + , cLinesA :: [String] + , cLinesBase :: [String] + , cLinesB :: [String] + } deriving (Show) + +prettyConflictLines :: Conflict -> [String] +prettyConflictLines Conflict {..} = + concat + [ snd cMarkerA : cLinesA + , snd cMarkerBase : cLinesBase + , snd cMarkerB : cLinesB + , [snd cMarkerEnd] + ] + +prettyConflict :: Conflict -> String +prettyConflict = unlines . prettyConflictLines + +lengthOfCommonPrefix :: Eq a => [a] -> [a] -> Int +lengthOfCommonPrefix x y = length $ takeWhile id $ zipWith (==) x y + +data Resolution + = NoResolution + | Resolution String + | PartialResolution String + +resolveConflict :: Conflict -> Resolution +resolveConflict conflict@Conflict{..} + | cLinesA == cLinesBase = Resolution $ unlines cLinesB + | cLinesB == cLinesBase = Resolution $ unlines cLinesA + | cLinesA == cLinesB = Resolution $ unlines cLinesA + | matchTop > 0 || matchBottom > 0 = + PartialResolution $ unlines $ + take matchTop cLinesBase ++ + prettyConflictLines conflict + { cLinesA = unmatched cLinesA + , cLinesBase = unmatched cLinesBase + , cLinesB = unmatched cLinesB + } ++ + takeEnd matchBottom cLinesBase + | otherwise = NoResolution + where + matchTop = + minimum $ map (lengthOfCommonPrefix cLinesBase) [cLinesA, cLinesB] + revBottom = reverse . drop matchTop + revBottomBase = revBottom cLinesBase + matchBottom = + minimum $ + map (lengthOfCommonPrefix revBottomBase . revBottom) + [cLinesA, cLinesB] + dropEnd count xs = take (length xs - count) xs + takeEnd count xs = drop (length xs - count) xs + unmatched xs = drop matchTop $ dropEnd matchBottom xs + +-- '>' -> ">>>>>>> " +markerPrefix :: Char -> String +markerPrefix = replicate 7 + +markerLine :: Char -> String -> String +markerLine c str = markerPrefix c ++ " " ++ str ++ "\n" + +breakUpToMarker :: MonadState [(LineNo, String)] m => Char -> m [(LineNo, String)] +breakUpToMarker c = state (break ((markerPrefix c `isPrefixOf`) . snd)) + +readHead :: MonadState [a] m => m (Maybe a) +readHead = state f + where + f [] = (Nothing, []) + f (l:ls) = (Just l, ls) + +tryReadUpToMarker :: MonadState [(LineNo, String)] m => Char -> m ([(LineNo, String)], Maybe (LineNo, String)) +tryReadUpToMarker c = + do + ls <- breakUpToMarker c + mHead <- readHead + return (ls, mHead) + +readUpToMarker :: MonadState [(LineNo, String)] m => Char -> m ([(LineNo, String)], (LineNo, String)) +readUpToMarker c = do + res <- tryReadUpToMarker c + case res of + (ls, Just h) -> return (ls, h) + (ls, Nothing) -> + error $ concat + [ "Parse error: failed reading up to marker: " + , show c, ", got:" + , concatMap (\(l,s) -> "\n" ++ show l ++ "\t" ++ s) $ take 5 ls + ] + +parseConflict :: MonadState [(LineNo, String)] m => (LineNo, String) -> m Conflict +parseConflict markerA = + do (linesA , markerBase) <- readUpToMarker '|' + (linesBase, markerB) <- readUpToMarker '=' + (linesB , markerEnd) <- readUpToMarker '>' + return Conflict + { cMarkerA = markerA + , cMarkerBase = markerBase + , cMarkerB = markerB + , cMarkerEnd = markerEnd + , cLinesA = map snd linesA + , cLinesB = map snd linesB + , cLinesBase = map snd linesBase + } + +parseConflicts :: String -> [Either String Conflict] +parseConflicts input = + snd $ runWriter $ evalStateT loop (zip [1..] (lines input)) + where + loop = + do (ls, mMarkerA) <- tryReadUpToMarker '<' + tell $ map (Left . snd) ls + case mMarkerA of + Nothing -> return () + Just markerA -> + do tell . return . Right =<< parseConflict markerA + loop + +type SideDiff = (Side, (LineNo, String), [Diff String]) + +data NewContent = NewContent + { _resolvedSuccessfully :: Int + , _reducedConflicts :: Int + , _failedToResolve :: Int + , _newContent :: String + } + +getConflictDiffs :: Conflict -> [SideDiff] +getConflictDiffs Conflict{..} = + [ (A, cMarkerA, getDiff cLinesBase cLinesA) + | not (null cLinesA) ] ++ + [ (B, (fst cMarkerB, snd cMarkerEnd), getDiff cLinesBase cLinesB) + | not (null cLinesB) ] + +getConflictDiff2s :: Conflict -> ((LineNo, String), (LineNo, String), [Diff String]) +getConflictDiff2s Conflict{..} = (cMarkerA, cMarkerB, getDiff cLinesA cLinesB) + +resolveContent :: [Either String Conflict] -> NewContent +resolveContent = + asResult . mconcat . map go + where + asResult (Monoid.Sum successes, Monoid.Sum reductions, Monoid.Sum failures, newContent) = + NewContent + { _resolvedSuccessfully = successes + , _reducedConflicts = reductions + , _failedToResolve = failures + , _newContent = newContent + } + go (Left line) = (Monoid.Sum 0, Monoid.Sum 0, Monoid.Sum 0, unlines [line]) + go (Right conflict) = + case resolveConflict conflict of + NoResolution -> (Monoid.Sum 0, Monoid.Sum 0, Monoid.Sum 1, prettyConflict conflict) + Resolution trivialLines -> (Monoid.Sum 1, Monoid.Sum 0, Monoid.Sum 0, trivialLines) + PartialResolution newLines -> (Monoid.Sum 0, Monoid.Sum 1, Monoid.Sum 0, newLines) + +gitAdd :: FilePath -> IO () +gitAdd fileName = + callProcess "git" ["add", "--", fileName] + +openEditor :: Options -> FilePath -> IO () +openEditor opts path + | shouldUseEditor opts = + do editor <- getEnv "EDITOR" + callProcess editor [path] + | otherwise = return () + +dumpDiffs :: ColorEnable -> Options -> FilePath -> [Conflict] -> IO () +dumpDiffs colorEnable opts filePath conflicts = + do + when (shouldDumpDiffs opts) $ mapM_ dumpDiff $ concatMap getConflictDiffs conflicts + when (shouldDumpDiff2 opts) $ mapM_ dumpDiff2 $ map getConflictDiff2s conflicts + where + dumpDiff (side, (lineNo, marker), diff) = + do putStrLn $ concat + [filePath, ":", show lineNo, ":Diff", show side, ": ", marker] + putStr $ unlines $ map (ppDiff colorEnable) diff + dumpDiff2 ((lineNoA, markerA), (lineNoB, markerB), diff) = + do putStrLn $ concat [filePath, ":", show lineNoA, " <->", markerA] + putStrLn $ concat [filePath, ":", show lineNoB, ": ", markerB] + putStr $ unlines $ map (ppDiff colorEnable) diff + +dumpAndOpenEditor :: ColorEnable -> Options -> FilePath -> [Conflict] -> IO () +dumpAndOpenEditor colorEnable opts path conflicts = + do dumpDiffs colorEnable opts path conflicts + openEditor opts path + +overwrite :: FilePath -> String -> IO () +overwrite fileName newContent = + do renameFile fileName bkup + writeFile fileName newContent + removeFile bkup + where + bkup = fileName <.> "bk" + +resolve :: ColorEnable -> Options -> FilePath -> IO () +resolve colorEnable opts fileName = + resolveContent . parseConflicts <$> readFile fileName + >>= \case + NewContent successes reductions failures newContent + | successes == 0 && allGood -> + do putStrLn $ fileName ++ ": No conflicts, git-adding" + gitAdd fileName + | successes == 0 && reductions == 0 -> + do putStrLn $ concat + [ fileName, ": Failed to resolve any of the " + , show failures, " conflicts" ] + doDump + | successes == 0 -> + do putStrLn $ concat + [ fileName, ": Reduced ", show reductions, " conflicts"] + overwrite fileName newContent + doDump + | otherwise -> + do putStrLn $ concat + [ fileName, ": Successfully resolved ", show successes + , " conflicts (failed to resolve " ++ show (reductions + failures) ++ " conflicts)" + , if allGood then ", git adding" else "" + ] + overwrite fileName newContent + if allGood + then gitAdd fileName + else doDump + where + allGood = failures == 0 && reductions == 0 + doDump = + dumpAndOpenEditor colorEnable opts fileName + [ conflict | Right conflict <- parseConflicts newContent ] + +stripNewline :: String -> String +stripNewline x + | "\n" `isSuffixOf` x = init x + | otherwise = x + +shouldUseColorByTerminal :: IO ColorEnable +shouldUseColorByTerminal = + do istty <- queryTerminal stdOutput + return $ if istty then EnableColor else DisableColor + +unprefix :: Eq a => [a] -> [a] -> Maybe [a] +unprefix prefix str + | prefix `isPrefixOf` str = Just (drop (length prefix) str) + | otherwise = Nothing + +getConflictStyle :: IO String +getConflictStyle = + do (exitCode, stdout, _) <- readProcessWithExitCode "git" ["config", "merge.conflictstyle"] stdin + case exitCode of + ExitSuccess -> return $ stripNewline stdout + ExitFailure 1 -> return "unset" + ExitFailure _ -> E.throwIO exitCode + where + stdin = "" + +setConflictStyle :: IO () +setConflictStyle = + callProcess "git" ["config", "--global", "merge.conflictstyle", "diff3"] + +checkConflictStyle :: Options -> IO () +checkConflictStyle opts = + do conflictStyle <- getConflictStyle + when (conflictStyle /= "diff3") $ + do unless (shouldSetConflictStyle opts) $ + fail $ concat + [ "merge.conflictstyle must be diff3 but is " + , show conflictStyle + , ". Use -s to automatically set it globally" + ] + setConflictStyle + + newConflictStyle <- getConflictStyle + when (newConflictStyle /= "diff3") $ + fail $ concat + [ "Attempt to set conflict style failed. Perhaps you have" + , " an incorrect merge.conflictstyle configuration " + , "specified in your per-project .git/config?" + ] + +relativePath :: FilePath -> FilePath -> FilePath +relativePath base path + | rel /= path = rel + | revRel /= base = + joinPath $ replicate (length (splitPath revRel)) ".." + | otherwise = path + where + rel = makeRelative base path + revRel = makeRelative path base + +() :: FilePath -> FilePath -> FilePath +"." p = p +d p = d FilePath. p + +isDirectory :: FilePath -> IO Bool +isDirectory x = PosixFiles.isDirectory <$> PosixFiles.getFileStatus x + +ensureNewline :: String -> String +ensureNewline "" = "" +ensureNewline str = str ++ suffix + where + suffix + | "\n" `isSuffixOf` str = "" + | otherwise = "\n" + +withAllStageFiles :: + FilePath -> (FilePath -> Maybe FilePath -> Maybe FilePath -> IO b) -> IO b +withAllStageFiles path action = + do let stdin = "" + [baseTmpRaw, localTmpRaw, remoteTmpRaw] <- + take 3 . words <$> + readProcess "git" ["checkout-index", "--stage=all", "--", path] stdin + cdup <- + takeWhile (/= '\0') . stripNewline <$> + readProcess "git" ["rev-parse", "--show-cdup"] stdin + let maybePath "." = Nothing + maybePath p = Just (cdup p) + let mLocalTmp = maybePath localTmpRaw + mRemoteTmp = maybePath remoteTmpRaw + baseTmp = cdup baseTmpRaw + action baseTmp mLocalTmp mRemoteTmp + `E.finally` + do removeFile baseTmp + traverse_ removeFile mLocalTmp + traverse_ removeFile mRemoteTmp + +deleteModifyConflictAddMarkers :: FilePath -> IO () +deleteModifyConflictAddMarkers path = + withAllStageFiles path $ \baseTmp mLocalTmp mRemoteTmp -> + do baseContent <- readFile baseTmp + localContent <- maybe (return "") readFile mLocalTmp + remoteContent <- maybe (return "") readFile mRemoteTmp + overwrite path $ + concat + [ markerLine '<' "LOCAL" + , ensureNewline localContent + , markerLine '|' "BASE" + , ensureNewline baseContent + , markerLine '=' "" + , ensureNewline remoteContent + , markerLine '>' "REMOTE" + ] + +deleteModifyConflictHandle :: FilePath -> IO () +deleteModifyConflictHandle path = + do marked <- any (markerPrefix '<' `isPrefixOf`) . lines <$> readFile path + unless marked $ + do putStrLn $ show path ++ " has a delete/modify conflict. Adding conflict markers" + deleteModifyConflictAddMarkers path + +removeFileIfEmpty :: FilePath -> IO () +removeFileIfEmpty path = + do isEmpty <- null <$> readFile path + when isEmpty $ + do removeFile path + callProcess "git" ["add", "-u", "--", path] + +main :: IO () +main = + do opts <- Opts.getOpts + colorEnable <- + case shouldUseColor opts of + Nothing -> shouldUseColorByTerminal + Just colorEnable -> return colorEnable + checkConflictStyle opts + let stdin = "" + statusPorcelain <- readProcess "git" ["status", "--porcelain"] stdin + cwd <- getCurrentDirectory + rootDir <- + relativePath cwd . stripNewline <$> + readProcess "git" ["rev-parse", "--show-toplevel"] stdin + let rootRelativeFiles = + filterM (fmap not . isDirectory) . map (rootDir ) + let firstMatchingPrefix :: [String] -> String -> Maybe String + firstMatchingPrefix prefixes = + asum . traverse unprefix prefixes + let filesMatchingPrefixes :: [String] -> IO [FilePath] + filesMatchingPrefixes prefixes = + rootRelativeFiles . mapMaybe (firstMatchingPrefix prefixes) + $ lines statusPorcelain + +-- from git-diff manpage: +-- Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), +-- have their type (i.e. regular file, symlink, submodule, ...) changed (T), +-- are Unmerged (U), are Unknown (X), or have had their pairing Broken (B) + + deleteModifyConflicts <- filesMatchingPrefixes ["DU ", "UD "] + + mapM_ deleteModifyConflictHandle deleteModifyConflicts + + filesMatchingPrefixes ["UU ", "AA ", "DA ", "AD ", "DU ", "UD "] + >>= mapM_ (resolve colorEnable opts) + + -- Heuristically delete files that were remove/modify conflict + -- and ended up with empty content + mapM_ removeFileIfEmpty deleteModifyConflicts