<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<!-- Generated by HsColour, http://code.haskell.org/~malcolm/hscolour/ -->
<title>src/Darcs/Resolution.hs</title>
<link type='text/css' rel='stylesheet' href='hscolour.css' />
</head>
<body>
<pre><a name="line-1"></a><span class='hs-comment'>-- Copyright (C) 2003,2005 David Roundy</span>
<a name="line-2"></a><span class='hs-comment'>--</span>
<a name="line-3"></a><span class='hs-comment'>-- This program is free software; you can redistribute it and/or modify</span>
<a name="line-4"></a><span class='hs-comment'>-- it under the terms of the GNU General Public License as published by</span>
<a name="line-5"></a><span class='hs-comment'>-- the Free Software Foundation; either version 2, or (at your option)</span>
<a name="line-6"></a><span class='hs-comment'>-- any later version.</span>
<a name="line-7"></a><span class='hs-comment'>--</span>
<a name="line-8"></a><span class='hs-comment'>-- This program is distributed in the hope that it will be useful,</span>
<a name="line-9"></a><span class='hs-comment'>-- but WITHOUT ANY WARRANTY; without even the implied warranty of</span>
<a name="line-10"></a><span class='hs-comment'>-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span>
<a name="line-11"></a><span class='hs-comment'>-- GNU General Public License for more details.</span>
<a name="line-12"></a><span class='hs-comment'>--</span>
<a name="line-13"></a><span class='hs-comment'>-- You should have received a copy of the GNU General Public License</span>
<a name="line-14"></a><span class='hs-comment'>-- along with this program; see the file COPYING. If not, write to</span>
<a name="line-15"></a><span class='hs-comment'>-- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,</span>
<a name="line-16"></a><span class='hs-comment'>-- Boston, MA 02110-1301, USA.</span>
<a name="line-17"></a>
<a name="line-18"></a><span class='hs-comment'>{-# LANGUAGE CPP #-}</span>
<a name="line-19"></a>
<a name="line-20"></a><span class='hs-cpp'>#include "gadts.h"</span>
<a name="line-21"></a>
<a name="line-22"></a><span class='hs-keyword'>module</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Resolution</span> <span class='hs-layout'>(</span> <span class='hs-varid'>standardResolution</span><span class='hs-layout'>,</span>
<a name="line-23"></a> <span class='hs-varid'>externalResolution</span><span class='hs-layout'>,</span>
<a name="line-24"></a> <span class='hs-varid'>patchsetConflictResolutions</span><span class='hs-layout'>,</span>
<a name="line-25"></a> <span class='hs-layout'>)</span> <span class='hs-keyword'>where</span>
<a name="line-26"></a>
<a name="line-27"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>System</span><span class='hs-varop'>.</span><span class='hs-conid'>FilePath</span><span class='hs-varop'>.</span><span class='hs-conid'>Posix</span> <span class='hs-layout'>(</span> <span class='hs-layout'>(</span><span class='hs-varop'></></span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span>
<a name="line-28"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>System</span><span class='hs-varop'>.</span><span class='hs-conid'>Exit</span> <span class='hs-layout'>(</span> <span class='hs-conid'>ExitCode</span><span class='hs-layout'>(</span> <span class='hs-conid'>ExitSuccess</span> <span class='hs-layout'>)</span> <span class='hs-layout'>)</span>
<a name="line-29"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>System</span><span class='hs-varop'>.</span><span class='hs-conid'>Directory</span> <span class='hs-layout'>(</span> <span class='hs-varid'>setCurrentDirectory</span><span class='hs-layout'>,</span> <span class='hs-varid'>getCurrentDirectory</span> <span class='hs-layout'>)</span>
<a name="line-30"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Data</span><span class='hs-varop'>.</span><span class='hs-conid'>List</span> <span class='hs-layout'>(</span> <span class='hs-varid'>zip4</span> <span class='hs-layout'>)</span>
<a name="line-31"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Control</span><span class='hs-varop'>.</span><span class='hs-conid'>Monad</span> <span class='hs-layout'>(</span> <span class='hs-varid'>when</span> <span class='hs-layout'>)</span>
<a name="line-32"></a>
<a name="line-33"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Diff</span><span class='hs-layout'>(</span> <span class='hs-varid'>treeDiff</span> <span class='hs-layout'>)</span>
<a name="line-34"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Patch</span> <span class='hs-layout'>(</span> <span class='hs-conid'>PrimOf</span><span class='hs-layout'>,</span> <span class='hs-conid'>PrimPatch</span><span class='hs-layout'>,</span> <span class='hs-conid'>RepoPatch</span><span class='hs-layout'>,</span> <span class='hs-varid'>joinPatches</span><span class='hs-layout'>,</span> <span class='hs-varid'>resolveConflicts</span><span class='hs-layout'>,</span>
<a name="line-35"></a> <span class='hs-varid'>effectOnFilePaths</span><span class='hs-layout'>,</span> <span class='hs-varid'>patchcontents</span><span class='hs-layout'>,</span>
<a name="line-36"></a> <span class='hs-varid'>invert</span><span class='hs-layout'>,</span> <span class='hs-varid'>listConflictedFiles</span><span class='hs-layout'>,</span> <span class='hs-varid'>commute</span><span class='hs-layout'>,</span> <span class='hs-varid'>applyToTree</span><span class='hs-layout'>,</span> <span class='hs-varid'>fromPrim</span> <span class='hs-layout'>)</span>
<a name="line-37"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Patch</span><span class='hs-varop'>.</span><span class='hs-conid'>Apply</span><span class='hs-layout'>(</span> <span class='hs-conid'>ApplyState</span> <span class='hs-layout'>)</span>
<a name="line-38"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>RepoPath</span> <span class='hs-layout'>(</span> <span class='hs-varid'>toFilePath</span> <span class='hs-layout'>)</span>
<a name="line-39"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Witnesses</span><span class='hs-varop'>.</span><span class='hs-conid'>Ordered</span> <span class='hs-layout'>(</span> <span class='hs-conid'>FL</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-conid'>RL</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-layout'>(</span><span class='hs-conop'>:></span><span class='hs-layout'>)</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-layout'>(</span><span class='hs-varop'>+>+</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span>
<a name="line-40"></a> <span class='hs-varid'>mapFL_FL</span><span class='hs-layout'>,</span> <span class='hs-varid'>reverseRL</span> <span class='hs-layout'>)</span>
<a name="line-41"></a>
<a name="line-42"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>CommandLine</span> <span class='hs-layout'>(</span> <span class='hs-varid'>parseCmd</span> <span class='hs-layout'>)</span>
<a name="line-43"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Patch</span><span class='hs-varop'>.</span><span class='hs-conid'>PatchInfoAnd</span> <span class='hs-layout'>(</span> <span class='hs-varid'>hopefully</span> <span class='hs-layout'>)</span>
<a name="line-44"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Utils</span> <span class='hs-layout'>(</span> <span class='hs-varid'>askEnter</span><span class='hs-layout'>,</span> <span class='hs-varid'>filterFilePaths</span> <span class='hs-layout'>)</span>
<a name="line-45"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Patch</span><span class='hs-varop'>.</span><span class='hs-conid'>Set</span> <span class='hs-layout'>(</span> <span class='hs-conid'>PatchSet</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span>
<a name="line-46"></a><span class='hs-cpp'>#ifdef GADT_WITNESSES</span>
<a name="line-47"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Patch</span><span class='hs-varop'>.</span><span class='hs-conid'>Set</span> <span class='hs-layout'>(</span> <span class='hs-conid'>Origin</span> <span class='hs-layout'>)</span>
<a name="line-48"></a><span class='hs-cpp'>#endif</span>
<a name="line-49"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Witnesses</span><span class='hs-varop'>.</span><span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span> <span class='hs-conid'>Sealed</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-varid'>unFreeLeft</span> <span class='hs-layout'>)</span>
<a name="line-50"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Repository</span><span class='hs-varop'>.</span><span class='hs-conid'>Prefs</span> <span class='hs-layout'>(</span> <span class='hs-varid'>filetypeFunction</span> <span class='hs-layout'>)</span>
<a name="line-51"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Exec</span> <span class='hs-layout'>(</span> <span class='hs-varid'>exec</span><span class='hs-layout'>,</span> <span class='hs-conid'>Redirect</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span>
<a name="line-52"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Lock</span> <span class='hs-layout'>(</span> <span class='hs-varid'>withTempDir</span> <span class='hs-layout'>)</span>
<a name="line-53"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>External</span> <span class='hs-layout'>(</span> <span class='hs-varid'>cloneTree</span> <span class='hs-layout'>)</span>
<a name="line-54"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Flags</span> <span class='hs-layout'>(</span> <span class='hs-conid'>DarcsFlag</span><span class='hs-layout'>,</span> <span class='hs-varid'>wantGuiPause</span> <span class='hs-layout'>)</span>
<a name="line-55"></a>
<a name="line-56"></a><span class='hs-keyword'>import</span> <span class='hs-keyword'>qualified</span> <span class='hs-conid'>Storage</span><span class='hs-varop'>.</span><span class='hs-conid'>Hashed</span><span class='hs-varop'>.</span><span class='hs-conid'>Tree</span> <span class='hs-keyword'>as</span> <span class='hs-conid'>Tree</span>
<a name="line-57"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Storage</span><span class='hs-varop'>.</span><span class='hs-conid'>Hashed</span> <span class='hs-layout'>(</span> <span class='hs-varid'>writePlainTree</span><span class='hs-layout'>,</span> <span class='hs-varid'>readPlainTree</span> <span class='hs-layout'>)</span>
<a name="line-58"></a>
<a name="line-59"></a><span class='hs-comment'>--import Darcs.ColorPrinter ( traceDoc )</span>
<a name="line-60"></a><span class='hs-comment'>--import Printer ( greenText, ($$), Doc )</span>
<a name="line-61"></a><span class='hs-comment'>--import Darcs.Patch ( showPatch )</span>
<a name="line-62"></a>
<a name="line-63"></a><a name="standardResolution"></a><span class='hs-definition'>standardResolution</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>RepoPatch</span> <span class='hs-varid'>p</span> <span class='hs-keyglyph'>=></span> <span class='hs-conid'>FL</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>y</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PrimOf</span> <span class='hs-varid'>p</span><span class='hs-layout'>)</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>y</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span>
<a name="line-64"></a><span class='hs-definition'>standardResolution</span> <span class='hs-varid'>p</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>mergeList</span> <span class='hs-varop'>$</span> <span class='hs-varid'>map</span> <span class='hs-varid'>head</span> <span class='hs-varop'>$</span> <span class='hs-varid'>resolveConflicts</span> <span class='hs-varid'>p</span>
<a name="line-65"></a>
<a name="line-66"></a><a name="mergeList"></a><span class='hs-definition'>mergeList</span> <span class='hs-keyglyph'>::</span> <span class='hs-keyword'>forall</span> <span class='hs-varid'>prim</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span><span class='hs-layout'>)</span> <span class='hs-varop'>.</span> <span class='hs-conid'>PrimPatch</span> <span class='hs-varid'>prim</span> <span class='hs-keyglyph'>=></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-varid'>prim</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-varid'>prim</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span>
<a name="line-67"></a><span class='hs-definition'>mergeList</span> <span class='hs-varid'>patches</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>doml</span> <span class='hs-conid'>NilFL</span> <span class='hs-varid'>patches</span>
<a name="line-68"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>doml</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>FL</span> <span class='hs-varid'>prim</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>y</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-varid'>prim</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-varid'>prim</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span>
<a name="line-69"></a> <span class='hs-varid'>doml</span> <span class='hs-varid'>mp</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-varid'>p</span><span class='hs-conop'>:</span><span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span>
<a name="line-70"></a> <span class='hs-keyword'>case</span> <span class='hs-varid'>commute</span> <span class='hs-layout'>(</span><span class='hs-varid'>invert</span> <span class='hs-varid'>p</span> <span class='hs-conop'>:></span> <span class='hs-varid'>mp</span><span class='hs-layout'>)</span> <span class='hs-keyword'>of</span>
<a name="line-71"></a> <span class='hs-conid'>Just</span> <span class='hs-layout'>(</span><span class='hs-varid'>mp'</span> <span class='hs-conop'>:></span> <span class='hs-keyword'>_</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>doml</span> <span class='hs-layout'>(</span><span class='hs-varid'>p</span> <span class='hs-varop'>+>+</span> <span class='hs-varid'>mp'</span><span class='hs-layout'>)</span> <span class='hs-varid'>ps</span>
<a name="line-72"></a> <span class='hs-conid'>Nothing</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>doml</span> <span class='hs-varid'>mp</span> <span class='hs-varid'>ps</span> <span class='hs-comment'>-- This shouldn't happen for "good" resolutions.</span>
<a name="line-73"></a> <span class='hs-varid'>doml</span> <span class='hs-varid'>mp</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>Sealed</span> <span class='hs-varid'>mp</span>
<a name="line-74"></a>
<a name="line-75"></a><a name="externalResolution"></a><span class='hs-definition'>externalResolution</span> <span class='hs-keyglyph'>::</span> <span class='hs-keyword'>forall</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>y</span> <span class='hs-varid'>z</span> <span class='hs-varid'>a</span><span class='hs-layout'>)</span><span class='hs-varop'>.</span> <span class='hs-layout'>(</span><span class='hs-conid'>RepoPatch</span> <span class='hs-varid'>p</span><span class='hs-layout'>,</span> <span class='hs-conid'>ApplyState</span> <span class='hs-varid'>p</span> <span class='hs-keyglyph'>~</span> <span class='hs-conid'>Tree</span><span class='hs-varop'>.</span><span class='hs-conid'>Tree</span><span class='hs-layout'>)</span>
<a name="line-76"></a> <span class='hs-keyglyph'>=></span> <span class='hs-conid'>Tree</span><span class='hs-varop'>.</span><span class='hs-conid'>Tree</span> <span class='hs-conid'>IO</span>
<a name="line-77"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>String</span> <span class='hs-comment'>-- ^ external merge tool command</span>
<a name="line-78"></a> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>DarcsFlag</span><span class='hs-keyglyph'>]</span> <span class='hs-comment'>-- ^ command line arguments</span>
<a name="line-79"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PrimOf</span> <span class='hs-varid'>p</span><span class='hs-layout'>)</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>y</span><span class='hs-layout'>)</span>
<a name="line-80"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PrimOf</span> <span class='hs-varid'>p</span><span class='hs-layout'>)</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>z</span><span class='hs-layout'>)</span>
<a name="line-81"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>y</span> <span class='hs-varid'>a</span><span class='hs-layout'>)</span>
<a name="line-82"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>IO</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PrimOf</span> <span class='hs-varid'>p</span><span class='hs-layout'>)</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>a</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span>
<a name="line-83"></a><span class='hs-definition'>externalResolution</span> <span class='hs-varid'>s1</span> <span class='hs-varid'>c</span> <span class='hs-varid'>opts</span> <span class='hs-varid'>p1_prim</span> <span class='hs-varid'>p2_prim</span> <span class='hs-varid'>pmerged</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyword'>do</span>
<a name="line-84"></a> <span class='hs-comment'>-- TODO: remove the following two once we can rely on GHC 7.2 / superclass equality</span>
<a name="line-85"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>p1</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>FL</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>y</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>mapFL_FL</span> <span class='hs-varid'>fromPrim</span> <span class='hs-varid'>p1_prim</span>
<a name="line-86"></a> <span class='hs-varid'>p2</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>FL</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span> <span class='hs-varid'>z</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>mapFL_FL</span> <span class='hs-varid'>fromPrim</span> <span class='hs-varid'>p2_prim</span>
<a name="line-87"></a> <span class='hs-varid'>sa</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>applyToTree</span> <span class='hs-layout'>(</span><span class='hs-varid'>invert</span> <span class='hs-varid'>p1</span><span class='hs-layout'>)</span> <span class='hs-varid'>s1</span>
<a name="line-88"></a> <span class='hs-varid'>sm</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>applyToTree</span> <span class='hs-varid'>pmerged</span> <span class='hs-varid'>s1</span>
<a name="line-89"></a> <span class='hs-varid'>s2</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>applyToTree</span> <span class='hs-varid'>p2</span> <span class='hs-varid'>sa</span>
<a name="line-90"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>effectOnFPs</span> <span class='hs-varid'>ps</span> <span class='hs-varid'>fps</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>effectOnFilePaths</span> <span class='hs-varid'>ps</span> <span class='hs-varid'>fps</span>
<a name="line-91"></a> <span class='hs-varid'>nms</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>listConflictedFiles</span> <span class='hs-varid'>pmerged</span>
<a name="line-92"></a> <span class='hs-varid'>nas</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>effectOnFPs</span> <span class='hs-layout'>(</span><span class='hs-varid'>invert</span> <span class='hs-varid'>pmerged</span><span class='hs-layout'>)</span> <span class='hs-varid'>nms</span>
<a name="line-93"></a> <span class='hs-varid'>n1s</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>effectOnFPs</span> <span class='hs-varid'>p1</span> <span class='hs-varid'>nas</span>
<a name="line-94"></a> <span class='hs-varid'>n2s</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>effectOnFPs</span> <span class='hs-varid'>p2</span> <span class='hs-varid'>nas</span>
<a name="line-95"></a> <span class='hs-varid'>ns</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>zip4</span> <span class='hs-varid'>nas</span> <span class='hs-varid'>n1s</span> <span class='hs-varid'>n2s</span> <span class='hs-varid'>nms</span>
<a name="line-96"></a> <span class='hs-varid'>write_files</span> <span class='hs-varid'>tree</span> <span class='hs-varid'>fs</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>writePlainTree</span> <span class='hs-layout'>(</span><span class='hs-conid'>Tree</span><span class='hs-varop'>.</span><span class='hs-varid'>filter</span> <span class='hs-layout'>(</span><span class='hs-varid'>filterFilePaths</span> <span class='hs-varid'>fs</span><span class='hs-layout'>)</span> <span class='hs-varid'>tree</span><span class='hs-layout'>)</span> <span class='hs-str'>"."</span>
<a name="line-97"></a> <span class='hs-keyword'>in</span> <span class='hs-keyword'>do</span>
<a name="line-98"></a> <span class='hs-varid'>former_dir</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>getCurrentDirectory</span>
<a name="line-99"></a> <span class='hs-varid'>withTempDir</span> <span class='hs-str'>"version1"</span> <span class='hs-varop'>$</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>absd1</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span>
<a name="line-100"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>d1</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>toFilePath</span> <span class='hs-varid'>absd1</span>
<a name="line-101"></a> <span class='hs-varid'>write_files</span> <span class='hs-varid'>s1</span> <span class='hs-varid'>n1s</span>
<a name="line-102"></a> <span class='hs-varid'>setCurrentDirectory</span> <span class='hs-varid'>former_dir</span>
<a name="line-103"></a> <span class='hs-varid'>withTempDir</span> <span class='hs-str'>"ancestor"</span> <span class='hs-varop'>$</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>absda</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span>
<a name="line-104"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>da</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>toFilePath</span> <span class='hs-varid'>absda</span>
<a name="line-105"></a> <span class='hs-varid'>write_files</span> <span class='hs-varid'>sa</span> <span class='hs-varid'>nas</span>
<a name="line-106"></a> <span class='hs-varid'>setCurrentDirectory</span> <span class='hs-varid'>former_dir</span>
<a name="line-107"></a> <span class='hs-varid'>withTempDir</span> <span class='hs-str'>"merged"</span> <span class='hs-varop'>$</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>absdm</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span>
<a name="line-108"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>dm</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>toFilePath</span> <span class='hs-varid'>absdm</span>
<a name="line-109"></a> <span class='hs-varid'>write_files</span> <span class='hs-varid'>sm</span> <span class='hs-varid'>nms</span>
<a name="line-110"></a> <span class='hs-varid'>setCurrentDirectory</span> <span class='hs-varid'>former_dir</span>
<a name="line-111"></a> <span class='hs-varid'>withTempDir</span> <span class='hs-str'>"cleanmerged"</span> <span class='hs-varop'>$</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>absdc</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span>
<a name="line-112"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>dc</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>toFilePath</span> <span class='hs-varid'>absdc</span>
<a name="line-113"></a> <span class='hs-varid'>cloneTree</span> <span class='hs-varid'>dm</span> <span class='hs-str'>"."</span>
<a name="line-114"></a> <span class='hs-varid'>setCurrentDirectory</span> <span class='hs-varid'>former_dir</span>
<a name="line-115"></a> <span class='hs-varid'>withTempDir</span> <span class='hs-str'>"version2"</span> <span class='hs-varop'>$</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>absd2</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span>
<a name="line-116"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>d2</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>toFilePath</span> <span class='hs-varid'>absd2</span>
<a name="line-117"></a> <span class='hs-varid'>write_files</span> <span class='hs-varid'>s2</span> <span class='hs-varid'>n2s</span>
<a name="line-118"></a> <span class='hs-varid'>mapM_</span> <span class='hs-layout'>(</span><span class='hs-varid'>externallyResolveFile</span> <span class='hs-varid'>c</span> <span class='hs-varid'>opts</span> <span class='hs-varid'>da</span> <span class='hs-varid'>d1</span> <span class='hs-varid'>d2</span> <span class='hs-varid'>dm</span><span class='hs-layout'>)</span> <span class='hs-varid'>ns</span>
<a name="line-119"></a> <span class='hs-varid'>sc</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>readPlainTree</span> <span class='hs-varid'>dc</span>
<a name="line-120"></a> <span class='hs-varid'>sfixed</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>readPlainTree</span> <span class='hs-varid'>dm</span>
<a name="line-121"></a> <span class='hs-varid'>ftf</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>filetypeFunction</span>
<a name="line-122"></a> <span class='hs-varid'>unFreeLeft</span> <span class='hs-varop'>`fmap`</span> <span class='hs-varid'>treeDiff</span> <span class='hs-varid'>ftf</span> <span class='hs-varid'>sc</span> <span class='hs-varid'>sfixed</span>
<a name="line-123"></a>
<a name="line-124"></a><a name="externallyResolveFile"></a><span class='hs-definition'>externallyResolveFile</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>String</span> <span class='hs-comment'>-- ^ external merge tool command</span>
<a name="line-125"></a> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>DarcsFlag</span><span class='hs-keyglyph'>]</span> <span class='hs-comment'>-- ^ command line arguments</span>
<a name="line-126"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>String</span> <span class='hs-comment'>-- ^ path to merge base</span>
<a name="line-127"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>String</span> <span class='hs-comment'>-- ^ path to side 1 of the merge</span>
<a name="line-128"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>String</span> <span class='hs-comment'>-- ^ path to side 2 of the merge</span>
<a name="line-129"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>String</span> <span class='hs-comment'>-- ^ path where resolved content should go</span>
<a name="line-130"></a> <span class='hs-keyglyph'>-></span> <span class='hs-layout'>(</span><span class='hs-conid'>FilePath</span><span class='hs-layout'>,</span> <span class='hs-conid'>FilePath</span><span class='hs-layout'>,</span> <span class='hs-conid'>FilePath</span><span class='hs-layout'>,</span> <span class='hs-conid'>FilePath</span><span class='hs-layout'>)</span>
<a name="line-131"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>IO</span> <span class='hs-conid'>()</span>
<a name="line-132"></a><span class='hs-definition'>externallyResolveFile</span> <span class='hs-varid'>c</span> <span class='hs-varid'>opts</span> <span class='hs-varid'>da</span> <span class='hs-varid'>d1</span> <span class='hs-varid'>d2</span> <span class='hs-varid'>dm</span> <span class='hs-layout'>(</span><span class='hs-varid'>fa</span><span class='hs-layout'>,</span> <span class='hs-varid'>f1</span><span class='hs-layout'>,</span> <span class='hs-varid'>f2</span><span class='hs-layout'>,</span> <span class='hs-varid'>fm</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyword'>do</span>
<a name="line-133"></a> <span class='hs-varid'>putStrLn</span> <span class='hs-varop'>$</span> <span class='hs-str'>"Merging file "</span><span class='hs-varop'>++</span><span class='hs-varid'>fm</span><span class='hs-varop'>++</span><span class='hs-str'>" by hand."</span>
<a name="line-134"></a> <span class='hs-varid'>ec</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>run</span> <span class='hs-varid'>c</span> <span class='hs-keyglyph'>[</span><span class='hs-layout'>(</span><span class='hs-chr'>'1'</span><span class='hs-layout'>,</span> <span class='hs-varid'>d1</span><span class='hs-varop'></></span><span class='hs-varid'>f1</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-layout'>(</span><span class='hs-chr'>'2'</span><span class='hs-layout'>,</span> <span class='hs-varid'>d2</span><span class='hs-varop'></></span><span class='hs-varid'>f2</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-layout'>(</span><span class='hs-chr'>'a'</span><span class='hs-layout'>,</span> <span class='hs-varid'>da</span><span class='hs-varop'></></span><span class='hs-varid'>fa</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-layout'>(</span><span class='hs-chr'>'o'</span><span class='hs-layout'>,</span> <span class='hs-varid'>dm</span><span class='hs-varop'></></span><span class='hs-varid'>fm</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-layout'>(</span><span class='hs-chr'>'%'</span><span class='hs-layout'>,</span> <span class='hs-str'>"%"</span><span class='hs-layout'>)</span><span class='hs-keyglyph'>]</span>
<a name="line-135"></a> <span class='hs-varid'>when</span> <span class='hs-layout'>(</span><span class='hs-varid'>ec</span> <span class='hs-varop'>/=</span> <span class='hs-conid'>ExitSuccess</span><span class='hs-layout'>)</span> <span class='hs-varop'>$</span>
<a name="line-136"></a> <span class='hs-varid'>putStrLn</span> <span class='hs-varop'>$</span> <span class='hs-str'>"External merge command exited with "</span> <span class='hs-varop'>++</span> <span class='hs-varid'>show</span> <span class='hs-varid'>ec</span>
<a name="line-137"></a> <span class='hs-varid'>when</span> <span class='hs-layout'>(</span><span class='hs-varid'>wantGuiPause</span> <span class='hs-varid'>opts</span><span class='hs-layout'>)</span> <span class='hs-varop'>$</span>
<a name="line-138"></a> <span class='hs-varid'>askEnter</span> <span class='hs-str'>"Hit return to move on, ^C to abort the whole operation..."</span>
<a name="line-139"></a>
<a name="line-140"></a><a name="run"></a><span class='hs-definition'>run</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>String</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-layout'>(</span><span class='hs-conid'>Char</span><span class='hs-layout'>,</span><span class='hs-conid'>String</span><span class='hs-layout'>)</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>IO</span> <span class='hs-conid'>ExitCode</span>
<a name="line-141"></a><span class='hs-definition'>run</span> <span class='hs-varid'>c</span> <span class='hs-varid'>replacements</span> <span class='hs-keyglyph'>=</span>
<a name="line-142"></a> <span class='hs-keyword'>case</span> <span class='hs-varid'>parseCmd</span> <span class='hs-varid'>replacements</span> <span class='hs-varid'>c</span> <span class='hs-keyword'>of</span>
<a name="line-143"></a> <span class='hs-conid'>Left</span> <span class='hs-varid'>err</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>fail</span> <span class='hs-varop'>$</span> <span class='hs-varid'>show</span> <span class='hs-varid'>err</span>
<a name="line-144"></a> <span class='hs-conid'>Right</span> <span class='hs-layout'>(</span><span class='hs-varid'>c2</span><span class='hs-layout'>,</span><span class='hs-keyword'>_</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>rr</span> <span class='hs-varid'>c2</span>
<a name="line-145"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>rr</span> <span class='hs-layout'>(</span><span class='hs-varid'>command</span><span class='hs-conop'>:</span><span class='hs-varid'>args</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyword'>do</span> <span class='hs-varid'>putStrLn</span> <span class='hs-varop'>$</span> <span class='hs-str'>"Running command '"</span> <span class='hs-varop'>++</span>
<a name="line-146"></a> <span class='hs-varid'>unwords</span> <span class='hs-layout'>(</span><span class='hs-varid'>command</span><span class='hs-conop'>:</span><span class='hs-varid'>args</span><span class='hs-layout'>)</span> <span class='hs-varop'>++</span> <span class='hs-str'>"'"</span>
<a name="line-147"></a> <span class='hs-varid'>exec</span> <span class='hs-varid'>command</span> <span class='hs-varid'>args</span> <span class='hs-layout'>(</span><span class='hs-conid'>Null</span><span class='hs-layout'>,</span><span class='hs-conid'>Null</span><span class='hs-layout'>,</span><span class='hs-conid'>Null</span><span class='hs-layout'>)</span>
<a name="line-148"></a> <span class='hs-varid'>rr</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>return</span> <span class='hs-conid'>ExitSuccess</span>
<a name="line-149"></a>
<a name="line-150"></a><a name="patchsetConflictResolutions"></a><span class='hs-definition'>patchsetConflictResolutions</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>RepoPatch</span> <span class='hs-varid'>p</span> <span class='hs-keyglyph'>=></span> <span class='hs-conid'>PatchSet</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-conid'>Origin</span> <span class='hs-varid'>x</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PrimOf</span> <span class='hs-varid'>p</span><span class='hs-layout'>)</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>x</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span>
<a name="line-151"></a><span class='hs-definition'>patchsetConflictResolutions</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchSet</span> <span class='hs-conid'>NilRL</span> <span class='hs-keyword'>_</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>Sealed</span> <span class='hs-conid'>NilFL</span>
<a name="line-152"></a><span class='hs-definition'>patchsetConflictResolutions</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchSet</span> <span class='hs-varid'>xs</span> <span class='hs-keyword'>_</span><span class='hs-layout'>)</span>
<a name="line-153"></a> <span class='hs-keyglyph'>=</span> <span class='hs-comment'>--traceDoc (greenText "looking at resolutions" $$</span>
<a name="line-154"></a> <span class='hs-comment'>-- (sh $ resolveConflicts $ joinPatches $</span>
<a name="line-155"></a> <span class='hs-comment'>-- mapFL_FL (patchcontents . hopefully) $ reverseRL xs )) $</span>
<a name="line-156"></a> <span class='hs-varid'>mergeList</span> <span class='hs-varop'>$</span> <span class='hs-varid'>map</span> <span class='hs-varid'>head</span> <span class='hs-varop'>$</span> <span class='hs-varid'>resolveConflicts</span> <span class='hs-varop'>$</span> <span class='hs-varid'>joinPatches</span> <span class='hs-varop'>$</span>
<a name="line-157"></a> <span class='hs-varid'>mapFL_FL</span> <span class='hs-layout'>(</span><span class='hs-varid'>patchcontents</span> <span class='hs-varop'>.</span> <span class='hs-varid'>hopefully</span><span class='hs-layout'>)</span> <span class='hs-varop'>$</span> <span class='hs-varid'>reverseRL</span> <span class='hs-varid'>xs</span>
<a name="line-158"></a> <span class='hs-comment'>--where sh :: [[Sealed (FL Prim)]] -> Doc</span>
<a name="line-159"></a> <span class='hs-comment'>-- sh [] = greenText "no more conflicts"</span>
<a name="line-160"></a> <span class='hs-comment'>-- sh (x:ps) = greenText "one conflict" $$ sh1 x $$ sh ps</span>
<a name="line-161"></a> <span class='hs-comment'>-- sh1 :: [Sealed (FL Prim)] -> Doc</span>
<a name="line-162"></a> <span class='hs-comment'>-- sh1 [] = greenText "end of unravellings"</span>
<a name="line-163"></a> <span class='hs-comment'>-- sh1 (Sealed x:ps) = greenText "one unravelling:" $$ showPatch x $$</span>
<a name="line-164"></a> <span class='hs-comment'>-- sh1 ps</span>
</pre></body>
</html>
