Patchwork [V2] tests: add diff color trailing whitespace test

login
register
mail settings
Submitter via Mercurial-devel
Date July 11, 2018, 9:40 p.m.
Message ID <95fc4453e33a79acca36.1531345232@firefly.edlund.dk>
Download mbox | patch
Permalink /patch/32801/
State Accepted
Headers show

Comments

via Mercurial-devel - July 11, 2018, 9:40 p.m.
# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1531318293 -7200
#      Wed Jul 11 16:11:33 2018 +0200
# Node ID 95fc4453e33a79acca36f978019a05ff9f4ae04a
# Parent  4d5fb4062f0bb159230062701461fa6cab9b539b
tests: add diff color trailing whitespace test
Yuya Nishihara - July 12, 2018, 12:09 p.m.
On Wed, 11 Jul 2018 23:40:32 +0200, Sune Foldager via Mercurial-devel wrote:
> # HG changeset patch
> # User Sune Foldager <cryo@cyanite.org>
> # Date 1531318293 -7200
> #      Wed Jul 11 16:11:33 2018 +0200
> # Node ID 95fc4453e33a79acca36f978019a05ff9f4ae04a
> # Parent  4d5fb4062f0bb159230062701461fa6cab9b539b
> tests: add diff color trailing whitespace test

Queued, thanks.

Patch

diff --git a/tests/test-diff-color.t b/tests/test-diff-color.t
--- a/tests/test-diff-color.t
+++ b/tests/test-diff-color.t
@@ -51,6 +51,27 @@  default context
    a
    c
 
+trailing whitespace
+
+  $ cp a a.orig
+  $ sed 's/^dd$/dd \r/' a >a.new
+  $ mv a.new a
+  $ hg diff --nodates
+  \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
+  \x1b[0;31;1m--- a/a\x1b[0m (esc)
+  \x1b[0;32;1m+++ b/a\x1b[0m (esc)
+  \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
+   c
+   a
+   a
+  \x1b[0;31m-b\x1b[0m (esc)
+  \x1b[0;32m+dd\x1b[0m\x1b[0;1;41m \x1b[0m\r (esc)
+   a
+   a
+   c
+
+  $ mv a.orig a
+
 (check that 'ui.color=yes' match '--color=auto')
 
   $ hg diff --nodates --config ui.formatted=no