bc5975d24f
Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree:0 - does not explicitly specify that it also filters out all blobs, but this should not cause much confusion because blobs are not at all useful without the trees that refer to them. I also considered only:commits as a name, but this is inaccurate because it suggests that annotated tags are omitted, but actually they are included. The name "tree:0" allows later filtering based on depth, i.e. "tree:1" would filter out all but the root tree and blobs. In order to avoid confusion between 0 and capital O, the documentation was worded in a somewhat round-about way that also hints at this future improvement to the feature. Signed-off-by: Matthew DeVore <matvore@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
166 lines
4.4 KiB
C
166 lines
4.4 KiB
C
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "config.h"
|
|
#include "revision.h"
|
|
#include "argv-array.h"
|
|
#include "list-objects.h"
|
|
#include "list-objects-filter.h"
|
|
#include "list-objects-filter-options.h"
|
|
|
|
/*
|
|
* Parse value of the argument to the "filter" keyword.
|
|
* On the command line this looks like:
|
|
* --filter=<arg>
|
|
* and in the pack protocol as:
|
|
* "filter" SP <arg>
|
|
*
|
|
* The filter keyword will be used by many commands.
|
|
* See Documentation/rev-list-options.txt for allowed values for <arg>.
|
|
*
|
|
* Capture the given arg as the "filter_spec". This can be forwarded to
|
|
* subordinate commands when necessary. We also "intern" the arg for
|
|
* the convenience of the current command.
|
|
*/
|
|
static int gently_parse_list_objects_filter(
|
|
struct list_objects_filter_options *filter_options,
|
|
const char *arg,
|
|
struct strbuf *errbuf)
|
|
{
|
|
const char *v0;
|
|
|
|
if (filter_options->choice) {
|
|
if (errbuf) {
|
|
strbuf_addstr(
|
|
errbuf,
|
|
_("multiple filter-specs cannot be combined"));
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
filter_options->filter_spec = strdup(arg);
|
|
|
|
if (!strcmp(arg, "blob:none")) {
|
|
filter_options->choice = LOFC_BLOB_NONE;
|
|
return 0;
|
|
|
|
} else if (skip_prefix(arg, "blob:limit=", &v0)) {
|
|
if (git_parse_ulong(v0, &filter_options->blob_limit_value)) {
|
|
filter_options->choice = LOFC_BLOB_LIMIT;
|
|
return 0;
|
|
}
|
|
|
|
} else if (skip_prefix(arg, "tree:", &v0)) {
|
|
unsigned long depth;
|
|
if (!git_parse_ulong(v0, &depth) || depth != 0) {
|
|
if (errbuf) {
|
|
strbuf_addstr(
|
|
errbuf,
|
|
_("only 'tree:0' is supported"));
|
|
}
|
|
return 1;
|
|
}
|
|
filter_options->choice = LOFC_TREE_NONE;
|
|
return 0;
|
|
|
|
} else if (skip_prefix(arg, "sparse:oid=", &v0)) {
|
|
struct object_context oc;
|
|
struct object_id sparse_oid;
|
|
|
|
/*
|
|
* Try to parse <oid-expression> into an OID for the current
|
|
* command, but DO NOT complain if we don't have the blob or
|
|
* ref locally.
|
|
*/
|
|
if (!get_oid_with_context(v0, GET_OID_BLOB,
|
|
&sparse_oid, &oc))
|
|
filter_options->sparse_oid_value = oiddup(&sparse_oid);
|
|
filter_options->choice = LOFC_SPARSE_OID;
|
|
return 0;
|
|
|
|
} else if (skip_prefix(arg, "sparse:path=", &v0)) {
|
|
filter_options->choice = LOFC_SPARSE_PATH;
|
|
filter_options->sparse_path_value = strdup(v0);
|
|
return 0;
|
|
}
|
|
|
|
if (errbuf)
|
|
strbuf_addf(errbuf, "invalid filter-spec '%s'", arg);
|
|
|
|
memset(filter_options, 0, sizeof(*filter_options));
|
|
return 1;
|
|
}
|
|
|
|
int parse_list_objects_filter(struct list_objects_filter_options *filter_options,
|
|
const char *arg)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
if (gently_parse_list_objects_filter(filter_options, arg, &buf))
|
|
die("%s", buf.buf);
|
|
return 0;
|
|
}
|
|
|
|
int opt_parse_list_objects_filter(const struct option *opt,
|
|
const char *arg, int unset)
|
|
{
|
|
struct list_objects_filter_options *filter_options = opt->value;
|
|
|
|
if (unset || !arg) {
|
|
list_objects_filter_set_no_filter(filter_options);
|
|
return 0;
|
|
}
|
|
|
|
return parse_list_objects_filter(filter_options, arg);
|
|
}
|
|
|
|
void list_objects_filter_release(
|
|
struct list_objects_filter_options *filter_options)
|
|
{
|
|
free(filter_options->filter_spec);
|
|
free(filter_options->sparse_oid_value);
|
|
free(filter_options->sparse_path_value);
|
|
memset(filter_options, 0, sizeof(*filter_options));
|
|
}
|
|
|
|
void partial_clone_register(
|
|
const char *remote,
|
|
const struct list_objects_filter_options *filter_options)
|
|
{
|
|
/*
|
|
* Record the name of the partial clone remote in the
|
|
* config and in the global variable -- the latter is
|
|
* used throughout to indicate that partial clone is
|
|
* enabled and to expect missing objects.
|
|
*/
|
|
if (repository_format_partial_clone &&
|
|
*repository_format_partial_clone &&
|
|
strcmp(remote, repository_format_partial_clone))
|
|
die(_("cannot change partial clone promisor remote"));
|
|
|
|
git_config_set("core.repositoryformatversion", "1");
|
|
git_config_set("extensions.partialclone", remote);
|
|
|
|
repository_format_partial_clone = xstrdup(remote);
|
|
|
|
/*
|
|
* Record the initial filter-spec in the config as
|
|
* the default for subsequent fetches from this remote.
|
|
*/
|
|
core_partial_clone_filter_default =
|
|
xstrdup(filter_options->filter_spec);
|
|
git_config_set("core.partialclonefilter",
|
|
core_partial_clone_filter_default);
|
|
}
|
|
|
|
void partial_clone_get_default_filter_spec(
|
|
struct list_objects_filter_options *filter_options)
|
|
{
|
|
/*
|
|
* Parse default value, but silently ignore it if it is invalid.
|
|
*/
|
|
if (!core_partial_clone_filter_default)
|
|
return;
|
|
gently_parse_list_objects_filter(filter_options,
|
|
core_partial_clone_filter_default,
|
|
NULL);
|
|
}
|