From: Derrick Stolee <stolee@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>, git@vger.kernel.org
Cc: gitster@pobox.com
Subject: Re: [PATCH v2 4/5] fetch: teach independent negotiation (no packfile)
Date: Wed, 5 May 2021 12:44:42 -0400 [thread overview]
Message-ID: <f2acf884-8930-a3fd-ec4d-601652b2ec24@gmail.com> (raw)
In-Reply-To: <1de34a6dced3f5477162dd675615342bc2dec05f.1620162764.git.jonathantanmy@google.com>
On 5/4/2021 5:16 PM, Jonathan Tan wrote:
> +void negotiate_using_fetch(const struct oid_array *negotiation_tips,
> + const struct string_list *server_options,
> + int stateless_rpc,
> + int fd[],
> + struct oidset *acked_commits)
> +{
> + struct fetch_negotiator negotiator;
> + struct packet_reader reader;
> + struct object_array nt_object_array = OBJECT_ARRAY_INIT;
> + struct strbuf req_buf = STRBUF_INIT;
> + int haves_to_send = INITIAL_FLUSH;
> + int in_vain = 0;
> + int seen_ack = 0;
> + int last_iteration = 0;
> + timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
...
> + /* Process ACKs/NAKs */
> + process_section_header(&reader, "acknowledgments", 0);
> + while (process_ack(&negotiator, &reader, &common_oid,
> + &received_ready)) {
> + struct commit *commit = lookup_commit(the_repository,
> + &common_oid);
> + if (commit) {
> + timestamp_t generation;
> +
> + parse_commit_or_die(commit);
> + commit->object.flags |= COMMON;
> + generation = commit_graph_generation(commit);
> + if (generation < min_generation)
> + min_generation = generation;
> + }
> + in_vain = 0;
> + seen_ack = 1;
> + oidset_insert(acked_commits, &common_oid);
> + }
> + if (received_ready)
> + die(_("unexpected 'ready' from remote"));
> + else
> + do_check_stateless_delimiter(stateless_rpc, &reader);
> + if (can_all_from_reach_with_flag(&nt_object_array, COMMON,
> + REACH_SCRATCH, 0,
> + min_generation))
> + last_iteration = 1;
I'm just chiming in to confirm that this use of min_generation is
correct. Thanks!
-Stolee
next prev parent reply other threads:[~2021-05-05 17:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 1:09 [PATCH 0/6] Push negotiation Jonathan Tan
2021-04-09 1:09 ` [PATCH 1/6] fetch-pack: buffer object-format with other args Jonathan Tan
2021-04-09 4:49 ` Junio C Hamano
2021-04-09 16:24 ` Jonathan Tan
2021-04-09 1:09 ` [PATCH 2/6] fetch-pack: refactor process_acks() Jonathan Tan
2021-04-09 5:08 ` Junio C Hamano
2021-05-03 16:30 ` Derrick Stolee
2021-04-09 1:10 ` [PATCH 3/6] fetch-pack: refactor add_haves() Jonathan Tan
2021-04-09 5:20 ` Junio C Hamano
2021-04-09 1:10 ` [PATCH 4/6] fetch-pack: refactor command and capability write Jonathan Tan
2021-04-09 5:27 ` Junio C Hamano
2021-04-09 1:10 ` [PATCH 5/6] fetch: teach independent negotiation (no packfile) Jonathan Tan
2021-04-09 5:41 ` Junio C Hamano
2021-04-09 16:38 ` Jonathan Tan
2021-05-03 15:25 ` Derrick Stolee
2021-05-03 15:40 ` Derrick Stolee
2021-05-03 21:52 ` Jonathan Tan
2021-04-09 1:10 ` [PATCH 6/6] send-pack: support push negotiation Jonathan Tan
2021-05-03 15:35 ` Derrick Stolee
2021-05-03 22:02 ` Jonathan Tan
2021-05-04 17:26 ` Derrick Stolee
2021-04-30 5:42 ` [PATCH 0/6] Push negotiation Junio C Hamano
2021-04-30 17:33 ` Derrick Stolee
2021-05-04 21:15 ` [PATCH v2 0/5] " Jonathan Tan
2021-05-04 21:15 ` [PATCH v2 1/5] fetch-pack: refactor process_acks() Jonathan Tan
2021-05-04 21:15 ` [PATCH v2 2/5] fetch-pack: refactor add_haves() Jonathan Tan
2021-05-04 21:16 ` [PATCH v2 3/5] fetch-pack: refactor command and capability write Jonathan Tan
2021-05-04 21:16 ` [PATCH v2 4/5] fetch: teach independent negotiation (no packfile) Jonathan Tan
2021-05-05 1:53 ` Junio C Hamano
2021-05-05 16:42 ` Derrick Stolee
2021-05-06 2:12 ` Junio C Hamano
2021-05-05 16:44 ` Derrick Stolee [this message]
2021-05-04 21:16 ` [PATCH v2 5/5] send-pack: support push negotiation Jonathan Tan
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=f2acf884-8930-a3fd-ec4d-601652b2ec24@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.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).