[PATCH] mq: recognize the context format diff header when importing

[Steve Losh]

On Feb 15, 2010, at 2:19 PM, Patrick Mézard wrote:

> Le 15/02/10 08:10, Jozef Hatala a écrit :
>> Hello there.
>> 
>> mq.py's patchheader looks for the beginning of the actual patch and if
>> the patch is in the "context diff" format as opposed to the "unified
>> diff" format, patchheader does not find it and concludes that the patch
>> is empty when you qpush it.
>> 
>> The patch below makes patchheader recognize the '***'/'---' sequence in
>> addition to the usual '---'/'+++' sequence.
>> 
>> What do you think?
> 
> That is sad to deal with context diffs in 2010 :-)
> 
> That said, why not but this will have to wait for the next release and the end of the code freeze (beginning of march). If it looks this patch has been lost, do not hesitate to ping again for review.

One note: this patch modifies the old mq.patchheader, not my refactored version.  If my version goes in this would need to be updated.  It will probably be even cleaner to read in the end though.

> --
> Patrick Mézard
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel