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 15/25] upload-pack: add deepen-since to cut shallow repos based on time
Date: Mon, 08 Feb 2016 13:14:29 -0800 [thread overview]
Message-ID: <xmqqr3gm7vm2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1454576641-29615-16-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Thu, 4 Feb 2016 16:03:51 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> This should allow the user to say "create a shallow clone containing the
> work from last year" (once the client side is fixed up, of course).
>
> In theory deepen-since and deepen (aka --depth) can be used together to
> draw the shallow boundary (whether it's intersection or union is up to
> discussion, but if rev-list is used, it's likely intersection). However,
> because deepen goes with a custom commit walker, we can't mix the two
> yet.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
Looks quite straight-forward.
Thanks.
> Documentation/technical/pack-protocol.txt | 3 +-
> Documentation/technical/protocol-capabilities.txt | 9 +++++
> upload-pack.c | 45 ++++++++++++++++++++++-
> 3 files changed, 54 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
> index c6977bb..9251df1 100644
> --- a/Documentation/technical/pack-protocol.txt
> +++ b/Documentation/technical/pack-protocol.txt
> @@ -219,7 +219,8 @@ out of what the server said it could do with the first 'want' line.
>
> shallow-line = PKT-LINE("shallow" SP obj-id)
>
> - depth-request = PKT-LINE("deepen" SP depth)
> + depth-request = PKT-LINE("deepen" SP depth) /
> + PKT-LINE("deepen-since" SP timestamp)
>
> first-want = PKT-LINE("want" SP obj-id SP capability-list)
> additional-want = PKT-LINE("want" SP obj-id)
> diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
> index eaab6b4..f08cc4e 100644
> --- a/Documentation/technical/protocol-capabilities.txt
> +++ b/Documentation/technical/protocol-capabilities.txt
> @@ -179,6 +179,15 @@ This capability adds "deepen", "shallow" and "unshallow" commands to
> the fetch-pack/upload-pack protocol so clients can request shallow
> clones.
>
> +deepen-since
> +------------
> +
> +This capability adds "deepen-since" command to fetch-pack/upload-pack
> +protocol so the client can request shallow clones that are cut at a
> +specific time, instead of depth. Internally it's equivalent of doing
> +"rev-list --max-age=<timestamp>" on the server side. "deepen-since"
> +cannot be used with "deepen".
> +
> no-progress
> -----------
>
> diff --git a/upload-pack.c b/upload-pack.c
> index c8dafe8..794736c 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -14,6 +14,7 @@
> #include "sigchain.h"
> #include "version.h"
> #include "string-list.h"
> +#include "argv-array.h"
>
> static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
>
> @@ -612,11 +613,25 @@ static void deepen(int depth, const struct object_array *shallows)
> packet_flush(1);
> }
>
> +static void deepen_by_rev_list(int ac, const char **av,
> + struct object_array *shallows)
> +{
> + struct commit_list *result;
> +
> + result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
> + send_shallow(result);
> + free_commit_list(result);
> + send_unshallow(shallows);
> + packet_flush(1);
> +}
> +
> static void receive_needs(void)
> {
> struct object_array shallows = OBJECT_ARRAY_INIT;
> int depth = 0;
> int has_non_tip = 0;
> + unsigned long deepen_since = 0;
> + int deepen_rev_list = 0;
>
> shallow_nr = 0;
> for (;;) {
> @@ -653,6 +668,16 @@ static void receive_needs(void)
> die("Invalid deepen: %s", line);
> continue;
> }
> + if (skip_prefix(line, "deepen-since ", &arg)) {
> + char *end = NULL;
> + deepen_since = strtoul(arg, &end, 0);
> + if (!end || *end || !deepen_since ||
> + /* revisions.c's max_age -1 is special */
> + deepen_since == -1)
> + die("Invalid deepen-since: %s", line);
> + deepen_rev_list = 1;
> + continue;
> + }
> if (!skip_prefix(line, "want ", &arg) ||
> get_sha1_hex(arg, sha1_buf))
> die("git upload-pack: protocol error, "
> @@ -704,10 +729,26 @@ static void receive_needs(void)
> if (!use_sideband && daemon_mode)
> no_progress = 1;
>
> - if (depth == 0 && shallows.nr == 0)
> + if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
> return;
> + if (depth > 0 && deepen_rev_list)
> + die("--depth and --shallow-since cannot be used together");
> if (depth > 0)
> deepen(depth, &shallows);
> + else if (deepen_rev_list) {
> + struct argv_array av = ARGV_ARRAY_INIT;
> + int i;
> +
> + argv_array_push(&av, "rev-list");
> + if (deepen_since)
> + argv_array_pushf(&av, "--max-age=%lu", deepen_since);
> + for (i = 0; i < want_obj.nr; i++) {
> + struct object *o = want_obj.objects[i].item;
> + argv_array_push(&av, oid_to_hex(&o->oid));
> + }
> + deepen_by_rev_list(av.argc, av.argv, &shallows);
> + argv_array_clear(&av);
> + }
> else
> if (shallows.nr > 0) {
> int i;
> @@ -756,7 +797,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
> int flag, void *cb_data)
> {
> static const char *capabilities = "multi_ack thin-pack side-band"
> - " side-band-64k ofs-delta shallow no-progress"
> + " side-band-64k ofs-delta shallow deepen-since no-progress"
> " include-tag multi_ack_detailed";
> const char *refname_nons = strip_namespace(refname);
> struct object_id peeled;
next prev parent reply other threads:[~2016-02-08 21:14 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
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 [this message]
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=xmqqr3gm7vm2.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