From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Tiago Botelho <tiagonbotelho@gmail.com>,
git <git@vger.kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Harald Nordgren <haraldnordgren@gmail.com>,
Tiago Botelho <tiagonbotelho@hotmail.com>
Subject: Re: [RFC PATCH v5] Implement --first-parent for git rev-list --bisect
Date: Tue, 26 Jun 2018 13:59:32 +0200 [thread overview]
Message-ID: <CAP8UFD3oEjW75qsk4d_wqo2V8PmzMvZLshutw20CD7AU4b4ocg@mail.gmail.com> (raw)
In-Reply-To: <xmqq4lhqpy80.fsf@gitster-ct.c.googlers.com>
On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Tiago Botelho <tiagonbotelho@gmail.com> writes:
>
>> +test_expect_success "--bisect-all --first-parent" '
>> +cat >expect1 <<EOF &&
>> +$(git rev-parse CC) (dist=2)
>> +$(git rev-parse EX) (dist=1)
>> +$(git rev-parse D) (dist=1)
>> +$(git rev-parse FX) (dist=0)
>> +EOF
>> +
>> +cat >expect2 <<EOF &&
>> +$(git rev-parse CC) (dist=2)
>> +$(git rev-parse D) (dist=1)
>> +$(git rev-parse EX) (dist=1)
>> +$(git rev-parse FX) (dist=0)
>> +EOF
>> +
>> +git rev-list --bisect-all --first-parent FX ^A >actual &&
>> + ( test_cmp expect1 actual || test_cmp expect2 actual )
>> +'
>
> I hate to say this, but the above looks like a typical
> unmaintainable mess.
>
> What happens when you or somebody else later needs to update the
> graph to be tested to add one more commit (or even more)? Would it
> be enough to add another "rev-parse" plus "dist=X" line in both
> expects? Or do we see a trap for combinatorial explosion that
> requires us to add new expect$N?
What about the following then:
test_dist_order () {
file="$1"
n="$2"
while read -r hash dist
do
d=$(echo "$dist" | sed -e "s/(dist=\(.*\))/\1/")
case "$d" in
''|*[!0-9]*) return 1 ;;
*) ;;
esac
test "$d" -le "$n" || return 1
n="$d"
done <"$file"
}
test_expect_success "--bisect-all --first-parent" '
cat >expect <<EOF &&
$(git rev-parse CC) (dist=2)
$(git rev-parse EX) (dist=1)
$(git rev-parse D) (dist=1)
$(git rev-parse FX) (dist=0)
EOF
sort expect >expect_sorted &&
git rev-list --bisect-all --first-parent FX ^A >actual &&
sort actual >actual_sorted &&
test_cmp expect_sorted actual_sorted &&
test_dist_order actual 2
'
This feels overkill to me, but it should scale if we ever make more
complex tests.
next prev parent reply other threads:[~2018-06-26 11:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-22 12:39 [RFC PATCH v5] Implement --first-parent for git rev-list --bisect Tiago Botelho
2018-06-25 17:33 ` Junio C Hamano
2018-06-26 11:59 ` Christian Couder [this message]
2018-06-26 14:10 ` Johannes Schindelin
2018-06-26 15:41 ` Christian Couder
2018-06-26 21:16 ` Johannes Schindelin
2018-06-26 22:20 ` Junio C Hamano
2018-06-27 11:48 ` Johannes Schindelin
2018-06-27 16:26 ` Junio C Hamano
2018-06-28 13:08 ` Johannes Schindelin
2018-06-28 16:12 ` Junio C Hamano
2018-06-29 11:20 ` Johannes Schindelin
2018-07-03 21:33 ` Tiago Botelho
2018-07-03 22:36 ` Junio C Hamano
2018-07-04 10:26 ` Johannes Schindelin
2018-07-06 18:14 ` Junio C Hamano
2018-07-06 20:33 ` Johannes Schindelin
2018-07-06 21:43 ` 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
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=CAP8UFD3oEjW75qsk4d_wqo2V8PmzMvZLshutw20CD7AU4b4ocg@mail.gmail.com \
--to=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=haraldnordgren@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=tiagonbotelho@gmail.com \
--cc=tiagonbotelho@hotmail.com \
/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).