[python-committers] Untabifying the C codebase

[Gregory P. Smith]

On Sun, May 9, 2010 at 1:22 PM, Antoine Pitrou <solipsis at pitrou.net> wrote:
> Le dimanche 09 mai 2010 à 22:04 +0200, Victor Stinner a écrit :
>> Le dimanche 09 mai 2010 18:56:27, Antoine Pitrou a écrit :
>> > This was done in r81029 (trunk), r81031 (2.6), r81032 (3.x) and r81033
>> > (3.1). I'm mentioning the revision numbers because it seems
>> > python-checkins blocked the diffs, sensibly enough.
>>
>> Does "make patchcheck" detect tab indentation and trailing spaces regressions?
>
> No. As a matter of fact, I've never used "make patchcheck" and therefore
> always forget about its existence. Do you want to propose a patch for
> this?
>
>> > If you have patches pending and they don't apply cleanly anymore, you
>> > can either:
>> >  - use "patch -l", and then reformat the modified lines manually
>> >  - use "untabify.py -p" on your patch
>> > (http://svn.python.org/view/*checkout*/sandbox/trunk/untabify/untabify.py)
>>
>> Is it documented somewhere? In the developer FAQ?
>
> I don't think it should go into the developer FAQ, since it's only a
> temporary situation. IMHO it's sufficient to tell people about it when
> they ask on the tracker, or even to do the reformatting ourselves.
>
> (I don't think there are many patches pending on the set of modified
> files, but I could be mistaken)
>
> Regards
>
> Antoine.

fwiw, untabify.py seemed to work fine to keep the change I had in my
svn client in shape across this update.

 svn diff Modules/threadmodule.c >foo.diff
 svn revert Modules/threadmodule.c
 svn up  # update past the untabify changes
 ../untabify.py <foo.diff >foo-untabbed.diff
 patch -p0 <foo-untabbed.diff

Thanks for doing this Antoine (belated +1 from me).  It may cause some
temporary pain today and while dealing with existing patches on the
tracker (anyone want to script walking the tracker and
auto-untabifying patches that touch .c/.h files?) but it is worth it
for the future health of the code base.

-gps