<?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/Patch/ConflictMarking.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) 2002-2003 David Roundy, 2010 Ganesh Sittampalam</span> <a name="line-2"></a><span class='hs-comment'>{-# LANGUAGE ViewPatterns #-}</span> <a name="line-3"></a><span class='hs-keyword'>module</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'>ConflictMarking</span> <a name="line-4"></a> <span class='hs-layout'>(</span> <span class='hs-varid'>mangleUnravelled</span> <a name="line-5"></a> <span class='hs-layout'>)</span> <span class='hs-keyword'>where</span> <a name="line-6"></a> <a name="line-7"></a><span class='hs-keyword'>import</span> <span class='hs-keyword'>qualified</span> <span class='hs-conid'>Data</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-varop'>.</span><span class='hs-conid'>Char8</span> <span class='hs-keyword'>as</span> <span class='hs-conid'>BC</span> <span class='hs-layout'>(</span><span class='hs-varid'>pack</span><span class='hs-layout'>,</span> <span class='hs-varid'>last</span><span class='hs-layout'>)</span> <a name="line-8"></a><span class='hs-keyword'>import</span> <span class='hs-keyword'>qualified</span> <span class='hs-conid'>Data</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span> <span class='hs-keyword'>as</span> <span class='hs-conid'>B</span> <span class='hs-layout'>(</span><span class='hs-varid'>null</span><span class='hs-layout'>,</span> <span class='hs-conid'>ByteString</span><span class='hs-layout'>)</span> <a name="line-9"></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'>sort</span><span class='hs-layout'>,</span> <span class='hs-varid'>intersperse</span> <span class='hs-layout'>)</span> <a name="line-10"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Data</span><span class='hs-varop'>.</span><span class='hs-conid'>Maybe</span> <span class='hs-layout'>(</span> <span class='hs-varid'>isJust</span> <span class='hs-layout'>)</span> <a name="line-11"></a> <a name="line-12"></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'>FileHunk</span> <span class='hs-layout'>(</span> <span class='hs-conid'>FileHunk</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'>IsHunk</span><span class='hs-layout'>,</span> <span class='hs-varid'>isHunk</span> <span class='hs-layout'>)</span> <a name="line-13"></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'>FileName</span> <span class='hs-layout'>(</span> <span class='hs-conid'>FileName</span><span class='hs-layout'>,</span> <span class='hs-varid'>fn2fp</span><span class='hs-layout'>,</span> <span class='hs-varid'>fp2fn</span> <span class='hs-layout'>)</span> <a name="line-14"></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'>Inspect</span> <span class='hs-layout'>(</span> <span class='hs-conid'>PatchInspect</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span> <a name="line-15"></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'>Invert</span> <span class='hs-layout'>(</span> <span class='hs-conid'>Invert</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span> <a name="line-16"></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'>Permutations</span> <span class='hs-conid'>()</span> <a name="line-17"></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'>Prim</span> <span class='hs-layout'>(</span> <span class='hs-conid'>PrimPatch</span><span class='hs-layout'>,</span> <span class='hs-varid'>is_filepatch</span><span class='hs-layout'>,</span> <span class='hs-varid'>primIsHunk</span><span class='hs-layout'>,</span> <span class='hs-varid'>primFromHunk</span> <span class='hs-layout'>)</span> <a name="line-18"></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> <a name="line-19"></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'>mapSeal</span> <span class='hs-layout'>)</span> <a name="line-20"></a> <a name="line-21"></a><span class='hs-cpp'>#include "gadts.h"</span> <a name="line-22"></a><span class='hs-cpp'>#include "impossible.h"</span> <a name="line-23"></a> <a name="line-24"></a><a name="applyHunks"></a><span class='hs-definition'>applyHunks</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>IsHunk</span> <span class='hs-varid'>prim</span> <span class='hs-keyglyph'>=></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</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'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span> <a name="line-25"></a><span class='hs-definition'>applyHunks</span> <span class='hs-varid'>ms</span> <span class='hs-layout'>(</span><span class='hs-layout'>(</span><span class='hs-varid'>isHunk</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Just</span> <span class='hs-layout'>(</span><span class='hs-conid'>FileHunk</span> <span class='hs-keyword'>_</span> <span class='hs-varid'>l</span> <span class='hs-varid'>o</span> <span class='hs-varid'>n</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-conop'>:>:</span><span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>applyHunks</span> <span class='hs-layout'>(</span><span class='hs-varid'>rls</span> <span class='hs-varid'>l</span> <span class='hs-varid'>ms</span><span class='hs-layout'>)</span> <span class='hs-varid'>ps</span> <a name="line-26"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>rls</span> <span class='hs-varid'>k</span> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'>|</span> <span class='hs-varid'>k</span> <span class='hs-varop'><=</span><span class='hs-num'>0</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>bug</span> <span class='hs-varop'>$</span> <span class='hs-str'>"bad hunk: start position <=0 ("</span> <span class='hs-varop'>++</span> <span class='hs-varid'>show</span> <span class='hs-varid'>k</span> <span class='hs-varop'>++</span> <span class='hs-str'>")"</span> <a name="line-27"></a> <span class='hs-varid'>rls</span> <span class='hs-num'>1</span> <span class='hs-varid'>mls</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>map</span> <span class='hs-conid'>Just</span> <span class='hs-varid'>n</span> <span class='hs-varop'>++</span> <span class='hs-varid'>drop</span> <span class='hs-layout'>(</span><span class='hs-varid'>length</span> <span class='hs-varid'>o</span><span class='hs-layout'>)</span> <span class='hs-varid'>mls</span> <a name="line-28"></a> <span class='hs-varid'>rls</span> <span class='hs-varid'>i</span> <span class='hs-layout'>(</span><span class='hs-varid'>ml</span><span class='hs-conop'>:</span><span class='hs-varid'>mls</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>ml</span> <span class='hs-conop'>:</span> <span class='hs-varid'>rls</span> <span class='hs-layout'>(</span><span class='hs-varid'>i</span><span class='hs-comment'>-</span><span class='hs-num'>1</span><span class='hs-layout'>)</span> <span class='hs-varid'>mls</span> <a name="line-29"></a> <span class='hs-varid'>rls</span> <span class='hs-keyword'>_</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>bug</span> <span class='hs-str'>"rls in applyHunks"</span> <a name="line-30"></a><span class='hs-definition'>applyHunks</span> <span class='hs-varid'>ms</span> <span class='hs-conid'>NilFL</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>ms</span> <a name="line-31"></a><span class='hs-definition'>applyHunks</span> <span class='hs-keyword'>_</span> <span class='hs-layout'>(</span><span class='hs-keyword'>_</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'>impossible</span> <a name="line-32"></a> <a name="line-33"></a><a name="getAFilename"></a><span class='hs-definition'>getAFilename</span> <span class='hs-keyglyph'>::</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'>FileName</span> <a name="line-34"></a><span class='hs-definition'>getAFilename</span> <span class='hs-layout'>(</span><span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-layout'>(</span><span class='hs-varid'>is_filepatch</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Just</span> <span class='hs-varid'>f</span><span class='hs-layout'>)</span><span class='hs-conop'>:>:</span><span class='hs-keyword'>_</span><span class='hs-layout'>)</span><span class='hs-layout'>)</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'>f</span> <a name="line-35"></a><span class='hs-definition'>getAFilename</span> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>fp2fn</span> <span class='hs-str'>""</span> <a name="line-36"></a> <a name="line-37"></a><a name="getOld"></a><span class='hs-definition'>getOld</span> <span class='hs-keyglyph'>::</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'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</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-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span> <a name="line-38"></a><span class='hs-definition'>getOld</span> <span class='hs-varid'>mls</span> <span class='hs-layout'>(</span><span class='hs-varid'>ps</span><span class='hs-conop'>:</span><span class='hs-varid'>pss</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>getOld</span> <span class='hs-layout'>(</span><span class='hs-varid'>getHunksOld</span> <span class='hs-varid'>mls</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-varid'>pss</span> <a name="line-39"></a><span class='hs-definition'>getOld</span> <span class='hs-varid'>mls</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>mls</span> <a name="line-40"></a> <a name="line-41"></a><a name="getHunksOld"></a><span class='hs-definition'>getHunksOld</span> <span class='hs-keyglyph'>::</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'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</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-42"></a> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span> <a name="line-43"></a><span class='hs-definition'>getHunksOld</span> <span class='hs-varid'>mls</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <a name="line-44"></a> <span class='hs-varid'>applyHunks</span> <span class='hs-layout'>(</span><span class='hs-varid'>applyHunks</span> <span class='hs-varid'>mls</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-layout'>(</span><span class='hs-varid'>invert</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <a name="line-45"></a> <a name="line-46"></a><a name="getHunksNew"></a><span class='hs-definition'>getHunksNew</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>IsHunk</span> <span class='hs-varid'>prim</span> <span class='hs-keyglyph'>=></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</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-47"></a> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span> <a name="line-48"></a><span class='hs-definition'>getHunksNew</span> <span class='hs-varid'>mls</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>applyHunks</span> <span class='hs-varid'>mls</span> <span class='hs-varid'>ps</span> <a name="line-49"></a> <a name="line-50"></a><a name="getHunkline"></a><span class='hs-definition'>getHunkline</span> <span class='hs-keyglyph'>::</span> <span class='hs-keyglyph'>[</span><span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Int</span> <a name="line-51"></a><span class='hs-definition'>getHunkline</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>ghl</span> <span class='hs-num'>1</span> <a name="line-52"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>ghl</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>Int</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Int</span> <a name="line-53"></a> <span class='hs-varid'>ghl</span> <span class='hs-varid'>n</span> <span class='hs-varid'>pps</span> <span class='hs-keyglyph'>=</span> <a name="line-54"></a> <span class='hs-keyword'>if</span> <span class='hs-varid'>any</span> <span class='hs-layout'>(</span><span class='hs-varid'>isJust</span> <span class='hs-varop'>.</span> <span class='hs-varid'>head</span><span class='hs-layout'>)</span> <span class='hs-varid'>pps</span> <a name="line-55"></a> <span class='hs-keyword'>then</span> <span class='hs-varid'>n</span> <a name="line-56"></a> <span class='hs-keyword'>else</span> <span class='hs-varid'>ghl</span> <span class='hs-layout'>(</span><span class='hs-varid'>n</span><span class='hs-varop'>+</span><span class='hs-num'>1</span><span class='hs-layout'>)</span> <span class='hs-varop'>$</span> <span class='hs-varid'>map</span> <span class='hs-varid'>tail</span> <span class='hs-varid'>pps</span> <a name="line-57"></a> <a name="line-58"></a><a name="makeChunk"></a><span class='hs-definition'>makeChunk</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>Int</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>Maybe</span> <span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-conid'>ByteString</span><span class='hs-keyglyph'>]</span> <a name="line-59"></a><span class='hs-definition'>makeChunk</span> <span class='hs-varid'>n</span> <span class='hs-varid'>mls</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>pull_chunk</span> <span class='hs-varop'>$</span> <span class='hs-varid'>drop</span> <span class='hs-layout'>(</span><span class='hs-varid'>n</span><span class='hs-comment'>-</span><span class='hs-num'>1</span><span class='hs-layout'>)</span> <span class='hs-varid'>mls</span> <a name="line-60"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>pull_chunk</span> <span class='hs-layout'>(</span><span class='hs-conid'>Just</span> <span class='hs-varid'>l</span><span class='hs-conop'>:</span><span class='hs-varid'>mls'</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>l</span> <span class='hs-conop'>:</span> <span class='hs-varid'>pull_chunk</span> <span class='hs-varid'>mls'</span> <a name="line-61"></a> <span class='hs-varid'>pull_chunk</span> <span class='hs-layout'>(</span><span class='hs-conid'>Nothing</span><span class='hs-conop'>:</span><span class='hs-keyword'>_</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>[]</span> <a name="line-62"></a> <span class='hs-varid'>pull_chunk</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>bug</span> <span class='hs-str'>"should this be [] in pull_chunk?"</span> <a name="line-63"></a> <a name="line-64"></a> <a name="line-65"></a><a name="mangleUnravelled"></a><span class='hs-definition'>mangleUnravelled</span> <span class='hs-keyglyph'>::</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-66"></a><span class='hs-definition'>mangleUnravelled</span> <span class='hs-varid'>pss</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyword'>if</span> <span class='hs-varid'>onlyHunks</span> <span class='hs-varid'>pss</span> <a name="line-67"></a> <span class='hs-keyword'>then</span> <span class='hs-layout'>(</span><span class='hs-conop'>:>:</span> <span class='hs-conid'>NilFL</span><span class='hs-layout'>)</span> <span class='hs-varop'>`mapSeal`</span> <span class='hs-varid'>mangleUnravelledHunks</span> <span class='hs-varid'>pss</span> <a name="line-68"></a> <span class='hs-keyword'>else</span> <span class='hs-varid'>head</span> <span class='hs-varid'>pss</span> <a name="line-69"></a> <a name="line-70"></a><a name="onlyHunks"></a><span class='hs-definition'>onlyHunks</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'>Bool</span> <a name="line-71"></a><span class='hs-definition'>onlyHunks</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>False</span> <a name="line-72"></a><span class='hs-definition'>onlyHunks</span> <span class='hs-varid'>pss</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>fn2fp</span> <span class='hs-varid'>f</span> <span class='hs-varop'>/=</span> <span class='hs-str'>""</span> <span class='hs-varop'>&&</span> <span class='hs-varid'>all</span> <span class='hs-varid'>oh</span> <span class='hs-varid'>pss</span> <a name="line-73"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>f</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>getAFilename</span> <span class='hs-varid'>pss</span> <a name="line-74"></a> <span class='hs-varid'>oh</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'>y</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Bool</span> <a name="line-75"></a> <span class='hs-varid'>oh</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</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-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>primIsHunk</span> <span class='hs-varid'>p</span> <span class='hs-varop'>&&</span> <a name="line-76"></a> <span class='hs-keyglyph'>[</span><span class='hs-varid'>fn2fp</span> <span class='hs-varid'>f</span><span class='hs-keyglyph'>]</span> <span class='hs-varop'>==</span> <span class='hs-varid'>listTouchedFiles</span> <span class='hs-varid'>p</span> <span class='hs-varop'>&&</span> <a name="line-77"></a> <span class='hs-varid'>oh</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <a name="line-78"></a> <span class='hs-varid'>oh</span> <span class='hs-layout'>(</span><span class='hs-conid'>Sealed</span> <span class='hs-conid'>NilFL</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>True</span> <a name="line-79"></a> <a name="line-80"></a><a name="mangleUnravelledHunks"></a><span class='hs-definition'>mangleUnravelledHunks</span> <span class='hs-keyglyph'>::</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-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-81"></a><span class='hs-comment'>--mangleUnravelledHunks [[h1],[h2]] = Deal with simple cases handily?</span> <a name="line-82"></a><span class='hs-definition'>mangleUnravelledHunks</span> <span class='hs-varid'>pss</span> <span class='hs-keyglyph'>=</span> <a name="line-83"></a> <span class='hs-keyword'>if</span> <span class='hs-varid'>null</span> <span class='hs-varid'>nchs</span> <span class='hs-keyword'>then</span> <span class='hs-varid'>bug</span> <span class='hs-str'>"mangleUnravelledHunks"</span> <a name="line-84"></a> <span class='hs-keyword'>else</span> <span class='hs-conid'>Sealed</span> <span class='hs-layout'>(</span><span class='hs-varid'>primFromHunk</span> <span class='hs-layout'>(</span><span class='hs-conid'>FileHunk</span> <span class='hs-varid'>filename</span> <span class='hs-varid'>l</span> <span class='hs-varid'>old</span> <span class='hs-varid'>new</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <a name="line-85"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>oldf</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>getOld</span> <span class='hs-layout'>(</span><span class='hs-varid'>repeat</span> <span class='hs-conid'>Nothing</span><span class='hs-layout'>)</span> <span class='hs-varid'>pss</span> <a name="line-86"></a> <span class='hs-varid'>newfs</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>map</span> <span class='hs-layout'>(</span><span class='hs-varid'>getHunksNew</span> <span class='hs-varid'>oldf</span><span class='hs-layout'>)</span> <span class='hs-varid'>pss</span> <a name="line-87"></a> <span class='hs-varid'>l</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>getHunkline</span> <span class='hs-varop'>$</span> <span class='hs-varid'>oldf</span> <span class='hs-conop'>:</span> <span class='hs-varid'>newfs</span> <a name="line-88"></a> <span class='hs-varid'>nchs</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>sort</span> <span class='hs-varop'>$</span> <span class='hs-varid'>map</span> <span class='hs-layout'>(</span><span class='hs-varid'>makeChunk</span> <span class='hs-varid'>l</span><span class='hs-layout'>)</span> <span class='hs-varid'>newfs</span> <a name="line-89"></a> <span class='hs-varid'>filename</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>getAFilename</span> <span class='hs-varid'>pss</span> <a name="line-90"></a> <span class='hs-varid'>old</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>makeChunk</span> <span class='hs-varid'>l</span> <span class='hs-varid'>oldf</span> <a name="line-91"></a> <span class='hs-varid'>new</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyglyph'>[</span><span class='hs-varid'>top</span><span class='hs-keyglyph'>]</span> <span class='hs-varop'>++</span> <span class='hs-varid'>old</span> <span class='hs-varop'>++</span> <span class='hs-keyglyph'>[</span><span class='hs-varid'>initial</span><span class='hs-keyglyph'>]</span> <span class='hs-varop'>++</span> <span class='hs-varid'>concat</span> <span class='hs-layout'>(</span><span class='hs-varid'>intersperse</span> <span class='hs-keyglyph'>[</span><span class='hs-varid'>middle</span><span class='hs-keyglyph'>]</span> <span class='hs-varid'>nchs</span><span class='hs-layout'>)</span> <span class='hs-varop'>++</span> <span class='hs-keyglyph'>[</span><span class='hs-varid'>bottom</span><span class='hs-keyglyph'>]</span> <a name="line-92"></a> <span class='hs-varid'>top</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>BC</span><span class='hs-varop'>.</span><span class='hs-varid'>pack</span> <span class='hs-varop'>$</span> <span class='hs-str'>"v v v v v v v"</span> <span class='hs-varop'>++</span> <span class='hs-varid'>eol_c</span> <a name="line-93"></a> <span class='hs-varid'>initial</span><span class='hs-keyglyph'>=</span> <span class='hs-conid'>BC</span><span class='hs-varop'>.</span><span class='hs-varid'>pack</span> <span class='hs-varop'>$</span> <span class='hs-str'>"============="</span> <span class='hs-varop'>++</span> <span class='hs-varid'>eol_c</span> <a name="line-94"></a> <span class='hs-varid'>middle</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>BC</span><span class='hs-varop'>.</span><span class='hs-varid'>pack</span> <span class='hs-varop'>$</span> <span class='hs-str'>"*************"</span> <span class='hs-varop'>++</span> <span class='hs-varid'>eol_c</span> <a name="line-95"></a> <span class='hs-varid'>bottom</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>BC</span><span class='hs-varop'>.</span><span class='hs-varid'>pack</span> <span class='hs-varop'>$</span> <span class='hs-str'>"^ ^ ^ ^ ^ ^ ^"</span> <span class='hs-varop'>++</span> <span class='hs-varid'>eol_c</span> <a name="line-96"></a> <span class='hs-varid'>eol_c</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyword'>if</span> <span class='hs-varid'>any</span> <span class='hs-layout'>(</span><span class='hs-keyglyph'>\</span><span class='hs-varid'>ps</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>not</span> <span class='hs-layout'>(</span><span class='hs-conid'>B</span><span class='hs-varop'>.</span><span class='hs-varid'>null</span> <span class='hs-varid'>ps</span><span class='hs-layout'>)</span> <span class='hs-varop'>&&</span> <span class='hs-conid'>BC</span><span class='hs-varop'>.</span><span class='hs-varid'>last</span> <span class='hs-varid'>ps</span> <span class='hs-varop'>==</span> <span class='hs-chr'>'\r'</span><span class='hs-layout'>)</span> <span class='hs-varid'>old</span> <a name="line-97"></a> <span class='hs-keyword'>then</span> <span class='hs-str'>"\r"</span> <a name="line-98"></a> <span class='hs-keyword'>else</span> <span class='hs-str'>""</span> <a name="line-99"></a> </pre></body> </html>