darcs

Patch 1469 random cleanups and refactorings

Title random cleanups and refactorings
Superseder Nosy List bfrk
Related Issues
Status accepted Assigned To
Milestone

Created on 2016-03-17.22:12:51 by bfrk, last changed 2016-04-11.17:39:17 by gh.

Files
File name Status Uploaded Type Edit Remove
cleanup_-break-over_long-line-in-d_r_merge.dpatch bfrk, 2016-03-17.22:12:50 application/x-darcs-patch
patch-preview.txt bfrk, 2016-03-17.22:12:50 text/x-darcs-patch
unnamed bfrk, 2016-03-17.22:12:50 text/plain
See mailing list archives for discussion on individual patches.
Messages
msg19091 (view) Author: bfrk Date: 2016-03-17.22:12:50
A list of small cleanups and refactors that came up during the last few
weeks. The 8th patch (refactor: use maybeRestrictSubpaths) depends on an
addition to Darcs.Repository.State from one of the patches in my previous
bundle, otherwise they should be independent.

11 patches for repository http://darcs.net/screened:

patch 2a335425a22afd6fe4cd5766c0ebda20b45ea190
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Wed Mar  9 21:16:41 CET 2016
  * cleanup: break over-long line in D.R.Merge

patch 4d2710838c1f3daa7db6cbb90f34e113739bc125
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Wed Mar  9 21:25:58 CET 2016
  * cleanup in revert command: use debugMessage for debug messages

patch 817f93d6067008712c4ea5fe01fa873d94aee071
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Thu Mar 10 20:57:33 CET 2016
  * two simple refactorings in the conflict resolution code

patch 332294a89b67d8f14feb0c1f9d1dddef7e028938
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Thu Mar 10 18:10:26 CET 2016
  * fixed Darcs.Util.English.andClauses and orClauses
  
  These were missing the comma before the and/or with three or more items.

patch 677df463f2da37c1b345f85d51b85e0d9f407ed5
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Sun Mar 13 01:26:32 CET 2016
  * small code layout fix in whatsnew command

patch fc117e1ebcdd4e488e69febe851162566ffad7e2
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Sun Mar 13 16:11:01 CET 2016
  * replace Darcs.Util.Printer.<> with <> from Data.Monoid; restructured haddocks
  
  This change avoids unnecessary name conflicts when importing <> from both
  Darcs.Util.Printer and Data.Monoid. The change is semantically transparent,
  since (Doc,<>,empty) /is/ a monoid and the new instance Monoid Doc says so.

patch ed170a55fa480f253a3ccecc49a8966ad81eb16c
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Tue Mar 15 10:15:31 CET 2016
  * refactor: use Darcs.Util.English.capitalize

patch f2e2db5c2161d189a28dad81d31ec411d8e090e7
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Tue Mar 15 11:51:39 CET 2016
  * refactor: use maybeRestrictSubpaths

patch 3904e1f98b180772753a44627b5a0cf092520e08
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Tue Mar 15 11:52:50 CET 2016
  * slightly improved chaotic indentations and import lists

patch 66835d629853eb4f9ddca4e92930441c042c1779
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Thu Mar 17 22:36:24 CET 2016
  * accept issue2480: display unicode in patch content
  
  Since the issue is and probably will remain unresolved for the near future,
  I marked it as a failing test.

patch a717cef8a5c63e47cba4641d75ee7c09edcbc47b
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Wed Mar  9 21:34:15 CET 2016
  * revert command: be quiet when requested
  
  Also made the final "Finished reverting" appear only if we don't exit early
  (because there is nothing to do). This has the nice side-effect of getting
  rid of an ugly extra type signature in the code.
Attachments
msg19127 (view) Author: gh Date: 2016-04-01.19:35:07
* cleanup: break over-long line in D.R.Merge
* cleanup in revert command: use debugMessage for debug messages
* two simple refactorings in the conflict resolution code:
* small code layout fix in whatsnew command
* refactor: use Darcs.Util.English.capitalize
* refactor: use maybeRestrictSubpaths

    OK these are simple ones

* slightly improved chaotic indentations and import lists:

    I'm not sure that was necessary (especially the import) but why not.

* accept issue2480: display unicode in patch content: OK
* revert command: be quiet when requested: OK

* fixed Darcs.Util.English.andClauses and orClauses:

    Fine for me although it's more a change of convention than a fix.
    (oxford vs. non-oxford comma IIUC?)

* replace Darcs.Util.Printer.<> with <> from Data.Monoid; restructured
haddocks:

   OK , and thank for the comments.



Accepted (modulo dependencies get accepted too).
msg19144 (view) Author: bfrk Date: 2016-04-05.21:20:00
> * fixed Darcs.Util.English.andClauses and orClauses:
> 
>    Fine for me although it's more a change of convention than a fix.
>    (oxford vs. non-oxford comma IIUC?)

Disclaimer: I am not a native English speaker and I never heard anything
about oxford vs. non-oxford comma. But I have read lots of english texts
over the years and IME the extra comma before the "and"/"or" seems to be
ubiquitous.
History
Date User Action Args
2016-03-17 22:12:51bfrkcreate
2016-03-17 22:45:01bfrksetstatus: needs-screening -> needs-review
2016-04-01 19:35:08ghsetstatus: needs-review -> accepted-pending-tests
messages: + msg19127
2016-04-05 21:20:01bfrksetmessages: + msg19144
2016-04-11 17:39:17ghsetstatus: accepted-pending-tests -> accepted