From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, Eric Sunshine <sunshine@sunshineco•com>
Subject: Re: [PATCH v2 07/25] upload-pack: move "unshallow" sending code out of deepen()
Date: Thu, 04 Feb 2016 15:39:26 -0800 [thread overview]
Message-ID: <xmqq4mdof3kh.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1454576641-29615-8-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Thu, 4 Feb 2016 16:03:43 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> Also add some more comments in this code because it takes too long to
> understand what it does (to me, who should be familiar enough to
> understand this code well!)
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
The diff is harder to read than necessary (not your fault), but
splitting this into a separate helper makes sense to me.
Thanks.
> upload-pack.c | 39 ++++++++++++++++++++++++++-------------
> 1 file changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/upload-pack.c b/upload-pack.c
> index ee5d20b..bfb7985 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -552,20 +552,10 @@ static void send_shallow(struct commit_list *result)
> }
> }
>
> -static void deepen(int depth, const struct object_array *shallows)
> +static void send_unshallow(const struct object_array *shallows)
> {
> - struct commit_list *result = NULL;
> int i;
> - if (depth == INFINITE_DEPTH && !is_repository_shallow())
> - for (i = 0; i < shallows->nr; i++) {
> - struct object *object = shallows->objects[i].item;
> - object->flags |= NOT_SHALLOW;
> - }
> - else
> - result = get_shallow_commits(&want_obj, depth,
> - SHALLOW, NOT_SHALLOW);
> - send_shallow(result);
> - free_commit_list(result);
> +
> for (i = 0; i < shallows->nr; i++) {
> struct object *object = shallows->objects[i].item;
> if (object->flags & NOT_SHALLOW) {
> @@ -573,7 +563,13 @@ static void deepen(int depth, const struct object_array *shallows)
> packet_write(1, "unshallow %s",
> oid_to_hex(&object->oid));
> object->flags &= ~CLIENT_SHALLOW;
> - /* make sure the real parents are parsed */
> + /*
> + * We want to _register_ "object" as shallow, but we
> + * also need to traverse object's parents to deepen a
> + * shallow clone. Unregister it for now so we can
> + * parse and add the parents to the want list, then
> + * re-register it.
> + */
> unregister_shallow(object->oid.hash);
> object->parsed = 0;
> parse_commit_or_die((struct commit *)object);
> @@ -588,6 +584,23 @@ static void deepen(int depth, const struct object_array *shallows)
> /* make sure commit traversal conforms to client */
> register_shallow(object->oid.hash);
> }
> +}
> +
> +static void deepen(int depth, const struct object_array *shallows)
> +{
> + struct commit_list *result = NULL;
> + int i;
> + if (depth == INFINITE_DEPTH && !is_repository_shallow())
> + for (i = 0; i < shallows->nr; i++) {
> + struct object *object = shallows->objects[i].item;
> + object->flags |= NOT_SHALLOW;
> + }
> + else
> + result = get_shallow_commits(&want_obj, depth,
> + SHALLOW, NOT_SHALLOW);
> + send_shallow(result);
> + free_commit_list(result);
> + send_unshallow(shallows);
> packet_flush(1);
> }
next prev parent reply other threads:[~2016-02-04 23:39 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 9:03 [PATCH v2 00/25] More flexibility in making shallow clones Nguyễn Thái Ngọc Duy
2016-02-04 9:03 ` [PATCH v2 01/25] remote-curl.c: convert fetch_git() to use argv_array Nguyễn Thái Ngọc Duy
2016-02-04 22:59 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 02/25] transport-helper.c: refactor set_helper_option() Nguyễn Thái Ngọc Duy
2016-02-04 23:18 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 03/25] transport-helper.c: do not send null option to remote helper Nguyễn Thái Ngọc Duy
2016-02-04 23:22 ` Junio C Hamano
2016-02-06 9:38 ` Duy Nguyen
2016-02-08 20:53 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 04/25] upload-pack: move shallow deepen code out of receive_needs() Nguyễn Thái Ngọc Duy
2016-02-04 23:30 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 05/25] upload-pack: move "shallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-02-04 9:03 ` [PATCH v2 06/25] upload-pack: remove unused variable "backup" Nguyễn Thái Ngọc Duy
2016-02-04 23:32 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 07/25] upload-pack: move "unshallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-02-04 23:39 ` Junio C Hamano [this message]
2016-02-04 9:03 ` [PATCH v2 08/25] upload-pack: use skip_prefix() instead of starts_with() when possible Nguyễn Thái Ngọc Duy
2016-02-04 23:42 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 09/25] upload-pack: tighten number parsing at "deepen" lines Nguyễn Thái Ngọc Duy
2016-02-04 23:48 ` Junio C Hamano
2016-02-15 3:07 ` Duy Nguyen
2016-02-04 9:03 ` [PATCH v2 10/25] upload-pack: move rev-list code out of check_non_tip() Nguyễn Thái Ngọc Duy
2016-02-04 9:03 ` [PATCH v2 11/25] fetch-pack: use skip_prefix() instead of starts_with() when possible Nguyễn Thái Ngọc Duy
2016-02-04 23:56 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 12/25] fetch-pack: use a common function for verbose printing Nguyễn Thái Ngọc Duy
2016-02-05 0:02 ` Junio C Hamano
2016-02-05 4:03 ` Eric Sunshine
2016-02-04 9:03 ` [PATCH v2 13/25] fetch-pack: use a separate flag for fetch in deepening mode Nguyễn Thái Ngọc Duy
2016-02-05 0:03 ` Junio C Hamano
2016-02-05 4:13 ` Eric Sunshine
2016-02-04 9:03 ` [PATCH v2 14/25] shallow.c: implement a generic shallow boundary finder based on rev-list Nguyễn Thái Ngọc Duy
2016-02-08 21:09 ` Junio C Hamano
2016-02-15 8:00 ` Duy Nguyen
2016-02-19 9:30 ` Duy Nguyen
2016-02-04 9:03 ` [PATCH v2 15/25] upload-pack: add deepen-since to cut shallow repos based on time Nguyễn Thái Ngọc Duy
2016-02-08 21:14 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 16/25] fetch: define shallow boundary with --shallow-since Nguyễn Thái Ngọc Duy
2016-02-04 9:03 ` [PATCH v2 17/25] clone: define shallow clone boundary based on time " Nguyễn Thái Ngọc Duy
2016-02-08 21:20 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 18/25] t5500, t5539: tests for shallow depth since a specific date Nguyễn Thái Ngọc Duy
2016-02-08 21:24 ` Junio C Hamano
2016-02-15 7:17 ` Duy Nguyen
2016-02-04 9:03 ` [PATCH v2 19/25] refs: add expand_ref() Nguyễn Thái Ngọc Duy
2016-02-08 21:27 ` Junio C Hamano
2016-02-04 9:03 ` [PATCH v2 20/25] upload-pack: support define shallow boundary by excluding revisions Nguyễn Thái Ngọc Duy
2016-02-05 5:03 ` Eric Sunshine
2016-02-08 21:34 ` Junio C Hamano
2016-02-05 5:05 ` Eric Sunshine
2016-02-15 3:31 ` Duy Nguyen
2016-02-04 9:03 ` [PATCH v2 21/25] fetch: define shallow boundary with --shallow-exclude Nguyễn Thái Ngọc Duy
2016-02-05 5:26 ` Eric Sunshine
2016-02-15 3:53 ` Duy Nguyen
2016-02-15 5:52 ` Eric Sunshine
2016-02-15 5:56 ` Eric Sunshine
2016-02-15 8:15 ` Duy Nguyen
2016-02-19 1:35 ` Eric Sunshine
2016-02-04 9:03 ` [PATCH v2 22/25] clone: define shallow clone " Nguyễn Thái Ngọc Duy
2016-02-04 9:03 ` [PATCH v2 23/25] t5500, t5539: tests for shallow depth excluding a ref Nguyễn Thái Ngọc Duy
2016-02-04 9:04 ` [PATCH v2 24/25] upload-pack: make check_reachable_object() return unreachable list if asked Nguyễn Thái Ngọc Duy
2016-02-05 5:41 ` Eric Sunshine
2016-02-04 9:04 ` [PATCH v2 25/25] fetch, upload-pack: --deepen=N extends shallow boundary by N commits Nguyễn Thái Ngọc Duy
2016-02-08 21:45 ` [PATCH v2 00/25] More flexibility in making shallow clones Junio C Hamano
2016-02-12 0:24 ` Duy Nguyen
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=xmqq4mdof3kh.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=sunshine@sunshineco$(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