mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
a4e7e317f8
Add a new "const struct config_context *ctx" arg to config_fn_t to hold additional information about the config iteration operation. config_context has a "struct key_value_info kvi" member that holds metadata about the config source being read (e.g. what kind of config source it is, the filename, etc). In this series, we're only interested in .kvi, so we could have just used "struct key_value_info" as an arg, but config_context makes it possible to add/adjust members in the future without changing the config_fn_t signature. We could also consider other ways of organizing the args (e.g. moving the config name and value into config_context or key_value_info), but in my experiments, the incremental benefit doesn't justify the added complexity (e.g. a config_fn_t will sometimes invoke another config_fn_t but with a different config value). In subsequent commits, the .kvi member will replace the global "struct config_reader" in config.c, making config iteration a global-free operation. It requires much more work for the machinery to provide meaningful values of .kvi, so for now, merely change the signature and call sites, pass NULL as a placeholder value, and don't rely on the arg in any meaningful way. Most of the changes are performed by contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every config_fn_t: - Modifies the signature to accept "const struct config_context *ctx" - Passes "ctx" to any inner config_fn_t, if needed - Adds UNUSED attributes to "ctx", if needed Most config_fn_t instances are easily identified by seeing if they are called by the various config functions. Most of the remaining ones are manually named in the .cocci patch. Manual cleanups are still needed, but the majority of it is trivial; it's either adjusting config_fn_t that the .cocci patch didn't catch, or adding forward declarations of "struct config_context ctx" to make the signatures make sense. The non-trivial changes are in cases where we are invoking a config_fn_t outside of config machinery, and we now need to decide what value of "ctx" to pass. These cases are: - trace2/tr2_cfg.c:tr2_cfg_set_fl() This is indirectly called by git_config_set() so that the trace2 machinery can notice the new config values and update its settings using the tr2 config parsing function, i.e. tr2_cfg_cb(). - builtin/checkout.c:checkout_main() This calls git_xmerge_config() as a shorthand for parsing a CLI arg. This might be worth refactoring away in the future, since git_xmerge_config() can call git_default_config(), which can do much more than just parsing. Handle them by creating a KVI_INIT macro that initializes "struct key_value_info" to a reasonable default, and use that to construct the "ctx" arg. Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
212 lines
5.2 KiB
C
212 lines
5.2 KiB
C
#include "git-compat-util.h"
|
|
#include "environment.h"
|
|
#include "gettext.h"
|
|
#include "hash.h"
|
|
#include "hex.h"
|
|
#include "repository.h"
|
|
#include "refs.h"
|
|
#include "remote.h"
|
|
#include "strvec.h"
|
|
#include "ls-refs.h"
|
|
#include "pkt-line.h"
|
|
#include "config.h"
|
|
#include "string-list.h"
|
|
|
|
static enum {
|
|
UNBORN_IGNORE = 0,
|
|
UNBORN_ALLOW,
|
|
UNBORN_ADVERTISE /* implies ALLOW */
|
|
} unborn_config(struct repository *r)
|
|
{
|
|
const char *str = NULL;
|
|
|
|
if (repo_config_get_string_tmp(r, "lsrefs.unborn", &str)) {
|
|
/*
|
|
* If there is no such config, advertise and allow it by
|
|
* default.
|
|
*/
|
|
return UNBORN_ADVERTISE;
|
|
} else {
|
|
if (!strcmp(str, "advertise")) {
|
|
return UNBORN_ADVERTISE;
|
|
} else if (!strcmp(str, "allow")) {
|
|
return UNBORN_ALLOW;
|
|
} else if (!strcmp(str, "ignore")) {
|
|
return UNBORN_IGNORE;
|
|
} else {
|
|
die(_("invalid value for '%s': '%s'"),
|
|
"lsrefs.unborn", str);
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* If we see this many or more "ref-prefix" lines from the client, we consider
|
|
* it "too many" and will avoid using the prefix feature entirely.
|
|
*/
|
|
#define TOO_MANY_PREFIXES 65536
|
|
|
|
/*
|
|
* Check if one of the prefixes is a prefix of the ref.
|
|
* If no prefixes were provided, all refs match.
|
|
*/
|
|
static int ref_match(const struct strvec *prefixes, const char *refname)
|
|
{
|
|
int i;
|
|
|
|
if (!prefixes->nr)
|
|
return 1; /* no restriction */
|
|
|
|
for (i = 0; i < prefixes->nr; i++) {
|
|
const char *prefix = prefixes->v[i];
|
|
|
|
if (starts_with(refname, prefix))
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct ls_refs_data {
|
|
unsigned peel;
|
|
unsigned symrefs;
|
|
struct strvec prefixes;
|
|
struct strbuf buf;
|
|
struct string_list hidden_refs;
|
|
unsigned unborn : 1;
|
|
};
|
|
|
|
static int send_ref(const char *refname, const struct object_id *oid,
|
|
int flag, void *cb_data)
|
|
{
|
|
struct ls_refs_data *data = cb_data;
|
|
const char *refname_nons = strip_namespace(refname);
|
|
|
|
strbuf_reset(&data->buf);
|
|
|
|
if (ref_is_hidden(refname_nons, refname, &data->hidden_refs))
|
|
return 0;
|
|
|
|
if (!ref_match(&data->prefixes, refname_nons))
|
|
return 0;
|
|
|
|
if (oid)
|
|
strbuf_addf(&data->buf, "%s %s", oid_to_hex(oid), refname_nons);
|
|
else
|
|
strbuf_addf(&data->buf, "unborn %s", refname_nons);
|
|
if (data->symrefs && flag & REF_ISSYMREF) {
|
|
struct object_id unused;
|
|
const char *symref_target = resolve_ref_unsafe(refname, 0,
|
|
&unused,
|
|
&flag);
|
|
|
|
if (!symref_target)
|
|
die("'%s' is a symref but it is not?", refname);
|
|
|
|
strbuf_addf(&data->buf, " symref-target:%s",
|
|
strip_namespace(symref_target));
|
|
}
|
|
|
|
if (data->peel && oid) {
|
|
struct object_id peeled;
|
|
if (!peel_iterated_oid(oid, &peeled))
|
|
strbuf_addf(&data->buf, " peeled:%s", oid_to_hex(&peeled));
|
|
}
|
|
|
|
strbuf_addch(&data->buf, '\n');
|
|
packet_fwrite(stdout, data->buf.buf, data->buf.len);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void send_possibly_unborn_head(struct ls_refs_data *data)
|
|
{
|
|
struct strbuf namespaced = STRBUF_INIT;
|
|
struct object_id oid;
|
|
int flag;
|
|
int oid_is_null;
|
|
|
|
strbuf_addf(&namespaced, "%sHEAD", get_git_namespace());
|
|
if (!resolve_ref_unsafe(namespaced.buf, 0, &oid, &flag))
|
|
return; /* bad ref */
|
|
oid_is_null = is_null_oid(&oid);
|
|
if (!oid_is_null ||
|
|
(data->unborn && data->symrefs && (flag & REF_ISSYMREF)))
|
|
send_ref(namespaced.buf, oid_is_null ? NULL : &oid, flag, data);
|
|
strbuf_release(&namespaced);
|
|
}
|
|
|
|
static int ls_refs_config(const char *var, const char *value,
|
|
const struct config_context *ctx UNUSED,
|
|
void *cb_data)
|
|
{
|
|
struct ls_refs_data *data = cb_data;
|
|
/*
|
|
* We only serve fetches over v2 for now, so respect only "uploadpack"
|
|
* config. This may need to eventually be expanded to "receive", but we
|
|
* don't yet know how that information will be passed to ls-refs.
|
|
*/
|
|
return parse_hide_refs_config(var, value, "uploadpack", &data->hidden_refs);
|
|
}
|
|
|
|
int ls_refs(struct repository *r, struct packet_reader *request)
|
|
{
|
|
struct ls_refs_data data;
|
|
|
|
memset(&data, 0, sizeof(data));
|
|
strvec_init(&data.prefixes);
|
|
strbuf_init(&data.buf, 0);
|
|
string_list_init_dup(&data.hidden_refs);
|
|
|
|
git_config(ls_refs_config, &data);
|
|
|
|
while (packet_reader_read(request) == PACKET_READ_NORMAL) {
|
|
const char *arg = request->line;
|
|
const char *out;
|
|
|
|
if (!strcmp("peel", arg))
|
|
data.peel = 1;
|
|
else if (!strcmp("symrefs", arg))
|
|
data.symrefs = 1;
|
|
else if (skip_prefix(arg, "ref-prefix ", &out)) {
|
|
if (data.prefixes.nr < TOO_MANY_PREFIXES)
|
|
strvec_push(&data.prefixes, out);
|
|
}
|
|
else if (!strcmp("unborn", arg))
|
|
data.unborn = !!unborn_config(r);
|
|
else
|
|
die(_("unexpected line: '%s'"), arg);
|
|
}
|
|
|
|
if (request->status != PACKET_READ_FLUSH)
|
|
die(_("expected flush after ls-refs arguments"));
|
|
|
|
/*
|
|
* If we saw too many prefixes, we must avoid using them at all; as
|
|
* soon as we have any prefix, they are meant to form a comprehensive
|
|
* list.
|
|
*/
|
|
if (data.prefixes.nr >= TOO_MANY_PREFIXES)
|
|
strvec_clear(&data.prefixes);
|
|
|
|
send_possibly_unborn_head(&data);
|
|
if (!data.prefixes.nr)
|
|
strvec_push(&data.prefixes, "");
|
|
refs_for_each_fullref_in_prefixes(get_main_ref_store(r),
|
|
get_git_namespace(), data.prefixes.v,
|
|
send_ref, &data);
|
|
packet_fflush(stdout);
|
|
strvec_clear(&data.prefixes);
|
|
strbuf_release(&data.buf);
|
|
string_list_clear(&data.hidden_refs, 0);
|
|
return 0;
|
|
}
|
|
|
|
int ls_refs_advertise(struct repository *r, struct strbuf *value)
|
|
{
|
|
if (value && unborn_config(r) == UNBORN_ADVERTISE)
|
|
strbuf_addstr(value, "unborn");
|
|
|
|
return 1;
|
|
}
|