darcs

Patch 1202 generalise applyPatchesForRebase along t... (and 3 more)

Title generalise applyPatchesForRebase along t... (and 3 more)
Superseder Nosy List ganesh
Related Issues
Status accepted Assigned To
Milestone

Created on 2014-10-22.07:56:24 by ganesh, last changed 2014-11-03.21:18:53 by gh.

Files
File name Status Uploaded Type Edit Remove
generalise-applypatchesforrebase-along-the-same-lines-as-applypatches.dpatch ganesh, 2014-10-22.07:56:24 application/x-darcs-patch
patch-preview.txt ganesh, 2014-10-22.07:56:24 text/x-darcs-patch
unnamed ganesh, 2014-10-22.07:56:24
See mailing list archives for discussion on individual patches.
Messages
msg17713 (view) Author: ganesh Date: 2014-10-22.07:56:24
This sequence of patches adds a 'rebase apply' command, along the same
lines as 'rebase pull', i.e. it suspends any local patches that are in 
conflict with the bundle. 

I'm going to leave it in-discussion for a few days as I have some
reservations about the abstraction in the second patch below.

This bundle follows on from patch1201.

4 patches for repository darcs-unstable@darcs.net:screened:

Tue Oct 21 20:55:33 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * generalise applyPatchesForRebase along the same lines as applyPatches

Wed Oct 22 01:22:50 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * reuse the standard pullCmd for rebase
  
  This involves a rather complicated abstraction that would be major overkill
  for the approximately 6 lines of copy and pasted code that it saves.
  
  However it should extend to applyCmd, which is substantially bigger.
  

Wed Oct 22 01:55:42 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * switch applyCmd to use the PatchApplier abstraction

Wed Oct 22 08:34:48 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * resolve issue2409: implement darcs rebase apply
Attachments
msg17741 (view) Author: gh Date: 2014-11-03.21:18:53
>  * generalise applyPatchesForRebase along the same lines as applyPatches

OK

> * reuse the standard pullCmd for rebase

I quite like this one even if the class seems overkill (so far).

> * switch applyCmd to use the PatchApplier abstraction

OK, simple.

> * resolve issue2409: implement darcs rebase apply

OK, simple.

Thanks for splitting the work in various easy to follow patches :)
And for the shell test.

Accepted.
History
Date User Action Args
2014-10-22 07:56:24ganeshcreate
2014-10-22 08:49:27ganeshsetstatus: needs-screening -> in-discussion
2014-10-25 18:33:00ganeshsetstatus: in-discussion -> needs-review
2014-11-03 21:18:53ghsetstatus: needs-review -> accepted
messages: + msg17741