[darcs-devel] darcs patch: Make HopefullyPrivate and Cancellation s... (and 20 more)

[David Roundy]

Hi Eric,

Here's another huge patch bundle which should bring you up to
date with my conflicts work.  The last patch is a huge one, in
which I define a Prim patch type, which is only truly primitive
patches.  I change pending-related code to accept FL Prim, so
the type system enforces that we don't get any Mergers in there.
It's still a refactor, I believe, although I did make the change
that darcs whatsnew now just prints out the sequence of changes,
without surrounding braces.  This would be easy enough to add,
and I know this change might bother tool-writers a bit, but I
think it's an improvement.  It saves two lines of screen space!

David

Wed Aug 29 13:55:24 EDT 2007  David Roundy <droundy at darcs.net>
  * Make HopefullyPrivate and Cancellation support gadts

Wed Aug 29 14:21:19 EDT 2007  David Roundy <droundy at darcs.net>
  * define actual merge algorithm (and retype remerge)

Tue Sep  4 12:35:19 EDT 2007  David Roundy <droundy at darcs.net>
  * Move patch manipulations into classes.

Tue Sep  4 13:23:46 EDT 2007  David Roundy <droundy at darcs.net>
  * use showPatch instance of FL Patch.

Tue Sep  4 17:05:25 EDT 2007  David Roundy <droundy at darcs.net>
  * Move ReadPatch stuff into yet another class.

Tue Sep  4 18:10:53 EDT 2007  David Roundy <droundy at darcs.net>
  * Define class for apply.

Wed Sep  5 11:58:08 EDT 2007  David Roundy <droundy at darcs.net>
  * make merger code use RL/FL.

Wed Sep  5 13:34:56 EDT 2007  David Roundy <droundy at darcs.net>
  * move merging into Commute class

Thu Sep  6 09:56:54 EDT 2007  David Roundy <droundy at darcs.net>
  * define type synonymn PatchInfoAndPatch

Thu Sep  6 10:45:36 EDT 2007  David Roundy <droundy at darcs.net>
  * make patchset_complement slightly more readable.

Fri Sep  7 10:10:32 EDT 2007  David Roundy <droundy at darcs.net>
  * make PatchSet a RL RL.

Fri Sep  7 11:03:15 EDT 2007  David Roundy <droundy at darcs.net>
  * clean up ambiguous [Patch] in Depends.

Fri Sep  7 11:19:51 EDT 2007  David Roundy <droundy at darcs.net>
  * fix accidentally-recorded change in makefile.

Fri Sep  7 11:20:11 EDT 2007  David Roundy <droundy at darcs.net>
  * simplify code using FL instance of Commute.

Fri Sep  7 11:27:13 EDT 2007  David Roundy <droundy at darcs.net>
  * clean up Depends a bit more (part 1 of 2).

Fri Sep  7 11:29:24 EDT 2007  David Roundy <droundy at darcs.net>
  * clean up Depends a bit more (part 2 of 2 -- makes it more efficient).

Fri Sep  7 13:10:55 EDT 2007  David Roundy <droundy at darcs.net>
  * move showContextPatch into ShowPatch class.

Mon Sep 10 16:37:15 EDT 2007  David Roundy <droundy at darcs.net>
  * make Named patches a distinct type.

Tue Sep 11 10:26:29 EDT 2007  David Roundy <droundy at darcs.net>
  * make SelectPatches be more type-specific.

Tue Sep 11 10:57:44 EDT 2007  David Roundy <droundy at darcs.net>
  * remove Cancel/Cancellation/Marked patch types.

Tue Sep 11 18:34:58 EDT 2007  David Roundy <droundy at darcs.net>
  * move Conflicted into separate patch type.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 556071 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070914/7183ef68/attachment-0001.bin