From: Antoine Pelisse <apelisse@gmail.com>
To: git@vger.kernel.org
Cc: Antoine Pelisse <apelisse@gmail.com>
Subject: [PATCH] diff: Fix rename pretty-print when suffix and prefix overlap
Date: Thu, 28 Feb 2013 22:55:40 +0100 [thread overview]
Message-ID: <1362088540-14564-1-git-send-email-apelisse@gmail.com> (raw)
In-Reply-To: <CALWbr2yviqF68zF7mBbhaXW7oFar0YRqROBWXwqjo7UNgZNVBQ@mail.gmail.com>
When considering a rename for two files that have a suffix and a prefix
that can overlap, a confusing line is shown. As an example, renaming
"a/b/b/c" to "a/b/c" shows "a/b/{ => }/b/c", instead of "a/b/{b => }/c"
Currently, what we do is calculate the common prefix ("a/b/"), and the
common suffix ("/b/c"), but the same "/b/" is actually counted both in
prefix and suffix. Then when calculating the size of the non-common part,
we end-up with a negative value which is reset to 0, thus the "{ => }".
Do not allow the common suffix to overlap the common prefix and stop
when reaching a "/" that would be in both.
Also add some test file to place corner-cases we could met (and this one)
with rename pretty print.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
---
diff.c | 11 +++++++++-
t/t4056-rename-pretty.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
create mode 100755 t/t4056-rename-pretty.sh
diff --git a/diff.c b/diff.c
index 9038f19..e1d82c9 100644
--- a/diff.c
+++ b/diff.c
@@ -1177,7 +1177,16 @@ static char *pprint_rename(const char *a, const char *b)
old = a + len_a;
new = b + len_b;
sfx_length = 0;
- while (a <= old && b <= new && *old == *new) {
+ /*
+ * Note:
+ * if pfx_length is 0, old/new will never reach a - 1 because it
+ * would mean the whole string is common suffix. But then, the
+ * whole string would also be a common prefix, and we would not
+ * have pfx_length equals 0.
+ */
+ while (a + pfx_length - 1 <= old &&
+ b + pfx_length - 1 <= new &&
+ *old == *new) {
if (*old == '/')
sfx_length = len_a - (old - a);
old--;
diff --git a/t/t4056-rename-pretty.sh b/t/t4056-rename-pretty.sh
new file mode 100755
index 0000000..806046f
--- /dev/null
+++ b/t/t4056-rename-pretty.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+test_description='Rename pretty print
+
+'
+
+. ./test-lib.sh
+
+test_expect_success nothing_common '
+ mkdir -p a/b/ &&
+ : >a/b/c &&
+ git add a/b/c &&
+ git commit -m. &&
+ mkdir -p c/b/ &&
+ git mv a/b/c c/b/a &&
+ git commit -m. &&
+ git show -M --summary >output &&
+ test_i18ngrep "a/b/c => c/b/a" output
+'
+
+test_expect_success common_prefix '
+ mkdir -p c/d &&
+ git mv c/b/a c/d/e &&
+ git commit -m. &&
+ git show -M --summary >output &&
+ test_i18ngrep "c/{b/a => d/e}" output
+'
+
+test_expect_success common_suffix '
+ mkdir d &&
+ git mv c/d/e d/e &&
+ git commit -m. &&
+ git show -M --summary >output &&
+ test_i18ngrep "{c/d => d}/e" output
+'
+
+test_expect_success common_suffix_prefix '
+ mkdir d/f &&
+ git mv d/e d/f/e &&
+ git commit -m. &&
+ git show -M --summary >output &&
+ test_i18ngrep "d/{ => f}/e" output
+'
+
+test_expect_success common_overlap '
+ mkdir d/f/f &&
+ git mv d/f/e d/f/f/e &&
+ git commit -m. &&
+ git show -M --summary >output &&
+ test_i18ngrep "d/f/{ => f}/e" output
+'
+
+
+test_done
--
1.7.9.5
next prev parent reply other threads:[~2013-02-28 21:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-23 16:48 [PATCH] diff: Fix rename pretty-print when suffix and prefix overlap Antoine Pelisse
2013-02-24 9:15 ` Junio C Hamano
2013-02-25 19:50 ` Antoine Pelisse
2013-02-25 22:36 ` Philip Oakley
2013-02-25 22:41 ` Antoine Pelisse
2013-02-28 21:55 ` Antoine Pelisse [this message]
2013-02-28 22:14 ` Thomas Rast
2013-02-28 22:22 ` Antoine Pelisse
2013-02-28 22:29 ` Junio C Hamano
2013-03-02 14:38 ` [PATCH] tests: make sure rename pretty print works Antoine Pelisse
2013-03-03 6:50 ` Junio C Hamano
2013-03-06 21:36 ` [PATCH v2] " Antoine Pelisse
2013-03-06 22:03 ` Junio C Hamano
2013-02-26 20:47 ` [PATCH] diff: prevent pprint_rename from underrunning input Thomas Rast
2013-02-26 21:44 ` Junio C Hamano
2013-02-27 13:27 ` Antoine Pelisse
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=1362088540-14564-1-git-send-email-apelisse@gmail.com \
--to=apelisse@gmail.com \
--cc=git@vger.kernel.org \
/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).