Tue Nov 23 07:50:37 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* remove unused parameter
OK
==============
Tue Nov 23 07:50:39 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* get rid of unused default implementation for apply
OK
==============
Tue Nov 23 07:50:40 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* break patch repair out into its own class
The change of this patch consists in removing the following functions
from the class Apply:
applyAndTryToFix :: WriteableDirectory m => p C(x y) -> m (Maybe
(String, p C(x y)))
applyAndTryToFix p = do apply p; return Nothing
applyAndTryToFixFL :: WriteableDirectory m => p C(x y) -> m (Maybe
(String, FL p C(x y)))
applyAndTryToFixFL p = mapMaybeSnd (:>:NilFL) `liftM` applyAndTryToFix p
And putting them respectively in in the classes Repair and RepairToFL,
that are in the new module Darcs.Patch.Repair.
The class RepairToFL is in its turn added as requirement to the classes
RepoPatch, PrimPatch. (*)
Now a little file-by-file summary:
Introduces Darcs.Patch.Repair:
M ./darcs.cabal +1
Split class "Apply":
M ./src/Darcs/Patch/Apply.lhs -22 +1
Add "instance RepairToFL p => Repair (Named p)" (due to split):
M ./src/Darcs/Patch/Named.lhs -1 +3
Add "instance RepairToFL p => Repair (PatchInfoAnd p)" (due to split):
M ./src/Darcs/Patch/PatchInfoAnd.hs +3
Already mentioned (*):
M ./src/Darcs/Patch/Prim/Class.hs -1 +2
Add "instance RepairToFL Prim" (due to split):
M ./src/Darcs/Patch/Prim/V1/Apply.lhs +4
The new module:
A ./src/Darcs/Patch/Repair.hs
Already mentioned (*):
M ./src/Darcs/Patch/RepoPatch.hs -1 +2
Add "instance PrimPatch prim => RepairToFL (Patch prim)" (due to split):
M ./src/Darcs/Patch/V1/Apply.hs -4 +5
Add "instance PrimPatch prim => RepairToFL (RealPatch prim)" (due to split):
M ./src/Darcs/Patch/V2/Real.hs -1 +3
Import "applyAndTryToFix" from Darcs.Patch.Repair instead of
Darcs.Patch.Patchy (which keeps in importing Darcs.Patch.Apply, but not
Repair):
M ./src/Darcs/Repository/Repair.hs -1 +1
So Darcs.Repository.Repair (the only module outside of Darcs.Patch
impacted by this patch) now imports Darcs.Patch.Repair instead of
Darcs.Patch.Patchy, which is more fine-grained.
===============
Tue Nov 23 07:50:41 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* remove default for resolveConflicts
OK.
================
Tue Nov 23 07:50:43 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* drop an unused instance of Conflict
OK.
===============
Tue Nov 23 07:50:44 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* move consistency checking into Darcs.Patch.Repair
Moves function isInconsistent from the class Conflict
(Darcs.Patch.Conflict) to a new class Check (Darcs.Patch.Repair). This
class Check is added as requirement to the class RepoPatch.
The rest is about fixing instances. Just one weird change at first
sight, in Darcs.Patch.V2.Real:
+instance PrimPatch prim => Check (RealPatch prim) where
+ isInconsistent = isConsistent
But it's fine since both functions are about issuing a message if
something is wrong with a patch.
(No module outside of Darcs.Patch is impacted)
================
Tue Nov 23 07:50:45 GMT 2010 Ganesh Sittampalam <ganesh@earth.li>
* put commuteNoConflicts into its own class and remove default impl
Main change happens in ./src/Darcs/Patch/Conflict.hs by introducing
class CommuteNoConflicts whose only function commuteNoConflicts was in
class Conflict. Also no longer include its default implementation.
The rest is fixing imports and instances (class CommuteNoConflicts si
added as requirement to RepoPatch).
I guess this will help defining patch types for which there are no
conflicts: make them belong to CommuteNoConflicts class, but not to
Conflict.
=================
Compile and tests ok, pushing them.
|
