[darcs-devel] resend of refactoring patches

Tommy Pettersson ptp at lysator.liu.se
Wed Sep 6 17:13:20 PDT 2006


On Wed, Sep 06, 2006 at 04:37:33PM -0400, David Roundy wrote:
> On Wed, Sep 06, 2006 at 09:17:28PM +0200, Juliusz Chroboczek wrote:
> > > I believe this set passes tests and applies cleanly to current
> > > darcs-devel.
> > 
> > Pretty close:
> > 
> >   * Fix merge conflicts.
> > 
> >     M ./Get.lhs -6 +10
> >     M ./Optimize.lhs -2 +2
> >     M ./Repository.lhs -14 +23
> >     M ./Tag.lhs -1 +1
> >     M ./list_authors.hs -2 +1
> > 
> > ...not counting a patch that you amend-recorded and sent twice.
> 
> Thanks! I think I wasn't sending from the repository I thought I was
> sending from.  :( It's hard to keep track of even one branch, when I
> keep travelling.

Now I'm confused.

I have a some weeks old branch (R1) with the refactoring patches
I've applied from the list (latest (but one, now) versions). It
has some simple conflicts that I've resolved. It has these
"extra" patches (@@ == different amend version from this patch
bundle).

R1
  
@@ Thu Aug  3 15:30:26 CEST 2006  David Roundy <droundy at darcs.net>
    * refactor tag.
  
@@ Thu Aug  3 15:32:30 CEST 2006  David Roundy <droundy at darcs.net>
    * partially refactor Optimize.
  
@@ Thu Aug  3 15:33:20 CEST 2006  David Roundy <droundy at darcs.net>
    * don't use DarcsRepo in list_authors.
  
@@ Thu Aug  3 16:03:42 CEST 2006  David Roundy <droundy at darcs.net>
    * refactor Repository to allow truly atomic updates.
  
Thu Aug  3 16:17:48 CEST 2006  David Roundy <droundy at darcs.net>
  * make get work with umask changes.

Fri Aug  4 15:18:17 CEST 2006  David Roundy <droundy at darcs.net>
  * simplify unrevert handling.
  This change also ends up having to do considerable refactoring in order to
  avoid recursive import loops.  But that's also nice in that it puts
  "simple" code into "simple" modules.

Sun Aug  6 00:15:53 CEST 2006  David Roundy <droundy at darcs.net>
  * refactor pending handling.

Sun Aug  6 14:25:48 CEST 2006  David Roundy <droundy at darcs.net>
  * fix obliterate bug revealed by latest test.





This patch bundle has the following "extra" patches:

R2

@@ Sun Jul 16 03:12:45 CEST 2006  David Roundy <droundy at darcs.net>
  * refactor Repository to allow truly atomic updates.

@@ Sun Jul 16 03:18:53 CEST 2006  David Roundy <droundy at darcs.net>
  * refactor tag.

Sun Jul 16 03:51:50 CEST 2006  David Roundy <droundy at darcs.net>
  * refactor Unrecord, adding tentativelyRemovePatches.

@@ Sun Jul 16 05:29:34 CEST 2006  David Roundy <droundy at darcs.net>
  * partially refactor Optimize.

@@ Sun Jul 16 05:34:50 CEST 2006  David Roundy <droundy at darcs.net>
  * don't use DarcsRepo in list_authors.

Sun Jul 30 22:54:52 CEST 2006  David Roundy <droundy at darcs.net>
  * add new test that triggers bug in refactoring.

Mon Jul 31 13:14:04 CEST 2006  David Roundy <droundy at darcs.net>
  * fix bug in pristine handling when dealing with multiple patches.





For completeness, here are the "common" patches:

COMMON

Sun Jul 16 04:02:47 CEST 2006  David Roundy <droundy at darcs.net>
  * add TODO to refactor unrevert handling.

Sun Jul 16 04:10:03 CEST 2006  David Roundy <droundy at darcs.net>
  * refactor amend-record.

Sun Jul 16 05:16:05 CEST 2006  David Roundy <droundy at darcs.net>
  * partial refactoring of Get.

Sun Jul 16 05:31:09 CEST 2006  David Roundy <droundy at darcs.net>
  * I've now eliminated need to export DarcsRepo.write_patch.

Sun Jul 16 05:43:19 CEST 2006  David Roundy <droundy at darcs.net>
  * partial refactoring in annotate.

Sun Jul 16 05:43:39 CEST 2006  David Roundy <droundy at darcs.net>
  * add TODO for refactoring get_markedup_file.

Sun Jul 16 05:48:37 CEST 2006  David Roundy <droundy at darcs.net>
  * refactor Population.

Wed Jul 26 14:16:55 CEST 2006  David Roundy <droundy at darcs.net>
  * fix bug in refactoring of get.

Wed Jul 26 14:17:37 CEST 2006  David Roundy <droundy at darcs.net>
  * simplify code a tad in get.

Sun Jul 30 12:38:54 CEST 2006  David Roundy <droundy at darcs.net>
  * make amend-record.pl test a bit pickier.

Sun Jul 30 13:14:09 CEST 2006  David Roundy <droundy at darcs.net>
  * fix ordering of operations to call pull_first_middles properly.




I got started reviewing the R1 version this week (during breaks
at work), but now I don't know what the latest version is. The
dates in R1 are newer, but there are some "extra extra" patches
in R2. Are these those who were missing from R1?


-- 
Tommy Pettersson <ptp at lysator.liu.se>




More information about the darcs-devel mailing list