From: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
Teach fetch to use from-promisor and exclude-promisor-objects
parameters with sub-commands. Initialize fetch_if_missing
global variable.
Signed-off-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
---
builtin/fetch.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
connected.c | 2 ++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 29d3807..e018aa3 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1047,9 +1047,11 @@ 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)
+ if (filter_options.choice) {
set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER,
filter_options.filter_spec);
+ set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
+ }
return transport;
}
@@ -1287,6 +1289,59 @@ static int fetch_multiple(struct string_list *list)
return result;
}
+static inline void fetch_one__setup_partial(struct remote *remote)
+{
+ int ppc, neq;
+
+ /* Do we have a prior partial clone/fetch? */
+ ppc = (repository_format_partial_clone &&
+ *repository_format_partial_clone);
+
+ /*
+ * If no prior partial clone/fetch and partial fetch was NOT
+ * requested now, do a normal fetch.
+ */
+ if (!ppc && !filter_options.choice)
+ return;
+
+ /*
+ * If this is the FIRST partial fetch request, we enable partial
+ * on this repo and remember the given filter-spec as the default
+ * for subsequent fetches to this remote.
+ */
+ if (!ppc && filter_options.choice) {
+ partial_clone_register(remote->name, &filter_options);
+ return;
+ }
+
+ /*
+ * We are currently limited to only ONE promisor remote. That is,
+ * we only allow partial fetches back to the original partial clone
+ * remote (or the first partial fetch remote). Disallow explicit
+ * partial fetches to a different remote.
+ *
+ * Normal (non-partial) fetch commands should still be allowed to
+ * other remotes.
+ */
+ neq = (strcmp(remote->name, repository_format_partial_clone));
+ if (neq && filter_options.choice)
+ die(_("unsupported partial-fetch to a different remote"));
+
+ if (neq && !filter_options.choice)
+ return;
+
+ /*
+ * When fetching from the promisor remote, we either use the
+ * explicitly given filter-spec or inherit the filter-spec from
+ * the clone.
+ */
+ if (filter_options.choice)
+ return;
+
+ partial_clone_get_default_filter_spec(&filter_options);
+ return;
+}
+
static int fetch_one(struct remote *remote, int argc, const char **argv)
{
static const char **refs = NULL;
@@ -1298,6 +1353,8 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
die(_("No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."));
+ fetch_one__setup_partial(remote);
+
gtransport = prepare_transport(remote, 1);
if (prune < 0) {
@@ -1348,6 +1405,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
packet_trace_identity("fetch");
+ fetch_if_missing = 0;
+
/* Record the command line for the reflog */
strbuf_addstr(&default_rla, "fetch");
for (i = 1; i < argc; i++)
diff --git a/connected.c b/connected.c
index f416b05..3a5bd67 100644
--- a/connected.c
+++ b/connected.c
@@ -56,6 +56,8 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
argv_array_push(&rev_list.args,"rev-list");
argv_array_push(&rev_list.args, "--objects");
argv_array_push(&rev_list.args, "--stdin");
+ if (repository_format_partial_clone)
+ argv_array_push(&rev_list.args, "--exclude-promisor-objects");
argv_array_push(&rev_list.args, "--not");
argv_array_push(&rev_list.args, "--all");
argv_array_push(&rev_list.args, "--quiet");
--
2.9.3
