From: Daniel Hahler <git@thequod.de>
To: git@vger.kernel.org
Cc: "René Scharfe" <l.s.r@web.de>, "Jeff King" <peff@peff.net>,
"Daniel Hahler" <git@thequod.de>
Subject: [PATCH] xdiff: trim common tail with -U0 after diff
Date: Fri, 23 Jun 2017 12:36:12 +0200 [thread overview]
Message-ID: <20170623103612.4694-1-git@thequod.de> (raw)
When -U0 is used, trim_common_tail should be called after `xdl_diff`, so
that `--indent-heuristic` (and other diff processing) works as expected.
It also removes the check for `!(xecfg->flags & XDL_EMIT_FUNCCONTEXT)`
added in e0876bca4, which does not appear to be necessary anymore after
moving the trimming down.
This only adds a test to t4061-diff-indent.sh, but should also have one for
normal (i.e. non-experimental) diff mode probably?!
Ref: https://github.com/tomtom/quickfixsigns_vim/issues/74#issue-237900460
---
t/t4061-diff-indent.sh | 15 +++++++++++++++
xdiff-interface.c | 7 ++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 2affd7a10..df3151393 100755
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh
@@ -116,6 +116,16 @@ test_expect_success 'prepare' '
4
EOF
+ cat <<-\EOF >spaces-compacted-U0-expect &&
+ diff --git a/spaces.txt b/spaces.txt
+ --- a/spaces.txt
+ +++ b/spaces.txt
+ @@ -4,0 +5,3 @@ a
+ +b
+ +a
+ +
+ EOF
+
tr "_" " " <<-\EOF >functions-expect &&
diff --git a/functions.c b/functions.c
--- a/functions.c
@@ -184,6 +194,11 @@ test_expect_success 'diff: --indent-heuristic with --histogram' '
compare_diff spaces-compacted-expect out-compacted4
'
+test_expect_success 'diff: --indent-heuristic with -U0' '
+ git diff -U0 --indent-heuristic old new -- spaces.txt >out-compacted5 &&
+ compare_diff spaces-compacted-U0-expect out-compacted5
+'
+
test_expect_success 'diff: ugly functions' '
git diff --no-indent-heuristic old new -- functions.c >out &&
compare_diff functions-expect out
diff --git a/xdiff-interface.c b/xdiff-interface.c
index d3f78ca2a..a7e0e3583 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -125,16 +125,17 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b)
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
{
+ int ret;
mmfile_t a = *mf1;
mmfile_t b = *mf2;
if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE)
return -1;
- if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT))
+ ret = xdl_diff(&a, &b, xpp, xecfg, xecb);
+ if (ret && !xecfg->ctxlen)
trim_common_tail(&a, &b);
-
- return xdl_diff(&a, &b, xpp, xecfg, xecb);
+ return ret;
}
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
--
2.13.1
next reply other threads:[~2017-06-23 10:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 10:36 Daniel Hahler [this message]
2017-06-23 19:13 ` [PATCH] xdiff: trim common tail with -U0 after diff Junio C Hamano
2017-06-23 19:37 ` Stefan Beller
2017-06-23 19:44 ` Junio C Hamano
2017-06-23 20:39 ` René Scharfe
2017-06-23 22:57 ` Daniel Hahler
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=20170623103612.4694-1-git@thequod.de \
--to=git@thequod.de \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--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).