<?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/Commands/MarkConflicts.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,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-keyword'>module</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Commands</span><span class='hs-varop'>.</span><span class='hs-conid'>MarkConflicts</span> <span class='hs-layout'>(</span> <span class='hs-varid'>markconflicts</span> <span class='hs-layout'>)</span> <span class='hs-keyword'>where</span>
<a name="line-21"></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-keyglyph'>..</span><span class='hs-layout'>)</span><span class='hs-layout'>,</span> <span class='hs-varid'>exitWith</span> <span class='hs-layout'>)</span>
<a name="line-22"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>SignalHandler</span> <span class='hs-layout'>(</span> <span class='hs-varid'>withSignalsBlocked</span> <span class='hs-layout'>)</span>
<a name="line-23"></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'>unless</span> <span class='hs-layout'>)</span>
<a name="line-24"></a>
<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'>Commands</span> <span class='hs-layout'>(</span> <span class='hs-conid'>DarcsCommand</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'>nodefaults</span> <span class='hs-layout'>)</span>
<a name="line-26"></a><span class='hs-keyword'>import</span> <span class='hs-conid'>Darcs</span><span class='hs-varop'>.</span><span class='hs-conid'>Arguments</span> <span class='hs-layout'>(</span> <span class='hs-conid'>DarcsFlag</span><span class='hs-layout'>,</span> <span class='hs-varid'>ignoretimes</span><span class='hs-layout'>,</span> <span class='hs-varid'>workingRepoDir</span><span class='hs-layout'>,</span> <span class='hs-varid'>umaskOption</span> <span class='hs-layout'>)</span>
<a name="line-27"></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-varid'>diffingOpts</span> <span class='hs-layout'>)</span>
<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'>Repository</span> <span class='hs-layout'>(</span> <span class='hs-varid'>withRepoLock</span><span class='hs-layout'>,</span> <span class='hs-conid'>RepoJob</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'>amInHashedRepository</span><span class='hs-layout'>,</span> <span class='hs-varid'>addToPending</span><span class='hs-layout'>,</span>
<a name="line-29"></a> <span class='hs-varid'>applyToWorking</span><span class='hs-layout'>,</span>
<a name="line-30"></a> <span class='hs-varid'>readRepo</span><span class='hs-layout'>,</span> <span class='hs-varid'>unrecordedChanges</span><span class='hs-layout'>,</span> <span class='hs-conid'>Repository</span>
<a name="line-31"></a> <span class='hs-layout'>)</span>
<a name="line-32"></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-varid'>invert</span><span class='hs-layout'>,</span> <span class='hs-conid'>PrimOf</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'>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-34"></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>
<a name="line-35"></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'>patchsetConflictResolutions</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'>Utils</span> <span class='hs-layout'>(</span> <span class='hs-varid'>promptYorn</span> <span class='hs-layout'>)</span>
<a name="line-37"></a><span class='hs-cpp'>#include "impossible.h"</span>
<a name="line-38"></a><span class='hs-cpp'>#include "gadts.h"</span>
<a name="line-39"></a>
<a name="line-40"></a><a name="markconflictsDescription"></a><span class='hs-definition'>markconflictsDescription</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>String</span>
<a name="line-41"></a><span class='hs-definition'>markconflictsDescription</span> <span class='hs-keyglyph'>=</span>
<a name="line-42"></a> <span class='hs-str'>"Mark unresolved conflicts in working tree, for manual resolution."</span>
<a name="line-43"></a>
<a name="line-44"></a><a name="markconflictsHelp"></a><span class='hs-definition'>markconflictsHelp</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>String</span>
<a name="line-45"></a><span class='hs-definition'>markconflictsHelp</span> <span class='hs-keyglyph'>=</span>
<a name="line-46"></a> <span class='hs-str'>"Darcs requires human guidance to unify changes to the same part of a\n"</span> <span class='hs-varop'>++</span>
<a name="line-47"></a> <span class='hs-str'>"source file. When a conflict first occurs, darcs will add the\n"</span> <span class='hs-varop'>++</span>
<a name="line-48"></a> <span class='hs-str'>"initial state and both choices to the working tree, delimited by the\n"</span> <span class='hs-varop'>++</span>
<a name="line-49"></a> <span class='hs-str'>"markers `v v v', `=====', `* * *' and `^ ^ ^', as follows:\n"</span> <span class='hs-varop'>++</span>
<a name="line-50"></a> <span class='hs-str'>"\n"</span> <span class='hs-varop'>++</span>
<a name="line-51"></a> <span class='hs-str'>"v v v v v v v\n"</span> <span class='hs-varop'>++</span>
<a name="line-52"></a> <span class='hs-str'>"Initial state.\n"</span> <span class='hs-varop'>++</span>
<a name="line-53"></a> <span class='hs-str'>"=============\n"</span> <span class='hs-varop'>++</span>
<a name="line-54"></a> <span class='hs-str'>"First choice.\n"</span> <span class='hs-varop'>++</span>
<a name="line-55"></a> <span class='hs-str'>"*************\n"</span> <span class='hs-varop'>++</span>
<a name="line-56"></a> <span class='hs-str'>"Second choice.\n"</span> <span class='hs-varop'>++</span>
<a name="line-57"></a> <span class='hs-str'>"^ ^ ^ ^ ^ ^ ^\n"</span> <span class='hs-varop'>++</span>
<a name="line-58"></a> <span class='hs-str'>"\n"</span> <span class='hs-varop'>++</span>
<a name="line-59"></a> <span class='hs-str'>"However, you might revert or manually delete these markers without\n"</span> <span class='hs-varop'>++</span>
<a name="line-60"></a> <span class='hs-str'>"actually resolving the conflict. In this case, `darcs mark-conflicts'\n"</span> <span class='hs-varop'>++</span>
<a name="line-61"></a> <span class='hs-str'>"is useful to show where any unresolved conflicts. It is also useful\n"</span> <span class='hs-varop'>++</span>
<a name="line-62"></a> <span class='hs-str'>"if `darcs apply' is called with --apply-conflicts, where conflicts\n"</span> <span class='hs-varop'>++</span>
<a name="line-63"></a> <span class='hs-str'>"aren't marked initially.\n"</span> <span class='hs-varop'>++</span>
<a name="line-64"></a> <span class='hs-str'>"\n"</span> <span class='hs-varop'>++</span>
<a name="line-65"></a> <span class='hs-str'>"Any unrecorded changes to the working tree WILL be lost forever when\n"</span> <span class='hs-varop'>++</span>
<a name="line-66"></a> <span class='hs-str'>"you run this command! You will be prompted for confirmation before\n"</span> <span class='hs-varop'>++</span>
<a name="line-67"></a> <span class='hs-str'>"this takes place.\n"</span>
<a name="line-68"></a>
<a name="line-69"></a><a name="markconflicts"></a><span class='hs-definition'>markconflicts</span> <span class='hs-keyglyph'>::</span> <span class='hs-conid'>DarcsCommand</span>
<a name="line-70"></a><span class='hs-definition'>markconflicts</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>DarcsCommand</span> <span class='hs-layout'>{</span><span class='hs-varid'>commandProgramName</span> <span class='hs-keyglyph'>=</span> <span class='hs-str'>"darcs"</span><span class='hs-layout'>,</span>
<a name="line-71"></a> <span class='hs-varid'>commandName</span> <span class='hs-keyglyph'>=</span> <span class='hs-str'>"mark-conflicts"</span><span class='hs-layout'>,</span>
<a name="line-72"></a> <span class='hs-varid'>commandHelp</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>markconflictsHelp</span><span class='hs-layout'>,</span>
<a name="line-73"></a> <span class='hs-varid'>commandDescription</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>markconflictsDescription</span><span class='hs-layout'>,</span>
<a name="line-74"></a> <span class='hs-varid'>commandExtraArgs</span> <span class='hs-keyglyph'>=</span> <span class='hs-num'>0</span><span class='hs-layout'>,</span>
<a name="line-75"></a> <span class='hs-varid'>commandExtraArgHelp</span> <span class='hs-keyglyph'>=</span> <span class='hs-conid'>[]</span><span class='hs-layout'>,</span>
<a name="line-76"></a> <span class='hs-varid'>commandCommand</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>markconflictsCmd</span><span class='hs-layout'>,</span>
<a name="line-77"></a> <span class='hs-varid'>commandPrereq</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>amInHashedRepository</span><span class='hs-layout'>,</span>
<a name="line-78"></a> <span class='hs-varid'>commandGetArgPossibilities</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>return</span> <span class='hs-conid'>[]</span><span class='hs-layout'>,</span>
<a name="line-79"></a> <span class='hs-varid'>commandArgdefaults</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>nodefaults</span><span class='hs-layout'>,</span>
<a name="line-80"></a> <span class='hs-varid'>commandAdvancedOptions</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyglyph'>[</span><span class='hs-varid'>umaskOption</span><span class='hs-keyglyph'>]</span><span class='hs-layout'>,</span>
<a name="line-81"></a> <span class='hs-varid'>commandBasicOptions</span> <span class='hs-keyglyph'>=</span> <span class='hs-keyglyph'>[</span><span class='hs-varid'>ignoretimes</span><span class='hs-layout'>,</span>
<a name="line-82"></a> <span class='hs-varid'>workingRepoDir</span><span class='hs-keyglyph'>]</span><span class='hs-layout'>}</span>
<a name="line-83"></a>
<a name="line-84"></a><a name="markconflictsCmd"></a><span class='hs-definition'>markconflictsCmd</span> <span class='hs-keyglyph'>::</span> <span class='hs-keyglyph'>[</span><span class='hs-conid'>DarcsFlag</span><span class='hs-keyglyph'>]</span> <span class='hs-keyglyph'>-></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'>IO</span> <span class='hs-conid'>()</span>
<a name="line-85"></a><span class='hs-definition'>markconflictsCmd</span> <span class='hs-varid'>opts</span> <span class='hs-conid'>[]</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>withRepoLock</span> <span class='hs-varid'>opts</span> <span class='hs-varop'>$</span> <span class='hs-conid'>RepoJob</span> <span class='hs-varop'>$</span> <span class='hs-keyglyph'>\</span><span class='hs-layout'>(</span><span class='hs-varid'>repository</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'>r</span> <span class='hs-varid'>u</span> <span class='hs-varid'>r</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span>
<a name="line-86"></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'>repository</span> <span class='hs-conid'>Nothing</span>
<a name="line-87"></a> <span class='hs-varid'>r</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>readRepo</span> <span class='hs-varid'>repository</span>
<a name="line-88"></a> <span class='hs-conid'>Sealed</span> <span class='hs-varid'>res</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>return</span> <span class='hs-varop'>$</span> <span class='hs-varid'>patchsetConflictResolutions</span> <span class='hs-varid'>r</span>
<a name="line-89"></a> <span class='hs-layout'>(</span><span class='hs-keyword'>case</span> <span class='hs-varid'>res</span> <span class='hs-keyword'>of</span> <span class='hs-conid'>NilFL</span> <span class='hs-keyglyph'>-></span> <span class='hs-keyword'>do</span> <span class='hs-varid'>putStrLn</span> <span class='hs-str'>"No conflicts to mark."</span>
<a name="line-90"></a> <span class='hs-varid'>exitWith</span> <span class='hs-conid'>ExitSuccess</span>
<a name="line-91"></a> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'>-></span> <span class='hs-varid'>return</span> <span class='hs-conid'>()</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-92"></a> <span class='hs-keyword'>let</span> <span class='hs-varid'>undoUnrec</span> <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'>r</span> <span class='hs-varid'>u</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'>r</span> <span class='hs-varid'>r</span> <span class='hs-varid'>r</span><span class='hs-layout'>)</span><span class='hs-layout'>)</span>
<a name="line-93"></a> <span class='hs-varid'>undoUnrec</span> <span class='hs-conid'>NilFL</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>return</span> <span class='hs-varid'>repository</span>
<a name="line-94"></a> <span class='hs-varid'>undoUnrec</span> <span class='hs-varid'>pend'</span> <span class='hs-keyglyph'>=</span>
<a name="line-95"></a> <span class='hs-keyword'>do</span> <span class='hs-varid'>putStrLn</span> <span class='hs-layout'>(</span><span class='hs-str'>"This will trash any unrecorded changes"</span><span class='hs-varop'>++</span>
<a name="line-96"></a> <span class='hs-str'>" in the working directory."</span><span class='hs-layout'>)</span>
<a name="line-97"></a> <span class='hs-varid'>confirmed</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>promptYorn</span> <span class='hs-str'>"Are you sure? "</span>
<a name="line-98"></a> <span class='hs-varid'>unless</span> <span class='hs-varid'>confirmed</span> <span class='hs-varop'>$</span> <span class='hs-varid'>exitWith</span> <span class='hs-conid'>ExitSuccess</span>
<a name="line-99"></a> <span class='hs-varid'>applyToWorking</span> <span class='hs-varid'>repository</span> <span class='hs-varid'>opts</span> <span class='hs-layout'>(</span><span class='hs-varid'>invert</span> <span class='hs-varid'>pend'</span><span class='hs-layout'>)</span> <span class='hs-varop'>`catch`</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>e</span> <span class='hs-keyglyph'>-></span>
<a name="line-100"></a> <span class='hs-varid'>bug</span> <span class='hs-layout'>(</span><span class='hs-str'>"Can't undo pending changes!"</span> <span class='hs-varop'>++</span> <span class='hs-varid'>show</span> <span class='hs-varid'>e</span><span class='hs-layout'>)</span>
<a name="line-101"></a> <span class='hs-varid'>repository'</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>undoUnrec</span> <span class='hs-varid'>pend</span>
<a name="line-102"></a> <span class='hs-varid'>withSignalsBlocked</span> <span class='hs-varop'>$</span>
<a name="line-103"></a> <span class='hs-keyword'>do</span> <span class='hs-varid'>addToPending</span> <span class='hs-varid'>repository'</span> <span class='hs-varid'>res</span>
<a name="line-104"></a> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'><-</span> <span class='hs-varid'>applyToWorking</span> <span class='hs-varid'>repository'</span> <span class='hs-varid'>opts</span> <span class='hs-varid'>res</span> <span class='hs-varop'>`catch`</span> <span class='hs-keyglyph'>\</span><span class='hs-varid'>e</span> <span class='hs-keyglyph'>-></span>
<a name="line-105"></a> <span class='hs-varid'>bug</span> <span class='hs-layout'>(</span><span class='hs-str'>"Problem marking conflicts in mark-conflicts!"</span> <span class='hs-varop'>++</span> <span class='hs-varid'>show</span> <span class='hs-varid'>e</span><span class='hs-layout'>)</span>
<a name="line-106"></a> <span class='hs-varid'>return</span> <span class='hs-conid'>()</span>
<a name="line-107"></a> <span class='hs-varid'>putStrLn</span> <span class='hs-str'>"Finished marking conflicts."</span>
<a name="line-108"></a><span class='hs-definition'>markconflictsCmd</span> <span class='hs-keyword'>_</span> <span class='hs-keyword'>_</span> <span class='hs-keyglyph'>=</span> <span class='hs-varid'>impossible</span>
<a name="line-109"></a>
</pre></body>
</html>
