From: Derrick Stolee <stolee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH 1/1] revision.c: use new topo-order logic in tests
Date: Tue, 20 Nov 2018 13:45:17 -0500 [thread overview]
Message-ID: <921606a2-3deb-2481-347a-6a2f5571ec9e@gmail.com> (raw)
In-Reply-To: <xmqqsgzw9syx.fsf@gitster-ct.c.googlers.com>
On 11/20/2018 1:13 AM, Junio C Hamano wrote:
> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> @@ -3143,6 +3144,9 @@ int prepare_revision_walk(struct rev_info *revs)
>> commit_list_sort_by_date(&revs->commits);
>> if (revs->no_walk)
>> return 0;
>> + if (revs->limited &&
>> + git_env_bool(GIT_TEST_COMMIT_GRAPH, 0))
>> + revs->limited = 0;
>> if (revs->limited) {
>> if (limit_list(revs) < 0)
>> return -1;
> That is equivalent to say
>
> if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0))
> revs->limited = 0;
Not exactly equivalent, because we can use short-circuiting to avoid the
git_env_bool check, but I see what you mean.
> Wouldn't that make the codepath that involves limit_list()
> completely unreachable while testing, though?
Testing with GIT_TEST_COMMIT_GRAPH=0 would still hit limit_list(). Both
modes are important to test (for instance, to ensure we still have
correct behavior without a commit-graph file).
> The title only mentions "topo-order" logic, but the topo-order is
> not the only reason why limited bit can be set, is it? When showing
> merges, simplifying merges, or post-processing to show ancestry
> path, or showing a bottom-limited revision range, the limited bit is
> automatically set because all of these depend on first calling
> limit_list() and then postprocessing its result. Doesn't it hurt
> these cases to unconditionally drop limited bit?
You're right that we only want to do this in the topo-order case, so
perhaps the diff should instead be:
if (revs->no_walk)
return 0;
+ if (revs->topo_order &&
+ git_env_bool(GIT_TEST_COMMIT_GRAPH, 0))
+ revs->limited = 0;
if (revs->limited) {
if (limit_list(revs) < 0)
return -1;
Thanks,
-Stolee
prev parent reply other threads:[~2018-11-20 18:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 19:03 [PATCH 0/1] Use new topo-order logic with GIT_TEST_COMMIT_GRAPH Derrick Stolee via GitGitGadget
2018-11-19 19:03 ` [PATCH 1/1] revision.c: use new topo-order logic in tests Derrick Stolee via GitGitGadget
2018-11-20 6:13 ` Junio C Hamano
2018-11-20 18:45 ` Derrick Stolee [this message]
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=921606a2-3deb-2481-347a-6a2f5571ec9e@gmail.com \
--to=stolee@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).