From: Brian Henderson <henderson.bj@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net, e@80x24.org, gitster@pobox.com,
Brian Henderson <henderson.bj@gmail.com>
Subject: [PATCH v3 2/3] diff-highlight: add failing test for handling --graph output.
Date: Fri, 19 Aug 2016 10:08:11 -0700 [thread overview]
Message-ID: <20160819170812.1676-3-henderson.bj@gmail.com> (raw)
In-Reply-To: <20160819170812.1676-1-henderson.bj@gmail.com>
In-Reply-To: <20160819145123.73hf7ffysy53l3kz@sigill.intra.peff.net>
Signed-off-by: Brian Henderson <henderson.bj@gmail.com>
---
contrib/diff-highlight/t/t9400-diff-highlight.sh | 54 ++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 6b8a461..3b3c831 100755
--- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -85,10 +85,50 @@ dh_commit_test () {
test_cmp commit.exp commit.act
}
+# dh_test_setup_history takes a series (3) of changes and generates a contrived graph
+# of commits and merges
+dh_test_setup_history () {
+ a="$1" b="$2" c="$3"
+
+ printf "$a" >file &&
+ git add file &&
+ git commit -m"Add a file" &&
+
+ printf "$b" >file &&
+ git commit -am"Update a file" &&
+
+ git checkout -b branch &&
+ printf "$c" >file &&
+ git commit -am"Update a file on branch" &&
+
+ git checkout master &&
+ printf "$a" >file &&
+ git commit -am"Update a file again" &&
+
+ git checkout branch &&
+ printf "$b" >file &&
+ git commit -am"Update a file similar to master" &&
+
+ git merge master &&
+ git checkout master &&
+ git merge branch --no-ff
+}
+
+
test_chomp_eof () {
"$PERL_PATH" -pe 'chomp if eof'
}
+left_trim () {
+ "$PERL_PATH" -pe 's/^\s+//'
+}
+
+trim_graph_el () {
+ # graphs start with * or |
+ # followed by a space or / or \
+ "$PERL_PATH" -pe 's@^((\*|\|)( |/|\\))+@@'
+}
+
test_expect_success 'diff-highlight highlights the beginning of a line' '
dh_test \
"aaa\nbbb\nccc\n" \
@@ -145,6 +185,20 @@ test_expect_failure 'diff-highlight highlights mismatched hunk size' '
# TODO add multi-byte test
+test_expect_failure 'diff-highlight works with the --graph option' '
+ dh_test_setup_history \
+ "aaa\nbbb\nccc\n" \
+ "aaa\n0bb\nccc\n" \
+ "aaa\nb0b\nccc\n" &&
+
+ # topo-order so that the order of the commits is the same as with --graph
+ # trim graph elements so we can do a diff
+ # trim leading space because our trim_graph_el is not perfect
+ git log -p --topo-order | "$DIFF_HIGHLIGHT" | left_trim >graph.exp &&
+ git log -p --graph | "$DIFF_HIGHLIGHT" | trim_graph_el | left_trim >graph.act &&
+ test_cmp graph.exp graph.act
+'
+
test_done
# vim: set noet
--
2.9.0
next prev parent reply other threads:[~2016-08-19 17:08 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-30 15:11 [PATCH 0/3] diff-highlight: add support for git log --graph output Brian Henderson
2016-07-30 15:11 ` [PATCH 1/3] diff-highlight: add some tests Brian Henderson
2016-08-10 8:56 ` Eric Wong
2016-08-15 16:20 ` Brian Henderson
2016-08-15 16:25 ` Junio C Hamano
2016-08-17 15:31 ` [PATCH v2 0/3] diff-highlight: add support for git log --graph output Brian Henderson
2016-08-19 21:19 ` Eric Wong
2016-08-19 21:23 ` Jeff King
2016-08-17 15:31 ` [PATCH v2 1/3] diff-highlight: add some tests Brian Henderson
2016-08-17 19:09 ` Junio C Hamano
2016-08-19 14:42 ` Brian Henderson
2016-08-19 14:51 ` Jeff King
2016-08-19 15:13 ` Brian Henderson
2016-08-19 17:08 ` [PATCH v3 0/3] diff-highlight: add support for git log --graph output Brian Henderson
2016-08-19 17:08 ` [PATCH v3 1/3] diff-highlight: add some tests Brian Henderson
2016-08-19 18:10 ` Junio C Hamano
2016-08-19 19:30 ` Brian Henderson
2016-08-19 20:56 ` Eric Wong
2016-08-19 20:18 ` [PATCH] " Brian Henderson
2016-08-19 20:44 ` Junio C Hamano
2016-08-19 21:04 ` Jeff King
2016-08-19 22:31 ` Junio C Hamano
2016-08-22 15:55 ` Brian Henderson
2016-08-23 4:12 ` Jeff King
2016-08-29 17:33 ` [PATCH v4 0/3] diff-highlight: add support for --graph option Brian Henderson
2016-08-29 17:33 ` [PATCH v4 1/3] diff-highlight: add some tests Brian Henderson
2016-08-29 17:33 ` [PATCH v4 2/3] diff-highlight: add failing test for handling --graph output Brian Henderson
2016-08-29 17:33 ` [PATCH v4 3/3] diff-highlight: add support for " Brian Henderson
2016-08-29 21:37 ` [PATCH v4 0/3] diff-highlight: add support for --graph option Junio C Hamano
2016-08-30 14:07 ` Brian Henderson
2016-08-30 14:07 ` [PATCH v4 1/3] diff-highlight: add some tests Brian Henderson
2016-08-30 14:07 ` [PATCH v4 2/3] diff-highlight: add failing test for handling --graph output Brian Henderson
2016-08-30 14:07 ` [PATCH v4 3/3] diff-highlight: add support for " Brian Henderson
2016-08-31 5:02 ` [PATCH v4 0/3] diff-highlight: add support for --graph option Jeff King
2016-08-31 5:02 ` [PATCH 1/3] diff-highlight: ignore test cruft Jeff King
2016-08-31 5:03 ` [PATCH 2/3] diff-highlight: add multi-byte tests Jeff King
2016-08-31 5:05 ` [PATCH 3/3] diff-highlight: avoid highlighting combined diffs Jeff King
2016-08-30 8:11 ` [PATCH v4 0/3] diff-highlight: add support for --graph option Jeff King
2016-08-19 21:05 ` [PATCH] diff-highlight: add some tests Junio C Hamano
2016-08-19 17:08 ` Brian Henderson [this message]
2016-08-19 18:25 ` [PATCH v3 2/3] diff-highlight: add failing test for handling --graph output Junio C Hamano
2016-08-19 17:08 ` [PATCH v3 3/3] diff-highlight: add support for " Brian Henderson
2016-08-19 18:27 ` Junio C Hamano
2016-08-17 15:31 ` [PATCH v2 2/3] diff-highlight: add failing test for handling " Brian Henderson
2016-08-17 19:18 ` Junio C Hamano
2016-08-17 15:31 ` [PATCH v2 3/3] diff-highlight: add support for " Brian Henderson
2016-08-19 14:37 ` Jeff King
2016-08-15 16:40 ` [PATCH 1/3] diff-highlight: add some tests Lars Schneider
2016-08-16 20:48 ` Junio C Hamano
2016-08-24 9:38 ` Lars Schneider
2016-07-30 15:11 ` [PATCH 2/3] diff-highlight: add failing test for handling --graph output Brian Henderson
2016-07-30 15:11 ` [PATCH 3/3] diff-highlight: add support for " Brian Henderson
2016-08-01 17:16 ` Junio C Hamano
2016-08-04 15:02 ` [PATCH] diff-highlight: Add comment for our assumption about " Brian Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160819170812.1676-3-henderson.bj@gmail.com \
--to=henderson.bj@gmail.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).