mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Junio C Hamano](/assets/img/avatar_default.png)
The for-each-ref family of commands invoke parsers immediately when
it sees each --sort=<atom> option, and die before even seeing the
other options on the command line when the <atom> is unrecognised.
Instead, accumulate them in a string list, and have them parsed into
a ref_sorting structure after the command line parsing is done. As
a consequence, "git branch --sort=bogus -h" used to fail to give the
brief help, which arguably may have been a feature, now does so,
which is more consistent with how other options work.
The patch is smaller than the actual extent of the "damage" to the
codebase, thanks to the fact that the original code consistently
used OPT_REF_SORT() macro to handle command line options. We only
needed to replace the variable used for the list, and implementation
of the callback function used in the macro.
The old rule was for the users of the API to:
- Declare ref_sorting and ref_sorting_tail variables;
- OPT_REF_SORT() macro will instantiate ref_sorting instance (which
may barf and die) and append it to the tail;
- Append to the tail each ref_sorting read from the configuration
by parsing in the config callback (which may barf and die);
- See if ref_sorting is null and use ref_sorting_default() instead.
Now the rule is not all that different but is simpler:
- Declare ref_sorting_options string list.
- OPT_REF_SORT() macro will append it to the string list;
- Append to the string list the sort key read from the
configuration;
- call ref_sorting_options() to turn the string list to ref_sorting
structure (which also deals with the default value).
As side effects, this change also cleans up a few issues:
- 95be717c
(parse_opt_ref_sorting: always use with NONEG flag,
2019-03-20) muses that "git for-each-ref --no-sort" should simply
clear the sort keys accumulated so far; it now does.
- The implementation detail of "struct ref_sorting" and the helper
function parse_ref_sorting() can now be private to the ref-filter
API implementation.
- If you set branch.sort to a bogus value, the any "git branch"
invocation, not only the listing mode, would abort with the
original code; now it doesn't
Signed-off-by: Junio C Hamano <gitster@pobox.com>
161 lines
4.4 KiB
C
161 lines
4.4 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "transport.h"
|
|
#include "ref-filter.h"
|
|
#include "remote.h"
|
|
#include "refs.h"
|
|
|
|
static const char * const ls_remote_usage[] = {
|
|
N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
" [--symref] [<repository> [<refs>...]]"),
|
|
NULL
|
|
};
|
|
|
|
/*
|
|
* Is there one among the list of patterns that match the tail part
|
|
* of the path?
|
|
*/
|
|
static int tail_match(const char **pattern, const char *path)
|
|
{
|
|
const char *p;
|
|
char *pathbuf;
|
|
|
|
if (!pattern)
|
|
return 1; /* no restriction */
|
|
|
|
pathbuf = xstrfmt("/%s", path);
|
|
while ((p = *(pattern++)) != NULL) {
|
|
if (!wildmatch(p, pathbuf, 0)) {
|
|
free(pathbuf);
|
|
return 1;
|
|
}
|
|
}
|
|
free(pathbuf);
|
|
return 0;
|
|
}
|
|
|
|
int cmd_ls_remote(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *dest = NULL;
|
|
unsigned flags = 0;
|
|
int get_url = 0;
|
|
int quiet = 0;
|
|
int status = 0;
|
|
int show_symref_target = 0;
|
|
const char *uploadpack = NULL;
|
|
const char **pattern = NULL;
|
|
struct transport_ls_refs_options transport_options =
|
|
TRANSPORT_LS_REFS_OPTIONS_INIT;
|
|
int i;
|
|
struct string_list server_options = STRING_LIST_INIT_DUP;
|
|
|
|
struct remote *remote;
|
|
struct transport *transport;
|
|
const struct ref *ref;
|
|
struct ref_array ref_array;
|
|
struct string_list sorting_options = STRING_LIST_INIT_DUP;
|
|
|
|
struct option options[] = {
|
|
OPT__QUIET(&quiet, N_("do not print remote URL")),
|
|
OPT_STRING(0, "upload-pack", &uploadpack, N_("exec"),
|
|
N_("path of git-upload-pack on the remote host")),
|
|
{ OPTION_STRING, 0, "exec", &uploadpack, N_("exec"),
|
|
N_("path of git-upload-pack on the remote host"),
|
|
PARSE_OPT_HIDDEN },
|
|
OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
|
|
OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_HEADS),
|
|
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
|
|
OPT_BOOL(0, "get-url", &get_url,
|
|
N_("take url.<base>.insteadOf into account")),
|
|
OPT_REF_SORT(&sorting_options),
|
|
OPT_SET_INT_F(0, "exit-code", &status,
|
|
N_("exit with exit code 2 if no matching refs are found"),
|
|
2, PARSE_OPT_NOCOMPLETE),
|
|
OPT_BOOL(0, "symref", &show_symref_target,
|
|
N_("show underlying ref in addition to the object pointed by it")),
|
|
OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
|
|
OPT_END()
|
|
};
|
|
|
|
memset(&ref_array, 0, sizeof(ref_array));
|
|
|
|
argc = parse_options(argc, argv, prefix, options, ls_remote_usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
dest = argv[0];
|
|
|
|
packet_trace_identity("ls-remote");
|
|
|
|
if (argc > 1) {
|
|
int i;
|
|
CALLOC_ARRAY(pattern, argc);
|
|
for (i = 1; i < argc; i++) {
|
|
pattern[i - 1] = xstrfmt("*/%s", argv[i]);
|
|
}
|
|
}
|
|
|
|
if (flags & REF_TAGS)
|
|
strvec_push(&transport_options.ref_prefixes, "refs/tags/");
|
|
if (flags & REF_HEADS)
|
|
strvec_push(&transport_options.ref_prefixes, "refs/heads/");
|
|
|
|
remote = remote_get(dest);
|
|
if (!remote) {
|
|
if (dest)
|
|
die("bad repository '%s'", dest);
|
|
die("No remote configured to list refs from.");
|
|
}
|
|
if (!remote->url_nr)
|
|
die("remote %s has no configured URL", dest);
|
|
|
|
if (get_url) {
|
|
printf("%s\n", *remote->url);
|
|
return 0;
|
|
}
|
|
|
|
transport = transport_get(remote, NULL);
|
|
if (uploadpack != NULL)
|
|
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
|
|
if (server_options.nr)
|
|
transport->server_options = &server_options;
|
|
|
|
ref = transport_get_remote_refs(transport, &transport_options);
|
|
if (ref) {
|
|
int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
|
|
repo_set_hash_algo(the_repository, hash_algo);
|
|
}
|
|
|
|
if (!dest && !quiet)
|
|
fprintf(stderr, "From %s\n", *remote->url);
|
|
for ( ; ref; ref = ref->next) {
|
|
struct ref_array_item *item;
|
|
if (!check_ref_type(ref, flags))
|
|
continue;
|
|
if (!tail_match(pattern, ref->name))
|
|
continue;
|
|
item = ref_array_push(&ref_array, ref->name, &ref->old_oid);
|
|
item->symref = xstrdup_or_null(ref->symref);
|
|
}
|
|
|
|
if (sorting_options.nr) {
|
|
struct ref_sorting *sorting;
|
|
|
|
sorting = ref_sorting_options(&sorting_options);
|
|
ref_array_sort(sorting, &ref_array);
|
|
ref_sorting_release(sorting);
|
|
}
|
|
|
|
for (i = 0; i < ref_array.nr; i++) {
|
|
const struct ref_array_item *ref = ref_array.items[i];
|
|
if (show_symref_target && ref->symref)
|
|
printf("ref: %s\t%s\n", ref->symref, ref->refname);
|
|
printf("%s\t%s\n", oid_to_hex(&ref->objectname), ref->refname);
|
|
status = 0; /* we found something */
|
|
}
|
|
|
|
ref_array_clear(&ref_array);
|
|
if (transport_disconnect(transport))
|
|
return 1;
|
|
return status;
|
|
}
|