From: Junio C Hamano <gitster@pobox•com>
To: Pete Wyckoff <pw@padd•com>, Luke Diamand <luke@diamand•org>
Cc: git@vger•kernel.org, Vitor Antunes <vitor.hda@gmail•com>
Subject: Re: [PATCH] t9814: Guarantee only one source exists in git-p4 copy tests
Date: Sun, 29 Mar 2015 20:03:13 -0700 [thread overview]
Message-ID: <xmqqk2xzxk3y.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1427671914-12131-1-git-send-email-vitor.hda@gmail.com> (Vitor Antunes's message of "Mon, 30 Mar 2015 00:31:54 +0100")
Vitor Antunes <vitor.hda@gmail•com> writes:
> * Modify source file (file2) before copying the file.
> * Check that only file2 is the source in the output of "p4 filelog".
> * Remove all "case" statements and replace them simple tests to check that
> source is "file2".
>
> Signed-off-by: Vitor Antunes <vitor.hda@gmail•com>
> ---
I am not a Perfoce user, so I'd like to ask Pete's and Luke's
comments on these changes.
> t/t9814-git-p4-rename.sh | 46 +++++++++++++++++++++++++++++++---------------
> 1 file changed, 31 insertions(+), 15 deletions(-)
>
> diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
> index 8b9c295..d8fb22d 100755
> --- a/t/t9814-git-p4-rename.sh
> +++ b/t/t9814-git-p4-rename.sh
> @@ -132,6 +132,9 @@ test_expect_success 'detect copies' '
> cd "$git" &&
> git config git-p4.skipSubmitEdit true &&
>
> + echo "file8" >> file2 &&
Style: please lose SP between redirection and its target, i.e.
echo file8 >>file2 &&
The same comment applies to everywhere else.
> + git commit -a -m "Differentiate file2" &&
> + git p4 submit &&
> cp file2 file8 &&
> git add file8 &&
> git commit -a -m "Copy file2 to file8" &&
> @@ -140,6 +143,10 @@ test_expect_success 'detect copies' '
> p4 filelog //depot/file8 &&
> p4 filelog //depot/file8 | test_must_fail grep -q "branch from" &&
>
> + echo "file9" >> file2 &&
> + git commit -a -m "Differentiate file2" &&
> + git p4 submit &&
> +
> cp file2 file9 &&
> git add file9 &&
> git commit -a -m "Copy file2 to file9" &&
> @@ -149,28 +156,39 @@ test_expect_success 'detect copies' '
> p4 filelog //depot/file9 &&
> p4 filelog //depot/file9 | test_must_fail grep -q "branch from" &&
>
> + echo "file10" >> file2 &&
> + git commit -a -m "Differentiate file2" &&
> + git p4 submit &&
> +
> echo "file2" >>file2 &&
> cp file2 file10 &&
> git add file2 file10 &&
> git commit -a -m "Modify and copy file2 to file10" &&
> git diff-tree -r -C HEAD &&
> + src=$(git diff-tree -r -C HEAD | sed 1d | sed 2d | cut -f2) &&
> + test "$src" = file2 &&
> git p4 submit &&
> p4 filelog //depot/file10 &&
> - p4 filelog //depot/file10 | grep -q "branch from //depot/file" &&
> + p4 filelog //depot/file10 | grep -q "branch from //depot/file2" &&
> +
> + echo "file11" >> file2 &&
> + git commit -a -m "Differentiate file2" &&
> + git p4 submit &&
>
> cp file2 file11 &&
> git add file11 &&
> git commit -a -m "Copy file2 to file11" &&
> git diff-tree -r -C --find-copies-harder HEAD &&
> src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
> - case "$src" in
> - file2 | file10) : ;; # happy
> - *) false ;; # not
> - esac &&
> + test "$src" = file2 &&
> git config git-p4.detectCopiesHarder true &&
> git p4 submit &&
> p4 filelog //depot/file11 &&
> - p4 filelog //depot/file11 | grep -q "branch from //depot/file" &&
> + p4 filelog //depot/file11 | grep -q "branch from //depot/file2" &&
> +
> + echo "file12" >> file2 &&
> + git commit -a -m "Differentiate file2" &&
> + git p4 submit &&
>
> cp file2 file12 &&
> echo "some text" >>file12 &&
> @@ -180,15 +198,16 @@ test_expect_success 'detect copies' '
> level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
> test -n "$level" && test "$level" -gt 0 && test "$level" -lt 98 &&
> src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
> - case "$src" in
> - file10 | file11) : ;; # happy
> - *) false ;; # not
> - esac &&
> + test "$src" = file2 &&
> git config git-p4.detectCopies $(($level + 2)) &&
> git p4 submit &&
> p4 filelog //depot/file12 &&
> p4 filelog //depot/file12 | test_must_fail grep -q "branch from" &&
>
> + echo "file13" >> file2 &&
> + git commit -a -m "Differentiate file2" &&
> + git p4 submit &&
> +
> cp file2 file13 &&
> echo "different text" >>file13 &&
> git add file13 &&
> @@ -197,14 +216,11 @@ test_expect_success 'detect copies' '
> level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
> test -n "$level" && test "$level" -gt 2 && test "$level" -lt 100 &&
> src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
> - case "$src" in
> - file10 | file11 | file12) : ;; # happy
> - *) false ;; # not
> - esac &&
> + test "$src" = file2 &&
> git config git-p4.detectCopies $(($level - 2)) &&
> git p4 submit &&
> p4 filelog //depot/file13 &&
> - p4 filelog //depot/file13 | grep -q "branch from //depot/file"
> + p4 filelog //depot/file13 | grep -q "branch from //depot/file2"
> )
> '
next prev parent reply other threads:[~2015-03-30 3:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-28 12:28 [PATCH 0/2] git-p4: Improve client path detection Vitor Antunes
2015-03-28 12:28 ` [PATCH 1/2] git-p4: Check branch detection and client view together Vitor Antunes
2015-03-28 12:28 ` [PATCH 2/2] git-p4: Improve client path detection when branches are used Vitor Antunes
2015-03-29 23:31 ` [PATCH] t9814: Guarantee only one source exists in git-p4 copy tests Vitor Antunes
2015-03-30 3:03 ` Junio C Hamano [this message]
2015-03-31 13:26 ` Luke Diamand
2015-03-31 23:29 ` [PATCH V2] " Vitor Antunes
2015-04-04 8:31 ` [PATCH] " Luke Diamand
2015-04-04 19:41 ` Junio C Hamano
2015-04-05 23:08 ` [PATCH V3] " Vitor Antunes
2015-04-05 19:27 ` [PATCH 0/2] git-p4: Improve client path detection Luke Diamand
2015-04-05 22:57 ` Vitor Antunes
2015-04-13 3:40 ` Junio C Hamano
2015-04-18 22:40 ` Vitor Antunes
2015-04-18 23:24 ` [PATCH] git-p4: Improve client path detection when branches are used Vitor Antunes
2015-04-19 0:58 ` Junio C Hamano
2015-04-19 10:59 ` Vitor Antunes
2015-04-20 5:32 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2xzxk3y.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=luke@diamand$(echo .)org \
--cc=pw@padd$(echo .)com \
--cc=vitor.hda@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox