[darcs-users] [patch421] getting rid of ComP constructor in Patch

[Florent Becker]

Florent Becker <florent.becker at ens-lyon.org> added the comment:

Review of the second bundle


ok

hunk ./src/Darcs/Commands/TrackDown.lhs 157
>  patchTree2RL (Fork l r) = (patchTree2RL l) +<+ (patchTree2RL r)
>  
>  -- | Iterate the Patch Tree
> -trackNextBisect :: (Conflict p, Patchy p) => [DarcsFlag] -> 
BisectState -> IO ExitCode -> BisectDir -> PatchTree p C(x y) -> IO ()
> +trackNextBisect :: (Conflict p, PatchListFormat p, Patchy p)
> +                => [DarcsFlag] -> BisectState -> IO ExitCode -> 
BisectDir -> PatchTree p C(x y) -> IO ()
>  trackNextBisect opts (dnow, dtotal) test dir (Fork l r) = do
>    putStr ("Trying " ++ show dnow ++ "/" ++ show dtotal ++ " 
sequences...\n")
>    hFlush stdout
ok

hunk ./src/Darcs/Commands/TrackDown.lhs 173
>    putStrLn ("Last recent patch that fails the test (assuming monotony 
in the given range):")
>    putDocLn (description p)
>  
> -jumpHalfOnRight :: (Conflict p, Patchy p) => [DarcsFlag] -> PatchTree 
p C(x y) -> IO ()
> +jumpHalfOnRight :: (Conflict p, PatchListFormat p, Patchy p) => 
[DarcsFlag] -> PatchTree p C(x y) -> IO ()
>  jumpHalfOnRight opts l = unapplyRL ps >> makeScriptsExecutable opts 
ps
>    where ps = patchTree2RL l
>  
ok

hunk ./src/Darcs/Commands/TrackDown.lhs 177
> -jumpHalfOnLeft :: (Conflict p, Patchy p) => [DarcsFlag] -> PatchTree 
p C(x y) -> IO ()
> +jumpHalfOnLeft :: (Conflict p, PatchListFormat p, Patchy p) => 
[DarcsFlag] -> PatchTree p C(x y) -> IO ()
>  jumpHalfOnLeft opts r = applyRL p >> makeScriptsExecutable opts p
>    where p = patchTree2RL r
>  
ok

hunk ./darcs.cabal 187
>                        Darcs.Match
>                        Darcs.Patch
>                        Darcs.Patch.Apply
> +                      Darcs.Patch.Braced
> +                      Darcs.Patch.Braced.Instances
>                        Darcs.Patch.Bundle
>                        Darcs.Patch.Choices
>                        Darcs.Patch.Commute

hunk ./darcs.cabal 195
>                        Darcs.Patch.ConflictMarking
>                        Darcs.Patch.Depends
>                        Darcs.Patch.FileName
> +                      Darcs.Patch.Format
>                        Darcs.Patch.Info
>                        Darcs.Patch.Inspect
>                        Darcs.Patch.Invert
ok

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch421>
__________________________________