darcs

Issue 1334 whitespace cleanup (after hashed-storage merge)

Title whitespace cleanup (after hashed-storage merge)
Priority wishlist Status resolved
Milestone 2.8.0 Resolved in 2.8.0
Superseder Nosy List Serware, darcs-devel, dmitry.kurochkin, kowey, stephen, thorkilnaur, tux_rocker, twb
Assigned To twb
Topics Devel

Created on 2009-01-28.23:26:46 by twb, last changed 2010-09-05.15:22:20 by tux_rocker.

Files
File name Uploaded Type Edit Remove
unnamed twb, 2009-01-28.23:44:17 text/plain
whitespace-cleanup-in-src_darcs_patch_.dpatch twb, 2009-01-28.23:44:17 text/x-darcs-patch
Messages
msg7240 (view) Author: twb Date: 2009-01-28.23:26:42
Eric Kow <kowey@darcs.net> writes:
> When darcs 2.2.1 comes out, I suggest that somebody submit a big bang
> whitespace patch bundle against its tag, and that we update the policy
> suite to test for trailing whitespace.

This can be done as an Emacs batch command:

    find [a-z]*/ \( -name \*.hs -o -name \*.lhs \) -exec \
      emacs --batch -q --no-site-file {} \
      -f universal-argument -f whitespace-cleanup -f save-buffer \;

Note that the above command only performs replacement within Haskell
files, not the TeX sources nor test scripts.

I suggest that you then commit each directory as a separate patch, to
reduce the huuuuuuge merge conflict pain that you will get.  (This is a
compromise; recording each file separately would be better for merging
but bloat the change log amazingly).

    find [a-z]*/ -depth -type d -exec \
      darcs record -am "Whitespace cleanup in {}." {} \;

Note the -depth above ensures that "per directory" doesn't record child
dirs, by recording those children first (depth-first search).

Finally, the glob [a-z]*/ is a kludgy way of saying "find . -name _darcs
-prune -o ...".
msg7242 (view) Author: twb Date: 2009-01-28.23:44:17
Here's an example I made to test my scripts were OK.
I just realized that Distribution/ wasn't whitespace-cleaned ^_^;;

Thu Jan 29 10:40:42 EST 2009  Trent W. Buck <trentbuck@gmail.com>
  * Whitespace cleanup in src/Darcs/Patch.
  * Whitespace cleanup in src/Darcs/SlurpDirectory.
  * Whitespace cleanup in src/Darcs/Repository.
  * Whitespace cleanup in src/Darcs/Commands.
  * Whitespace cleanup in src/Darcs.
  * Whitespace cleanup in src/Crypt.
  * Whitespace cleanup in src/win32/System.
  * Whitespace cleanup in src/win32.
  * Whitespace cleanup in src/.
  * Whitespace cleanup in tests/.
Attachments
msg7246 (view) Author: kowey Date: 2009-01-29.11:11:14
On Wed, Jan 28, 2009 at 23:44:19 -0000, Trent Buck wrote:
> Here's an example I made to test my scripts were OK.
> I just realized that Distribution/ wasn't whitespace-cleaned ^_^;;

Thanks!  I would be a bit careful about cleaning up initial whitespace,
on the other hand (since there may be semantic implications).
msg7247 (view) Author: twb Date: 2009-01-29.12:20:27
On Thu, Jan 29, 2009 at 11:11:17AM -0000, Eric Kow wrote:
> 
> Eric Kow <kowey@darcs.net> added the comment:
> 
> On Wed, Jan 28, 2009 at 23:44:19 -0000, Trent Buck wrote:
> > Here's an example I made to test my scripts were OK.
> > I just realized that Distribution/ wasn't whitespace-cleaned ^_^;;
> 
> Thanks!  I would be a bit careful about cleaning up initial whitespace,
> on the other hand (since there may be semantic implications).

Then we need better tests :-)
msg7387 (view) Author: twb Date: 2009-03-03.00:58:30
On Wed, Jan 28, 2009 at 12:26:42PM +0000, Trent Buck wrote:
> Eric Kow <kowey@darcs.net> writes:
>> When darcs 2.2.1 comes out, I suggest that somebody submit a big
>> bang whitespace patch bundle against its tag, and that we update
>> the policy suite to test for trailing whitespace.

This didn't happen because the 2.2.1 release was subdued, and I
completely forgot about this ticket.  Shall we retarget this for
post-2.3.0?
msg7390 (view) Author: kowey Date: 2009-03-03.08:35:20
On Tue, Mar 03, 2009 at 00:58:33 -0000, Trent Buck wrote:
> This didn't happen because the 2.2.1 release was subdued, and I
> completely forgot about this ticket.  Shall we retarget this for
> post-2.3.0?

sure
msg7982 (view) Author: twb1 Date: 2009-07-22.02:15:42
Ping!  Is it time to do this yet?
msg7983 (view) Author: kowey Date: 2009-07-22.03:15:43
On Wed, Jul 22, 2009 at 02:15:43 +0000, twb1 wrote:
> Ping!  Is it time to do this yet?

Thanks for the ping.  I really do want to get rid of this, but I think
we should postpone it till we've pulled in what we can from David's
branch and decided that it's no longer worth it to try and maintain
them.
msg8305 (view) Author: twb Date: 2009-08-20.03:10:32
Blocked by issueNNNN, merging from droundy's personal Darcs fork.
msg8581 (view) Author: twb Date: 2009-08-29.03:34:07
How about now?
msg8799 (view) Author: kowey Date: 2009-09-12.20:18:03
I promise not to stall on this for David's branch any longer.
But can we wait till darcs-hs is merged?
msg9509 (view) Author: twb Date: 2009-11-30.06:25:34
Eric Kow wrote:

>> How about now?
> But can we wait till darcs-hs is merged?

How about now?
msg9514 (view) Author: kowey Date: 2009-11-30.21:15:30
Please do this immediately after patch37 is accepted.
msg11498 (view) Author: tux_rocker Date: 2010-06-20.14:05:54
The hashed-storage work and UTF-8 metadata are both in, so could we do
this now?
msg11499 (view) Author: kowey Date: 2010-06-20.14:09:15
On Sun, Jun 20, 2010 at 14:05:55 +0000, Reinier Lamers wrote:
> The hashed-storage work and UTF-8 metadata are both in, so could we do
> this now?

Yes.  After this, we could just tell people we've followed up their work
with whitespace cleanup (I'm personally starting to shift to "it's not
worth it", though, sort of a losing battle)

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
msg11533 (view) Author: kowey Date: 2010-06-21.22:15:44
I've resolved with with a series of nine patches in 2.6.0 HEAD
History
Date User Action Args
2009-01-28 23:26:46twbcreate
2009-01-28 23:35:23twbsetassignedto: twb
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
2009-01-28 23:44:19twbsetfiles: + whitespace-cleanup-in-src_darcs_patch_.dpatch, unnamed
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
status: unread -> unknown
messages: + msg7242
2009-01-29 11:11:17koweysetnosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
messages: + msg7246
2009-01-29 12:20:29twbsetnosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
messages: + msg7247
2009-03-03 00:58:33twbsetnosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
messages: + msg7387
2009-03-03 08:35:23koweysetnosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
messages: + msg7390
2009-03-03 10:14:30twbsetnosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
title: Whitespace cleanup after Darcs 2.2.1. -> Whitespace cleanup after Darcs 2.3.0.
2009-04-09 11:27:48koweysetpriority: wishlist
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin
topic: + Target-2.3
2009-07-22 02:15:43twb1setnosy: + twb1
messages: + msg7982
2009-07-22 03:15:46koweysetnosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin, twb1
messages: + msg7983
2009-08-06 13:38:07adminsetnosy: + Serware, stephen, - twb1
2009-08-06 13:56:40koweysettopic: + Target-2.4, - Target-2.3
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
title: Whitespace cleanup after Darcs 2.3.0. -> Whitespace cleanup after merging with David's branch (as much as possible)
2009-08-19 10:55:23koweysetstatus: unknown -> waiting-for
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
2009-08-19 10:55:38koweysettopic: + Devel
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
2009-08-20 03:10:34twbsetstatus: waiting-for -> deferred
nosy: kowey, simon, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
messages: + msg8305
2009-08-25 17:40:08adminsetnosy: + darcs-devel, - simon
2009-08-27 14:28:33adminsetnosy: kowey, darcs-devel, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
2009-08-29 03:34:10twbsetnosy: kowey, darcs-devel, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
messages: + msg8581
2009-09-12 20:18:07koweysetstatus: deferred -> waiting-for
nosy: kowey, darcs-devel, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
messages: + msg8799
title: Whitespace cleanup after merging with David's branch (as much as possible) -> whitespace cleanup (after hashed-storage merge)
2009-09-14 10:54:43koweysettopic: + Target-2.5, - Target-2.4
nosy: kowey, darcs-devel, twb, thorkilnaur, dmitry.kurochkin, Serware, stephen
2009-10-23 22:46:04adminsetnosy: + serware, - Serware
2009-10-23 23:31:38adminsetnosy: + Serware, - serware
2009-11-30 06:25:36twbsetmessages: + msg9509
2009-11-30 21:15:34koweysetmessages: + msg9514
2009-12-29 18:12:06ganeshlinkpatch124 issues
2010-06-15 20:52:00adminsetmilestone: 2.5.0
2010-06-15 20:59:25adminsettopic: - Target-2.5
2010-06-20 14:05:55tux_rockersetnosy: + tux_rocker
messages: + msg11498
2010-06-20 14:09:16koweysetstatus: waiting-for -> needs-implementation
messages: + msg11499
2010-06-21 22:15:45koweysetstatus: needs-implementation -> resolved
messages: + msg11533
resolvedin: 2.8.0
2010-09-05 15:22:20tux_rockersetmilestone: 2.5.0 -> 2.8.0