Re: [PATCH STABLE] patch: don't separate \r and \n when colorizing diff output

[Sune Foldager]

On Jul 10, 2018, at 02:54 PM, Yuya Nishihara <yuya at tcha.org> wrote:


On Tue, 10 Jul 2018 13:20:34 +0200, Sune Foldager via Mercurial-devel wrote:

# HG changeset patch
# User Sune Foldager <cryo at cyanite.org>
# Date 1531221514 -7200
# Tue Jul 10 13:18:34 2018 +0200
# Branch stable
# Node ID 37b29ae6598324a8079f1d6d0cb973068a628ab7
# Parent 3a0f322af1926e52322d2cff90a71529f359f2d9
patch: don't separate \r and \n when colorizing diff output

Queued for default since it's close to freeze and this isn't a critical issue.


Yes, that's fine. I'll keep it in my patch queue for now anyway :)



Thanks. Can you add some tests as a follow up?


Yes, I suppose I can. I'll have a look.

 
FWIW I miss this bug which helped me to notice unwanted CRLF line ending.


Right. Typing -u in less (or giving it as command line option) shows CR as ^M again. It's just that less now shows isolated CR as ^M even without that option. It may be a bug in less or a feature, I don't know. At any rate, we shouldn't separate CR and LF.



/Sune


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20180710/dfcd53a6/attachment.html>