[MERGE] Less bazaar coding style regressions.

Martin Pool mbp at canonical.com
Tue Dec 9 01:48:10 GMT 2008


On Mon, Dec 8, 2008 at 10:56 AM, Marius Kruger <amanic at gmail.com> wrote:
>> Like John, I think I'd prefer this be done in test_source
>
> thats done in the latest patch
>
>>
>> and check
>> the whole working tree, except for things that are specifically
>> excluded, such as copied-in library source.  Then there's no chance of
>> missing things that are committed without checking them.  If there are
>> already things that would fail, let's just fix them up.
>
> Uhm, last time I checked, the bazaar source is riddled with trailing white
> space, try:
> bzr.dev>$ find -iname "*.py" | xargs grep -n -e ".* $" |wc -l
> 3319
>
> People have tried to remove it previously, but got it shot down. See eg:
> http://www.nabble.com/-MERGE--whitespace-normalization-td18634412.html

That thread got a bit broad and a bit bikesheddy.  (Which is not to
say everyone in that thread was bikeshedding.)  Also, the proposed
change "normalization" there seems broader and maybe more error prone
than just stripping trailing whitespace.

Trailing whitespace is not really a pain point for me but obviously it
is for you or you wouldn't be posting?  If we're going to address it
I'd rather have a proper test along the lines of test_source that
doesn't look only at uncommitted changes, and doing that requires
stripping out the existing whitespace.

I'd merge a change that takes it off.  It's easy enough to catch up
with this when merging later, and it'll avoid the issue coming back
again.

-- 
Martin <http://launchpad.net/~mbp/>



More information about the bazaar mailing list