thanks Matt hopefully it works now, I tried:<br>bzr send -o ../2009-01/20090118_2008-bzr.code_style_cleanup.patch <a href="http://bazaar-vcs.org/bzr/bzr.dev/">http://bazaar-vcs.org/bzr/bzr.dev/</a> bzr+ssh://<a href="http://bazaar.launchpad.net/%7Eamanica/bzr/code_style_cleanup/">bazaar.launchpad.net/%7Eamanica/bzr/code_style_cleanup/</a> --no-bundle --no-patch<br>
<br>(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.)<br><br>sorry for all the spam<br><br><div class="gmail_quote">2009/1/18 Marius Kruger <span dir="ltr"><<a href="mailto:amanic@gmail.com">amanic@gmail.com</a>></span><br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">hi,<br>as promised, here it is.<br><br>because the bundle and full patch is so big (1.1MB), <br>
I uploaded a branch <a href="https://code.launchpad.net/%7Eamanica/bzr/code_style_cleanup" target="_blank">https://code.launchpad.net/~amanica/bzr/code_style_cleanup</a><br>
The merge directive for bundlebuggy is with --no-bundle and --no-patch but with the public branch, <br>hope that is ok as I've not done that before.<br>I attached a compressed version of the full merge directive.<br>
<br>
For easier reviewing I also attached diffs of <br>1) all the non-whitespace-changes I made<br>bzr dif --old ../bzr.dev/ --diff-options -w > ../20090117_2357-bzr.code_style_cleanup.non-whitespace-changes.diff<br><br>2) what I did before the code cleanup.<br>
bzr dif --old ../bzr.dev/ -r ..3948 > ../2009-01/20090117_2357-bzr.code_style_cleanup.sourcetest-and-doc-updates.diff<br><br>3) what I had to do to make the tests that required some trailing white space to pass again<br>
bzr dif -c 3947.1.2 > /stuph/projects/bzr/patches/2009-01/20090117_2357-bzr.code_style_cleanup.test-fixes.diff<br><br><br>Some notes<br>* 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.<br>
* I added tests for other code style conventions we already comply with. <br>* I print out the number of long lines we have.<br>* I noted the conventions we are now testing for in HACKING.<br>* The cleanup was straight forward using a new command in my new plugin (<a href="https://launchpad.net/bzr-text-checker" target="_blank">https://launchpad.net/bzr-text-checker</a>)<br>
bzr$ bzr remove-trailing-whitespace bzr<br> bzr/bzrlib$ bzr remove-trailing-whitespace *.py<br>* 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.<br>
<font color="#888888">
<br>-- <br><| regards<br>U| Marius<br>H| <>< <br><br>
</font></blockquote></div><br><br clear="all"><br>-- <br><| regards<br>U| Marius<br>H| <>< <br>Z| <a href="http://amanica.blogspot.com/">http://amanica.blogspot.com/</a><br><| <br>E| <a href="http://bazaar-vcs.org/">http://bazaar-vcs.org/</a><br>
<| because I don't trust version control systems with less than 14570 unit tests<br>