[MERGE] rip off the trailing whitespace band-aid

Marius Kruger amanic at gmail.com
Sun Jan 18 18:16:12 GMT 2009


thanks Matt hopefully it works now, I tried:
bzr send -o ../2009-01/20090118_2008-bzr.code_style_cleanup.patch
http://bazaar-vcs.org/bzr/bzr.dev/ bzr+ssh://
bazaar.launchpad.net/%7Eamanica/bzr/code_style_cleanup/ --no-bundle
--no-patch

(I also tried sending the full merge directive but because its so big, its
been held for moderation and I'm not sure it made it through yet.)

sorry for all the spam

2009/1/18 Marius Kruger <amanic at gmail.com>

> hi,
> as promised, here it is.
>
> because the bundle and full patch is so big (1.1MB),
> I uploaded a branch
> https://code.launchpad.net/~amanica/bzr/code_style_cleanup<https://code.launchpad.net/%7Eamanica/bzr/code_style_cleanup>
> The merge directive for bundlebuggy is with --no-bundle and --no-patch but
> with the public branch,
> hope that is ok as I've not done that before.
> I attached a compressed version of the full merge directive.
>
> For easier reviewing I also attached diffs of
> 1) all the non-whitespace-changes I made
> bzr dif --old ../bzr.dev/ --diff-options -w  >
> ../20090117_2357-bzr.code_style_cleanup.non-whitespace-changes.diff
>
> 2) what I did before the code cleanup.
> bzr dif --old ../bzr.dev/ -r ..3948 >
> ../2009-01/20090117_2357-bzr.code_style_cleanup.sourcetest-and-doc-updates.diff
>
> 3) what I had to do to make the tests that required some trailing white
> space to pass again
> bzr dif -c 3947.1.2 >
> /stuph/projects/bzr/patches/2009-01/20090117_2357-bzr.code_style_cleanup.test-fixes.diff
>
>
> Some notes
> * I moved test_coding_style in with test_no_tabs, because no-tabs is also
> coding style and I didn't want us to read through all the source files
> another time needlessly.
> * I added tests for other code style conventions we already comply with.
> * I print out the number of long lines we have.
> * I noted the conventions we are now testing for in HACKING.
> * The cleanup was straight forward using a new command in my new plugin (
> https://launchpad.net/bzr-text-checker)
>    bzr$ bzr remove-trailing-whitespace bzr
>    bzr/bzrlib$ bzr remove-trailing-whitespace *.py
> * we only test bzr and bzrlib, ie not stuff in contrib, tools, NEWS, etc. I
> think we can add and clean them later if we wish to.
>
> --
> <| regards
> U| Marius
> H| <><
>
>


-- 
<| regards
U| Marius
H| <><
Z| http://amanica.blogspot.com/
<|
E| http://bazaar-vcs.org/
<| because I don't trust version control systems with less than 14570 unit
tests
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090118/6ab5ced3/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090118_2008-bzr.code_style_cleanup.patch
Type: text/x-patch
Size: 424 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090118/6ab5ced3/attachment.bin 


More information about the bazaar mailing list