<?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/Repository/Merge.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-2004,2007-2008 David Roundy</span> <a name="line-2"></a><span class='hs-comment'>-- Copyright (C) 2005 Juliusz Chroboczek</span> <a name="line-3"></a><span class='hs-comment'>-- Copyright (C) 2009 Petr Rockai</span> <a name="line-4"></a><span class='hs-comment'>--</span> <a name="line-5"></a><span class='hs-comment'>-- This program is free software; you can redistribute it and/or modify</span> <a name="line-6"></a><span class='hs-comment'>-- it under the terms of the GNU General Public License as published by</span> <a name="line-7"></a><span class='hs-comment'>-- the Free Software Foundation; either version 2, or (at your option)</span> <a name="line-8"></a><span class='hs-comment'>-- any later version.</span> <a name="line-9"></a><span class='hs-comment'>--</span> <a name="line-10"></a><span class='hs-comment'>-- This program is distributed in the hope that it will be useful,</span> <a name="line-11"></a><span class='hs-comment'>-- but WITHOUT ANY WARRANTY; without even the implied warranty of</span> <a name="line-12"></a><span class='hs-comment'>-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span> <a name="line-13"></a><span class='hs-comment'>-- GNU General Public License for more details.</span> <a name="line-14"></a><span class='hs-comment'>--</span> <a name="line-15"></a><span class='hs-comment'>-- You should have received a copy of the GNU General Public License</span> <a name="line-16"></a><span class='hs-comment'>-- along with this program; see the file COPYING. If not, write to</span> <a name="line-17"></a><span class='hs-comment'>-- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,</span> <a name="line-18"></a><span class='hs-comment'>-- Boston, MA 02110-1301, USA.</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'>Repository</span><span class='hs-varop'>.</span><span class='hs-conid'>Merge</span> <span class='hs-layout'>(</span> <span class='hs-varid'>tentativelyMergePatches</span><span class='hs-layout'>,</span> <span class='hs-varid'>considerMergeToWorking</span> <span class='hs-layout'>)</span> <span class='hs-keyword'>where</span> <a name="line-23"></a> <a name="line-24"></a><span class='hs-keyword'>import</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> <span class='hs-varid'>externalResolution</span> <span class='hs-layout'>)</span> <a name="line-25"></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'>backupByCopying</span> <span class='hs-layout'>)</span> <a name="line-26"></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> <span class='hs-varid'>unless</span> <span class='hs-layout'>)</span> <a name="line-27"></a> <a name="line-28"></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-conid'>PatchInfoAnd</span><span class='hs-layout'>,</span> <span class='hs-varid'>n2pia</span><span class='hs-layout'>,</span> <span class='hs-varid'>hopefully</span> <span class='hs-layout'>)</span> <a name="line-29"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Flags</span> <a name="line-30"></a> <span class='hs-layout'>(</span> <span class='hs-conid'>DarcsFlag</span><span class='hs-layout'>(</span> <span class='hs-conid'>AllowConflicts</span><span class='hs-layout'>,</span> <span class='hs-conid'>NoAllowConflicts</span> <span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-varid'>wantExternalMerge</span><span class='hs-layout'>,</span> <span class='hs-varid'>diffingOpts</span><span class='hs-layout'>,</span> <span class='hs-varid'>compression</span> <span class='hs-layout'>)</span> <a name="line-31"></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> <a name="line-32"></a> <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-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-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> <span class='hs-varid'>mapFL_FL</span> <span class='hs-layout'>)</span> <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'>Patch</span> <a name="line-34"></a> <span class='hs-layout'>(</span> <span class='hs-conid'>RepoPatch</span><span class='hs-layout'>,</span> <span class='hs-conid'>PrimOf</span><span class='hs-layout'>,</span> <span class='hs-varid'>merge</span><span class='hs-layout'>,</span> <span class='hs-varid'>joinPatches</span><span class='hs-layout'>,</span> <span class='hs-varid'>listTouchedFiles</span> <a name="line-35"></a> <span class='hs-layout'>,</span> <span class='hs-varid'>patchcontents</span><span class='hs-layout'>,</span> <span class='hs-varid'>anonymous</span><span class='hs-layout'>,</span> <span class='hs-varid'>fromPrims</span><span class='hs-layout'>,</span> <span class='hs-varid'>effect</span> <span class='hs-layout'>)</span> <a name="line-36"></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-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'>Depends</span><span class='hs-layout'>(</span> <span class='hs-varid'>merge2FL</span> <span class='hs-layout'>)</span> <a name="line-38"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Progress</span><span class='hs-layout'>(</span> <span class='hs-varid'>debugMessage</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'>ProgressPatches</span><span class='hs-layout'>(</span> <span class='hs-varid'>progressFL</span> <span class='hs-layout'>)</span> <a name="line-40"></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-conid'>Sealed</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-varid'>seal</span> <span class='hs-layout'>)</span> <a name="line-41"></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'>InternalTypes</span><span class='hs-layout'>(</span> <span class='hs-conid'>Repository</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span> <a name="line-42"></a> <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'>Repository</span><span class='hs-varop'>.</span><span class='hs-conid'>State</span><span class='hs-layout'>(</span> <span class='hs-varid'>unrecordedChanges</span><span class='hs-layout'>,</span> <span class='hs-varid'>readUnrecorded</span> <span class='hs-layout'>)</span> <a name="line-44"></a> <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'>Repository</span><span class='hs-varop'>.</span><span class='hs-conid'>Internal</span> <a name="line-46"></a> <span class='hs-layout'>(</span> <span class='hs-varid'>announceMergeConflicts</span><span class='hs-layout'>,</span> <span class='hs-varid'>checkUnrecordedConflicts</span> <a name="line-47"></a> <span class='hs-layout'>,</span> <span class='hs-conid'>MakeChanges</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'>setTentativePending</span> <a name="line-48"></a> <span class='hs-layout'>,</span> <span class='hs-varid'>tentativelyAddPatch_</span><span class='hs-layout'>,</span> <span class='hs-varid'>applyToTentativePristine</span><span class='hs-layout'>,</span> <span class='hs-conid'>UpdatePristine</span><span class='hs-layout'>(</span><span class='hs-keyglyph'>..</span><span class='hs-layout'>)</span> <span class='hs-layout'>)</span> <a name="line-49"></a> <a name="line-50"></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-varop'>.</span><span class='hs-conid'>Tree</span><span class='hs-layout'>(</span> <span class='hs-conid'>Tree</span> <span class='hs-layout'>)</span> <a name="line-51"></a> <a name="line-52"></a><a name="tentativelyMergePatches_"></a><span class='hs-definition'>tentativelyMergePatches_</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'>r</span> <span class='hs-varid'>u</span> <span class='hs-varid'>t</span> <span class='hs-varid'>y</span> <span class='hs-varid'>x</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-layout'>)</span> <a name="line-53"></a> <span class='hs-keyglyph'>=></span> <span class='hs-conid'>MakeChanges</span> <a name="line-54"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>Repository</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>r</span> <span class='hs-varid'>u</span> <span class='hs-varid'>t</span><span class='hs-layout'>)</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-conid'>DarcsFlag</span><span class='hs-keyglyph'>]</span> <a name="line-55"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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'>t</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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-56"></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'>u</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <a name="line-57"></a><span class='hs-definition'>tentativelyMergePatches_</span> <span class='hs-varid'>mc</span> <span class='hs-varid'>r</span> <span class='hs-varid'>cmd</span> <span class='hs-varid'>opts</span> <span class='hs-varid'>usi</span> <span class='hs-varid'>themi</span> <span class='hs-keyglyph'>=</span> <a name="line-58"></a> <span class='hs-keyword'>do</span> <span class='hs-keyword'>let</span> <span class='hs-varid'>us</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>mapFL_FL</span> <span class='hs-varid'>hopefully</span> <span class='hs-varid'>usi</span> <a name="line-59"></a> <span class='hs-varid'>them</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>mapFL_FL</span> <span class='hs-varid'>hopefully</span> <span class='hs-varid'>themi</span> <a name="line-60"></a> <span class='hs-conid'>Sealed</span> <span class='hs-varid'>pc</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>return</span> <span class='hs-varop'>$</span> <span class='hs-varid'>merge2FL</span> <span class='hs-layout'>(</span><span class='hs-varid'>progressFL</span> <span class='hs-str'>"Merging us"</span> <span class='hs-varid'>usi</span><span class='hs-layout'>)</span> <span class='hs-layout'>(</span><span class='hs-varid'>progressFL</span> <span class='hs-str'>"Merging them"</span> <span class='hs-varid'>themi</span><span class='hs-layout'>)</span> <a name="line-61"></a> <span class='hs-varid'>pend</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>unrecordedChanges</span> <span class='hs-layout'>(</span><span class='hs-varid'>diffingOpts</span> <span class='hs-varid'>opts</span><span class='hs-layout'>)</span> <span class='hs-varid'>r</span> <span class='hs-conid'>Nothing</span> <a name="line-62"></a> <span class='hs-varid'>anonpend</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>n2pia</span> <span class='hs-varop'>`fmap`</span> <span class='hs-varid'>anonymous</span> <span class='hs-layout'>(</span><span class='hs-varid'>fromPrims</span> <span class='hs-varid'>pend</span><span class='hs-layout'>)</span> <a name="line-63"></a> <span class='hs-varid'>pend'</span> <span class='hs-conop'>:/\:</span> <span class='hs-varid'>pw</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>return</span> <span class='hs-varop'>$</span> <span class='hs-varid'>merge</span> <span class='hs-layout'>(</span><span class='hs-varid'>pc</span> <span class='hs-conop'>:\/:</span> <span class='hs-varid'>anonpend</span> <span class='hs-conop'>:>:</span> <span class='hs-conid'>NilFL</span><span class='hs-layout'>)</span> <a name="line-64"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>pwprim</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>joinPatches</span> <span class='hs-varop'>$</span> <span class='hs-varid'>progressFL</span> <span class='hs-str'>"Examining patches for conflicts"</span> <span class='hs-varop'>$</span> <a name="line-65"></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-varid'>pw</span> <a name="line-66"></a> <span class='hs-conid'>Sealed</span> <span class='hs-varid'>standard_resolved_pw</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>return</span> <span class='hs-varop'>$</span> <span class='hs-varid'>standardResolution</span> <span class='hs-varid'>pwprim</span> <a name="line-67"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Checking for conflicts..."</span> <a name="line-68"></a> <span class='hs-varid'>unless</span> <span class='hs-layout'>(</span><span class='hs-conid'>AllowConflicts</span> <span class='hs-varop'>`elem`</span> <span class='hs-varid'>opts</span> <span class='hs-varop'>||</span> <span class='hs-conid'>NoAllowConflicts</span> <span class='hs-varop'>`elem`</span> <span class='hs-varid'>opts</span><span class='hs-layout'>)</span> <span class='hs-varop'>$</span> <a name="line-69"></a> <span class='hs-varid'>mapM_</span> <span class='hs-varid'>backupByCopying</span> <span class='hs-varop'>$</span> <span class='hs-varid'>listTouchedFiles</span> <span class='hs-varid'>standard_resolved_pw</span> <a name="line-70"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Announcing conflicts..."</span> <a name="line-71"></a> <span class='hs-varid'>have_conflicts</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>announceMergeConflicts</span> <span class='hs-varid'>cmd</span> <span class='hs-varid'>opts</span> <span class='hs-varid'>standard_resolved_pw</span> <a name="line-72"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Checking for unrecorded conflicts..."</span> <a name="line-73"></a> <span class='hs-varid'>have_unrecorded_conflicts</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>checkUnrecordedConflicts</span> <span class='hs-varid'>opts</span> <span class='hs-varop'>$</span> <span class='hs-varid'>mapFL_FL</span> <span class='hs-varid'>hopefully</span> <span class='hs-varid'>pc</span> <a name="line-74"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Reading working directory..."</span> <a name="line-75"></a> <span class='hs-varid'>working</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>readUnrecorded</span> <span class='hs-varid'>r</span> <span class='hs-conid'>Nothing</span> <a name="line-76"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Working out conflicts in actual working directory..."</span> <a name="line-77"></a> <span class='hs-conid'>Sealed</span> <span class='hs-varid'>pw_resolution</span> <span class='hs-keyglyph'><-</span> <a name="line-78"></a> <span class='hs-keyword'>case</span> <span class='hs-layout'>(</span><span class='hs-varid'>wantExternalMerge</span> <span class='hs-varid'>opts</span><span class='hs-layout'>,</span> <span class='hs-varid'>have_conflicts</span> <span class='hs-varop'>||</span> <span class='hs-varid'>have_unrecorded_conflicts</span><span class='hs-layout'>)</span> <span class='hs-keyword'>of</span> <a name="line-79"></a> <span class='hs-layout'>(</span><span class='hs-conid'>Nothing</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'>return</span> <span class='hs-varop'>$</span> <span class='hs-keyword'>if</span> <span class='hs-conid'>AllowConflicts</span> <span class='hs-varop'>`elem`</span> <span class='hs-varid'>opts</span> <a name="line-80"></a> <span class='hs-keyword'>then</span> <span class='hs-varid'>seal</span> <span class='hs-conid'>NilFL</span> <a name="line-81"></a> <span class='hs-keyword'>else</span> <span class='hs-varid'>seal</span> <span class='hs-varid'>standard_resolved_pw</span> <a name="line-82"></a> <span class='hs-layout'>(</span><span class='hs-keyword'>_</span><span class='hs-layout'>,</span><span class='hs-conid'>False</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>return</span> <span class='hs-varop'>$</span> <span class='hs-varid'>seal</span> <span class='hs-varid'>standard_resolved_pw</span> <a name="line-83"></a> <span class='hs-layout'>(</span><span class='hs-conid'>Just</span> <span class='hs-varid'>c</span><span class='hs-layout'>,</span> <span class='hs-conid'>True</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>externalResolution</span> <span class='hs-varid'>working</span> <span class='hs-varid'>c</span> <span class='hs-varid'>opts</span> <a name="line-84"></a> <span class='hs-layout'>(</span><span class='hs-varid'>effect</span> <span class='hs-varid'>us</span> <span class='hs-varop'>+>+</span> <span class='hs-varid'>pend</span><span class='hs-layout'>)</span> <a name="line-85"></a> <span class='hs-layout'>(</span><span class='hs-varid'>effect</span> <span class='hs-varid'>them</span><span class='hs-layout'>)</span> <span class='hs-varid'>pwprim</span> <a name="line-86"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Applying patches to the local directories..."</span> <a name="line-87"></a> <span class='hs-varid'>when</span> <span class='hs-layout'>(</span><span class='hs-varid'>mc</span> <span class='hs-varop'>==</span> <span class='hs-conid'>MakeChanges</span><span class='hs-layout'>)</span> <span class='hs-varop'>$</span> <a name="line-88"></a> <span class='hs-keyword'>do</span> <span class='hs-keyword'>let</span> <span class='hs-varid'>doChanges</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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'>t</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>IO</span> <span class='hs-conid'>()</span> <a name="line-89"></a> <span class='hs-varid'>doChanges</span> <span class='hs-conid'>NilFL</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>applyps</span> <span class='hs-varid'>r</span> <span class='hs-varid'>themi</span> <a name="line-90"></a> <span class='hs-varid'>doChanges</span> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>applyps</span> <span class='hs-varid'>r</span> <span class='hs-varid'>pc</span> <a name="line-91"></a> <span class='hs-varid'>doChanges</span> <span class='hs-varid'>usi</span> <a name="line-92"></a> <span class='hs-varid'>setTentativePending</span> <span class='hs-varid'>r</span> <span class='hs-layout'>(</span><span class='hs-varid'>effect</span> <span class='hs-varid'>pend'</span> <span class='hs-varop'>+>+</span> <span class='hs-varid'>pw_resolution</span><span class='hs-layout'>)</span> <a name="line-93"></a> <span class='hs-varid'>return</span> <span class='hs-varop'>$</span> <span class='hs-varid'>seal</span> <span class='hs-layout'>(</span><span class='hs-varid'>effect</span> <span class='hs-varid'>pwprim</span> <span class='hs-varop'>+>+</span> <span class='hs-varid'>pw_resolution</span><span class='hs-layout'>)</span> <a name="line-94"></a> <span class='hs-keyword'>where</span> <span class='hs-varid'>mapAdd</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>Repository</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>m</span> <span class='hs-varid'>l</span> <span class='hs-varid'>i</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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'>i</span> <span class='hs-varid'>j</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>IO</span> <span class='hs-layout'>(</span><span class='hs-conid'>Repository</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>m</span> <span class='hs-varid'>l</span> <span class='hs-varid'>j</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <a name="line-95"></a> <span class='hs-varid'>mapAdd</span> <span class='hs-varid'>repo</span> <span class='hs-conid'>NilFL</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>return</span> <span class='hs-varid'>repo</span> <a name="line-96"></a> <span class='hs-varid'>mapAdd</span> <span class='hs-varid'>repo</span> <span class='hs-layout'>(</span><span class='hs-varid'>a</span><span class='hs-conop'>:>:</span><span class='hs-keyword'>as</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>=</span> <a name="line-97"></a> <span class='hs-keyword'>do</span> <span class='hs-varid'>repo'</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>tentativelyAddPatch_</span> <span class='hs-conid'>DontUpdatePristine</span> <span class='hs-varid'>repo</span> <span class='hs-layout'>(</span><span class='hs-varid'>compression</span> <span class='hs-varid'>opts</span><span class='hs-layout'>)</span> <span class='hs-varid'>a</span> <a name="line-98"></a> <span class='hs-varid'>mapAdd</span> <span class='hs-varid'>repo'</span> <span class='hs-keyword'>as</span> <a name="line-99"></a> <span class='hs-varid'>applyps</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>Repository</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>m</span> <span class='hs-varid'>l</span> <span class='hs-varid'>i</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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'>i</span> <span class='hs-varid'>j</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>IO</span> <span class='hs-conid'>()</span> <a name="line-100"></a> <span class='hs-varid'>applyps</span> <span class='hs-varid'>repo</span> <span class='hs-varid'>ps</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyword'>do</span> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Adding patches to inventory..."</span> <a name="line-101"></a><span class='hs-comment'>-- Warning: A do-notation statement discarded a result of type Repository p m l j.</span> <a name="line-102"></a> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>mapAdd</span> <span class='hs-varid'>repo</span> <span class='hs-varid'>ps</span> <a name="line-103"></a> <span class='hs-varid'>debugMessage</span> <span class='hs-str'>"Applying patches to pristine..."</span> <a name="line-104"></a> <span class='hs-varid'>applyToTentativePristine</span> <span class='hs-varid'>repo</span> <span class='hs-varid'>ps</span> <a name="line-105"></a> <a name="line-106"></a><a name="tentativelyMergePatches"></a><span class='hs-definition'>tentativelyMergePatches</span> <span class='hs-keyglyph'>::</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-layout'>)</span> <a name="line-107"></a> <span class='hs-keyglyph'>=></span> <span class='hs-conid'>Repository</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>r</span> <span class='hs-varid'>u</span> <span class='hs-varid'>t</span><span class='hs-layout'>)</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-conid'>DarcsFlag</span><span class='hs-keyglyph'>]</span> <a name="line-108"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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'>t</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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-109"></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'>u</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <a name="line-110"></a><span class='hs-definition'>tentativelyMergePatches</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>tentativelyMergePatches_</span> <span class='hs-conid'>MakeChanges</span> <a name="line-111"></a> <a name="line-112"></a> <a name="line-113"></a><a name="considerMergeToWorking"></a><span class='hs-definition'>considerMergeToWorking</span> <span class='hs-keyglyph'>::</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-layout'>)</span> <a name="line-114"></a> <span class='hs-keyglyph'>=></span> <span class='hs-conid'>Repository</span> <span class='hs-varid'>p</span> <span class='hs-conid'>C</span><span class='hs-layout'>(</span><span class='hs-varid'>r</span> <span class='hs-varid'>u</span> <span class='hs-varid'>t</span><span class='hs-layout'>)</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-conid'>DarcsFlag</span><span class='hs-keyglyph'>]</span> <a name="line-115"></a> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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'>t</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-conid'>FL</span> <span class='hs-layout'>(</span><span class='hs-conid'>PatchInfoAnd</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-116"></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'>u</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <a name="line-117"></a><span class='hs-definition'>considerMergeToWorking</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>tentativelyMergePatches_</span> <span class='hs-conid'>DontMakeChanges</span> <a name="line-118"></a> </pre></body> </html>
