darcs

Patch 1201 clarify naming of applyPatches functions (and 2 more)

Title clarify naming of applyPatches functions (and 2 more)
Superseder Nosy List alex.aegf, ganesh
Related Issues
Status accepted Assigned To
Milestone

Created on 2014-10-22.07:11:16 by ganesh, last changed 2014-11-03.19:38:32 by gh.

Files
File name Status Uploaded Type Edit Remove
clarify-naming-of-applypatches-functions.dpatch ganesh, 2014-10-22.07:11:15 application/x-darcs-patch
patch-preview.txt ganesh, 2014-10-22.07:11:15 text/x-darcs-patch
unnamed ganesh, 2014-10-22.07:11:15
See mailing list archives for discussion on individual patches.
Messages
msg17712 (view) Author: ganesh Date: 2014-10-22.07:11:15
A few code simplifications and a bugfix.

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

Tue Oct 21 15:06:58 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * clarify naming of applyPatches functions

Tue Oct 21 17:08:25 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * Share applyPatches code between pull and apply
  
  Abstract the applyPatches function from the apply command, and make pull
  use it.
  
  This means the following changes to apply:
  
   - The outcome is now displayed using 'putInfo', which means it will
     respect options like '-q' where it didn't before. This seems reasonable.
  
  It means the following changes to pull:
  
   - We now call 'setEnvDarcsPatches'. This seems reasonable.
  
   - We now call 'withSignalsBlocked' when applying patches. I think this is
     harmless or an improvement.
  
   - The output messages are a bit more generic, but I don't think any important
     detail is lost.
  
   - We now call 'redirectOutput' around the messages. --reply isn't passed
     to pull so this should make no difference.
  

Tue Oct 21 19:24:11 BST 2014  Ganesh Sittampalam <ganesh@earth.li>
  * resolve issue2403: need to avoid moving the rebase patch to the end
  
  This bug is a pretty good example of why the "rebase internal patch" is a rather
  nasty hack - see 'Note [Rebase representation]' in src/Darcs/Patch/Rebase.hs
Attachments
msg17734 (view) Author: gh Date: 2014-11-03.19:38:20
>   * clarify naming of applyPatches functions

A comment/preparation patch, easy to get. OK.

> * Share applyPatches code between pull and apply

Introduces Darcs.UI.ApplyPatches, eliminates some code duplication. I
agree with the long description of the patch. Nice!

> * resolve issue2403: need to avoid moving the rebase patch to the end

Fixes rebase pull --reorder by only reordering patches that are not
"internal" (= everyone except the rebase patch).
Thanks for the comment on tentativelyReplacePatches.
Accepted.
History
Date User Action Args
2014-10-22 07:11:16ganeshcreate
2014-10-22 08:48:23ganeshsetstatus: needs-screening -> needs-review
2014-11-03 19:38:21ghsetnosy: + alex.aegf
messages: + msg17734
2014-11-03 19:38:32ghsetstatus: needs-review -> accepted