Hi,

While waiting around for a delivery[1], I did a bit of refactoring.
The main goal is to reorganise darcs v1 and v2 patches into their
own namespaces and to move towards a point where they just implement
a common interface - though we're some way off that ideal yet.

As quite a few files are touched, fast review would be good to
minimise conflicts for all concerned. The first set of patches
is just a bunch of fixes for warnings that show up more obviously
in the tests and the witnesses builds now that Jason has had
a go at the warnings in the main build.

Cheers,

Ganesh

[1] http://urchin.earth.li/aegean/baby/

26 patches for repository http://darcs.net:

Thu Aug 26 10:22:45 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in tests

Thu Aug 26 10:42:24 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.Commands.Pull

Thu Aug 26 10:42:47 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.Commands.Push

Thu Aug 26 10:44:28 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.Commands.Record

Thu Aug 26 10:44:36 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.Commands.Send

Thu Aug 26 10:45:19 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warning in Darcs.Patch.Choices

Thu Aug 26 10:45:36 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warning in Darcs.Patch.Depends

Thu Aug 26 10:45:45 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warning in Darcs.Repository.Repair

Thu Aug 26 10:45:53 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.Witnesses.Ordered

Thu Aug 26 10:51:13 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.Commands.Apply

Thu Aug 26 10:51:22 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * fix warnings in Darcs.SelectChanges

Thu Aug 26 11:44:27 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * start on moving v1 patch code into its own namespace

Thu Aug 26 11:44:37 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * remove unused re-export

Thu Aug 26 11:44:37 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move RealPatch into its own namespace

Thu Aug 26 12:01:34 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move Darcs.Patch.Commute into V1 namespace

Thu Aug 26 12:01:40 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move Named instances out of V1.Commute

Thu Aug 26 12:01:41 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * Darcs.Patch.Core now just contains Named

Thu Aug 26 13:21:37 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move v1 Patch reading into separate module

Thu Aug 26 13:21:40 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move v1 Patch applying into separate module

Thu Aug 26 13:33:46 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of apparently unnecessary instance dependency
  showContextPatch for Prim was sometimes constructing a Patch
  (with the PP constructor) for no apparent reason, as the end result
  would be to show the underlying Prim again.
  

Thu Aug 26 13:55:37 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * break Patch-specific bits of Show and Viewing out into V1

Thu Aug 26 14:27:58 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * drop some exports from Darcs.Patch
  Made imports go directly to the internal modules where necessary,
  on the grounds that it's better to be explicit when making use of
  internal operations.
  

Thu Aug 26 14:36:02 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of unnecessary superclass

Thu Aug 26 14:58:50 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * split up the Commute class
  Note that Prim is not an instance of the new Merge class,
  which reflects reality as Prims cannot always be merged.
  

Thu Aug 26 16:52:38 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * don't export Patch/RealPatch from Darcs.Patch
  This gets us closer to separating specific implementations from
  the interface.
  

Fri Aug 27 00:24:36 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move some Patchy instances into a separate file

Attachments

• fix-warnings-in-tests.dpatch
• unnamed

This patch bundle (with 26 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-d6c7af6813e6d25adad94e309417dca929f8de6b

Ganesh,

It looks like some file is missing:
Setup: can't find source for Darcs.Patch.V2 in src, dist/build/autogen

Unfortunately I didn't notice this till after I pushed it so darcswatch thinks 
it's applied, but actually I unpulled the patches as soon as I noticed the 
failure.  I wasn't sure how else to deal with it.  I could have used rollback 
but it would have taken me a while to figure out what to rollback.

Jason

Maybe I can't just unpull it.  Looks like buildbot accepts changes even 
when they don't build (which is a complete surprise to me).  I'll go ahead 
and push them all back because that state, although broken, seems more 
consistent than the current state.  Maybe I can push a rollback patch?

On Fri, 27 Aug 2010, Jason Dagit wrote:

>
> Jason Dagit <dagit@codersbase.com> added the comment:
>
> Maybe I can't just unpull it.  Looks like buildbot accepts changes even
> when they don't build (which is a complete surprise to me).  I'll go ahead
> and push them all back because that state, although broken, seems more
> consistent than the current state.  Maybe I can push a rollback patch?

I've just pushed a patch with the missing file. Sorry about that, I should 
have checked more carefully when there's this obvious potential to screw 
up :-(

Ganesh

On Fri, Aug 27, 2010 at 05:56:07 +0000, Jason Dagit wrote:
> Maybe I can't just unpull it.

In general, I believe it's a good idea to prefer rollback to unpulling
patches on darcs.net.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:kowey@jabber.fr (Jabber or Google Talk only)

This patch bundle (with 26 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-d6c7af6813e6d25adad94e309417dca929f8de6b