From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, jonathantanmy@google.com,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH v5 04/14] fetch: add object filtering for partial fetch
Date: Tue, 21 Nov 2017 21:15:18 +0000 [thread overview]
Message-ID: <20171121211528.21891-5-git@jeffhostetler.com> (raw)
In-Reply-To: <20171121211528.21891-1-git@jeffhostetler.com>
From: Jeff Hostetler <jeffhost@microsoft.com>
Teach fetch to use the list-objects filtering parameters
to allow a "partial fetch" following a "partial clone".
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
---
builtin/fetch.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 1b1f039..29d3807 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -18,6 +18,7 @@
#include "argv-array.h"
#include "utf8.h"
#include "packfile.h"
+#include "list-objects-filter-options.h"
static const char * const builtin_fetch_usage[] = {
N_("git fetch [<options>] [<repository> [<refspec>...]]"),
@@ -55,6 +56,7 @@ static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
static int shown_url = 0;
static int refmap_alloc, refmap_nr;
static const char **refmap_array;
+static struct list_objects_filter_options filter_options;
static int git_fetch_config(const char *k, const char *v, void *cb)
{
@@ -160,6 +162,7 @@ static struct option builtin_fetch_options[] = {
TRANSPORT_FAMILY_IPV4),
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
TRANSPORT_FAMILY_IPV6),
+ OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
OPT_END()
};
@@ -1044,6 +1047,9 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, "yes");
if (update_shallow)
set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes");
+ if (filter_options.choice)
+ set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
+ filter_options.filter_spec);
return transport;
}
@@ -1242,6 +1248,20 @@ static int fetch_multiple(struct string_list *list)
int i, result = 0;
struct argv_array argv = ARGV_ARRAY_INIT;
+ if (filter_options.choice) {
+ /*
+ * We currently only support partial-fetches to the remote
+ * used for the partial-clone because we only support 1
+ * promisor remote, so we DO NOT allow explicit command
+ * line filter arguments for multi-fetches.
+ *
+ * Note that the loop below will spawn background fetches
+ * for each remote and one of them MAY INHERIT the proper
+ * partial-fetch settings, so everything is consistent.
+ */
+ die(_("partial-fetch is not supported on multiple remotes"));
+ }
+
if (!append && !dry_run) {
int errcode = truncate_fetch_head();
if (errcode)
--
2.9.3
next prev parent reply other threads:[~2017-11-21 21:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 21:15 [PATCH v5 00/14] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 01/14] upload-pack: add object filtering for partial clone Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 02/14] clone, fetch-pack, index-pack, transport: " Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 03/14] fetch: refactor calculation of remote list Jeff Hostetler
2017-11-21 21:15 ` Jeff Hostetler [this message]
2017-11-21 21:15 ` [PATCH v5 05/14] remote-curl: add object filtering for partial clone Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 06/14] pack-objects: test support for blob filtering Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 07/14] fetch-pack: test support excluding large blobs Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 08/14] partial-clone: define partial clone settings in config Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 09/14] fetch: add from_promisor and exclude-promisor-objects parameters Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 10/14] t5500: add fetch-pack tests for partial clone Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 11/14] t5601: test " Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 12/14] t5500: more tests for partial clone and fetch Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 13/14] unpack-trees: batch fetching of missing blobs Jeff Hostetler
2017-11-21 21:15 ` [PATCH v5 14/14] fetch-pack: restore save_commit_buffer after use Jeff Hostetler
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=20171121211528.21891-5-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/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).