[darcs-devel] [patch2014] change rebase to store Prims

Ganesh Sittampalam bugs at darcs.net
Thu Mar 5 12:34:33 UTC 2020


New submission from Ganesh Sittampalam <ganesh at earth.li>:

This builds on patch2008. I would also like to screen this soon.

The key patches are

  * use RebaseChange inside Suspended
  * use Named prim inside rebase

The rest are just ancillary cleanups etc.

After this bundle, the pending items (not ready to submit) are:

 - Moving to use SimpleConflict to communicate conflicts in
   unsuspended patches between the Rebase code and the rest of
   Darcs. I think this will move us a step closer to getting
   rid of fromAnonymousPrim.

 - Come to a final conclusion on the alternative representation
   that was called RebasePatch in my previous drafts. To recap,
   this was about whether we store fixups next to each primitive
   in a "to edit" patch. Now that we have fullUnwind, it's not
   necessary, and I think we shouldn't do it.

13 patches for repository darcs-unstable at darcs.net:screened:

patch 5bc9ce15457cf8e4c7a687684334c00683905aee
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:08:27 GMT 2020
  * introduce new rebase format
  
  The new rebase format is named rebase-2.16 on the assumption that
  it will be the one used in Darcs 2.16.
  
  The "new-style" format is now legacy, but still supported for
  upgrades so that repositories created during the 2.16 development
  cycle can be rescued.
  
  As of this patch, darcs-2.16 rebases are exactly the same format
  as new-style, but this will change without preserving backwards
  compatibility.

patch d21bec0e20ac76834ddebd17926431808c4a5f28
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:00 GMT 2020
  * introduce shim for new-style rebase
  
  This is just a newtype wrapper for now but will evolve
  to contain more of the existing code as that gets refactored.
  

patch ec5a8168c61acc7c35b289e737e951d2d0218307
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:29 GMT 2020
  * tests: remove some useless code resulting from copy+paste

patch db7971d45509835f773bfb54a0ff6b9e2037c7a0
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:00 GMT 2020
  * move D.P.Named.Wrapped into D.P.Rebase.Legacy namespace

patch 174d1bcbcb1a81170165f8cf44f05ef2b95ccc5a
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:00 GMT 2020
  * add read/show instances for RebaseChange
  
  This is in preparation for using RebaseChange in the rebase
  patch.
  
  It leads to some duplication with the ReadPatch/ShowPatch
  instances for RebaseItem, which will be cleaned up later.

patch a541fdf659408542ab9cf2d7b2b0d7d7189fe4d5
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:18 GMT 2020
  * use RebaseChange inside Suspended

patch 4d314afb6f215a23509c61a4b2b1d33ea5b7eaa8
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:18 GMT 2020
  * cleanups after switching to RebaseChange:
  
   - fromRebaseChange is now dead
  
   - toRebaseSelect is better named toRebaseChanges and is
     legacy-only
  

patch f6ba986b7edee79ec3e904144af721039bd2ddd9
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:18 GMT 2020
  * Darcs.Patch.Rebase.Item is now legacy-only

patch a95d752df325072f5f1dddaf0e08fa7d43d13cd4
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:18 GMT 2020
  * remove dead code/unneeded exports from D.P.R.Legacy.Item

patch 20f0e7f86f30e6f56cb69471dc1b2b7f2eeaeec7
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:18 GMT 2020
  * add comment about Read/Show for RebaseItem

patch 59d46efe0ccbfea72a54d1156c6d3f74d5fe508d
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:18 GMT 2020
  * rename D.P.Rebase.Viewing to D.P.Rebase.Change
  
  The module now only contains a single significant type (RebaseChange),
  and is no longer used just for viewing.

patch 4c634553e16198d82c11f65e7639ad34f40cb144
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:29 GMT 2020
  * use Named prim inside rebase
  
  Now that we unwind conflicts before putting them into
  rebase, the patches to be edited will now always be
  conflict-free.

patch 78ff0732f67f50708b6624a491b3f77ff02f9399
Author: Ganesh Sittampalam <ganesh at earth.li>
Date:   Thu Mar  5 12:09:30 GMT 2020
  * remove some unnecessary instances from D.P.R.Legacy.Item

----------
files: introduce-new-rebase-format.dpatch, patch-preview.txt, unnamed
messages: 21966
nosy: ganesh
status: needs-screening
title: change rebase to store Prims

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch2014>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 85889 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200305/ee18c3a8/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: introduce-new-rebase-format.dpatch
Type: application/x-darcs-patch
Size: 116620 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20200305/ee18c3a8/attachment-0003.bin>
-------------- next part --------------
.





More information about the darcs-devel mailing list