[MERGE] rip off the trailing whitespace band-aid
Marius Kruger
amanic at gmail.com
Sat Jan 17 22:49:41 GMT 2009
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
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| <><
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090118/3772241f/attachment-0001.htm
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090117_2356-bzr.code_style_cleanup.patch
Type: text/x-patch
Size: 400 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090118/3772241f/attachment-0005.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090117_2357-bzr.code_style_cleanup.patch.bz2
Type: application/x-bzip2
Size: 291449 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090118/3772241f/attachment-0006.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090117_2357-bzr.code_style_cleanup.non-whitespace-changes.diff
Type: text/x-patch
Size: 30785 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090118/3772241f/attachment-0007.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090117_2357-bzr.code_style_cleanup.sourcetest-and-doc-updates.diff
Type: text/x-patch
Size: 9091 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090118/3772241f/attachment-0008.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090117_2357-bzr.code_style_cleanup.test-fixes.diff
Type: text/x-patch
Size: 2363 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090118/3772241f/attachment-0009.bin
More information about the bazaar
mailing list