|
|
|
|
#include "builtin.h"
|
|
|
|
|
#include "cache.h"
|
|
|
|
|
#include "config.h"
|
|
|
|
|
#include "refs.h"
|
|
|
|
|
#include "object.h"
|
|
|
|
|
#include "parse-options.h"
|
|
|
|
|
#include "ref-filter.h"
|
|
|
|
|
|
|
|
|
|
static char const * const for_each_ref_usage[] = {
|
|
|
|
|
N_("git for-each-ref [<options>] [<pattern>]"),
|
|
|
|
|
N_("git for-each-ref [--points-at <object>]"),
|
|
|
|
|
N_("git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"),
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years ago
|
|
|
N_("git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"),
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
|
|
|
|
|
int maxcount = 0, icase = 0;
|
|
|
|
|
struct ref_array array;
|
|
|
|
|
struct ref_filter filter;
|
|
|
|
|
struct ref_format format = REF_FORMAT_INIT;
|
|
|
|
|
|
|
|
|
|
struct option opts[] = {
|
|
|
|
|
OPT_BIT('s', "shell", &format.quote_style,
|
|
|
|
|
N_("quote placeholders suitably for shells"), QUOTE_SHELL),
|
|
|
|
|
OPT_BIT('p', "perl", &format.quote_style,
|
|
|
|
|
N_("quote placeholders suitably for perl"), QUOTE_PERL),
|
|
|
|
|
OPT_BIT(0 , "python", &format.quote_style,
|
|
|
|
|
N_("quote placeholders suitably for python"), QUOTE_PYTHON),
|
|
|
|
|
OPT_BIT(0 , "tcl", &format.quote_style,
|
|
|
|
|
N_("quote placeholders suitably for Tcl"), QUOTE_TCL),
|
|
|
|
|
|
|
|
|
|
OPT_GROUP(""),
|
|
|
|
|
OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")),
|
|
|
|
|
OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")),
|
|
|
|
|
OPT__COLOR(&format.use_color, N_("respect format colors")),
|
parse_opt_ref_sorting: always use with NONEG flag
The "--sort" parameter of for-each-ref, etc, does not handle negation,
and instead returns an error to the parse-options code. But neither
piece of code prints anything for the user, which may leave them
confused:
$ git for-each-ref --no-sort
$ echo $?
129
As the comment in the callback function notes, this probably should
clear the list, which would make it consistent with other list-like
options (i.e., anything that uses OPT_STRING_LIST currently).
Unfortunately that's a bit tricky due to the way the ref-filter code
works. But in the meantime, let's at least make the error a little less
confusing:
- switch to using PARSE_OPT_NONEG in the option definition, which will
cause the options code to produce a useful message
- since this was cut-and-pasted to four different spots, let's define
a single OPT_REF_SORT() macro that we can use everywhere
- the callback can use BUG_ON_OPT_NEG() to make sure the correct flags
are used (incidentally, this also satisfies -Wunused-parameters,
since we're now looking at "unset")
- expand the comment into a NEEDSWORK to make it clear that the
direction is right, but the details need to be worked out
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 years ago
|
|
|
OPT_REF_SORT(sorting_tail),
|
|
|
|
|
OPT_CALLBACK(0, "points-at", &filter.points_at,
|
|
|
|
|
N_("object"), N_("print only refs which points at the given object"),
|
|
|
|
|
parse_opt_object_name),
|
|
|
|
|
OPT_MERGED(&filter, N_("print only refs that are merged")),
|
|
|
|
|
OPT_NO_MERGED(&filter, N_("print only refs that are not merged")),
|
|
|
|
|
OPT_CONTAINS(&filter.with_commit, N_("print only refs which contain the commit")),
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years ago
|
|
|
OPT_NO_CONTAINS(&filter.no_commit, N_("print only refs which don't contain the commit")),
|
|
|
|
|
OPT_BOOL(0, "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
|
|
|
|
|
OPT_END(),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
memset(&array, 0, sizeof(array));
|
|
|
|
|
memset(&filter, 0, sizeof(filter));
|
|
|
|
|
|
|
|
|
|
format.format = "%(objectname) %(objecttype)\t%(refname)";
|
|
|
|
|
|
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
|
|
|
|
|
|
parse_options(argc, argv, prefix, opts, for_each_ref_usage, 0);
|
|
|
|
|
if (maxcount < 0) {
|
|
|
|
|
error("invalid --count argument: `%d'", maxcount);
|
|
|
|
|
usage_with_options(for_each_ref_usage, opts);
|
|
|
|
|
}
|
|
|
|
|
if (HAS_MULTI_BITS(format.quote_style)) {
|
|
|
|
|
error("more than one quoting style?");
|
|
|
|
|
usage_with_options(for_each_ref_usage, opts);
|
|
|
|
|
}
|
|
|
|
|
if (verify_ref_format(&format))
|
|
|
|
|
usage_with_options(for_each_ref_usage, opts);
|
|
|
|
|
|
|
|
|
|
if (!sorting)
|
|
|
|
|
sorting = ref_default_sorting();
|
ref-filter: apply --ignore-case to all sorting keys
All of the ref-filter users (for-each-ref, branch, and tag) take an
--ignore-case option which makes filtering and sorting case-insensitive.
However, this option was applied only to the first element of the
ref_sorting list. So:
git for-each-ref --ignore-case --sort=refname
would do what you expect, but:
git for-each-ref --ignore-case --sort=refname --sort=taggername
would sort the primary key (taggername) case-insensitively, but sort the
refname case-sensitively. We have two options here:
- teach callers to set ignore_case on the whole list
- replace the ref_sorting list with a struct that contains both the
list of sorting keys, as well as options that apply to _all_
keys
I went with the first one here, as it gives more flexibility if we later
want to let the users set the flag per-key (presumably through some
special syntax when defining the key; for now it's all or nothing
through --ignore-case).
The new test covers this by sorting on both tagger and subject
case-insensitively, which should compare "a" and "A" identically, but
still sort them before "b" and "B". We'll break ties by sorting on the
refname to give ourselves a stable output (this is actually supposed to
be done automatically, but there's another bug which will be fixed in
the next commit).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
5 years ago
|
|
|
ref_sorting_icase_all(sorting, icase);
|
|
|
|
|
filter.ignore_case = icase;
|
|
|
|
|
|
|
|
|
|
filter.name_patterns = argv;
|
|
|
|
|
filter.match_as_path = 1;
|
|
|
|
|
filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
|
|
|
|
|
ref_array_sort(sorting, &array);
|
|
|
|
|
|
|
|
|
|
if (!maxcount || array.nr < maxcount)
|
|
|
|
|
maxcount = array.nr;
|
|
|
|
|
for (i = 0; i < maxcount; i++)
|
|
|
|
|
show_ref_array_item(array.items[i], &format);
|
|
|
|
|
ref_array_clear(&array);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
