2015-06-13 19:37:26 +00:00
|
|
|
#ifndef REF_FILTER_H
|
|
|
|
#define REF_FILTER_H
|
|
|
|
|
|
|
|
#include "sha1-array.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "parse-options.h"
|
|
|
|
|
|
|
|
/* Quoting styles */
|
|
|
|
#define QUOTE_NONE 0
|
|
|
|
#define QUOTE_SHELL 1
|
|
|
|
#define QUOTE_PERL 2
|
|
|
|
#define QUOTE_PYTHON 4
|
|
|
|
#define QUOTE_TCL 8
|
|
|
|
|
2015-09-10 15:48:23 +00:00
|
|
|
#define FILTER_REFS_INCLUDE_BROKEN 0x0001
|
|
|
|
#define FILTER_REFS_TAGS 0x0002
|
|
|
|
#define FILTER_REFS_BRANCHES 0x0004
|
|
|
|
#define FILTER_REFS_REMOTES 0x0008
|
|
|
|
#define FILTER_REFS_OTHERS 0x0010
|
|
|
|
#define FILTER_REFS_ALL (FILTER_REFS_TAGS | FILTER_REFS_BRANCHES | \
|
|
|
|
FILTER_REFS_REMOTES | FILTER_REFS_OTHERS)
|
|
|
|
#define FILTER_REFS_DETACHED_HEAD 0x0020
|
|
|
|
#define FILTER_REFS_KIND_MASK (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD)
|
2015-06-13 19:37:28 +00:00
|
|
|
|
2015-08-22 03:39:37 +00:00
|
|
|
struct atom_value;
|
2015-06-13 19:37:26 +00:00
|
|
|
|
|
|
|
struct ref_sorting {
|
|
|
|
struct ref_sorting *next;
|
|
|
|
int atom; /* index into used_atom array (internal) */
|
2015-09-10 15:48:25 +00:00
|
|
|
unsigned reverse : 1,
|
2016-12-04 02:52:25 +00:00
|
|
|
ignore_case : 1,
|
2015-09-10 15:48:25 +00:00
|
|
|
version : 1;
|
2015-06-13 19:37:26 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ref_array_item {
|
2017-05-06 22:10:21 +00:00
|
|
|
struct object_id objectname;
|
2015-06-13 19:37:26 +00:00
|
|
|
int flag;
|
2015-09-10 15:48:23 +00:00
|
|
|
unsigned int kind;
|
2015-06-13 19:37:26 +00:00
|
|
|
const char *symref;
|
2015-07-07 16:06:12 +00:00
|
|
|
struct commit *commit;
|
2015-06-13 19:37:26 +00:00
|
|
|
struct atom_value *value;
|
2015-06-13 19:37:29 +00:00
|
|
|
char refname[FLEX_ARRAY];
|
2015-06-13 19:37:26 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ref_array {
|
|
|
|
int nr, alloc;
|
|
|
|
struct ref_array_item **items;
|
2015-09-23 18:11:11 +00:00
|
|
|
struct rev_info *revs;
|
2015-06-13 19:37:26 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ref_filter {
|
|
|
|
const char **name_patterns;
|
2017-03-31 01:40:00 +00:00
|
|
|
struct oid_array points_at;
|
2015-07-07 16:06:16 +00:00
|
|
|
struct commit_list *with_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>
2017-03-24 18:40:57 +00:00
|
|
|
struct commit_list *no_commit;
|
2015-07-07 16:06:12 +00:00
|
|
|
|
|
|
|
enum {
|
|
|
|
REF_FILTER_MERGED_NONE = 0,
|
|
|
|
REF_FILTER_MERGED_INCLUDE,
|
|
|
|
REF_FILTER_MERGED_OMIT
|
|
|
|
} merge;
|
|
|
|
struct commit *merge_commit;
|
2015-07-07 16:06:16 +00:00
|
|
|
|
2015-09-10 15:48:26 +00:00
|
|
|
unsigned int with_commit_tag_algo : 1,
|
2015-09-23 18:11:11 +00:00
|
|
|
match_as_path : 1,
|
2016-12-04 02:52:25 +00:00
|
|
|
ignore_case : 1,
|
2015-09-23 18:11:11 +00:00
|
|
|
detached : 1;
|
2015-09-11 15:04:16 +00:00
|
|
|
unsigned int kind,
|
|
|
|
lines;
|
2015-09-23 18:11:11 +00:00
|
|
|
int abbrev,
|
|
|
|
verbose;
|
2015-06-13 19:37:26 +00:00
|
|
|
};
|
|
|
|
|
2017-07-13 15:01:18 +00:00
|
|
|
struct ref_format {
|
|
|
|
/*
|
|
|
|
* Set these to define the format; make sure you call
|
|
|
|
* verify_ref_format() afterwards to finalize.
|
|
|
|
*/
|
|
|
|
const char *format;
|
|
|
|
int quote_style;
|
2017-07-13 15:02:30 +00:00
|
|
|
|
|
|
|
/* Internal state to ref-filter */
|
|
|
|
int need_color_reset_at_eol;
|
2017-07-13 15:01:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define REF_FORMAT_INIT { NULL, 0 }
|
|
|
|
|
2015-07-07 16:06:11 +00:00
|
|
|
/* Macros for checking --merged and --no-merged options */
|
|
|
|
#define _OPT_MERGED_NO_MERGED(option, filter, h) \
|
|
|
|
{ OPTION_CALLBACK, 0, option, (filter), N_("commit"), (h), \
|
|
|
|
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, \
|
|
|
|
parse_opt_merge_filter, (intptr_t) "HEAD" \
|
|
|
|
}
|
|
|
|
#define OPT_MERGED(f, h) _OPT_MERGED_NO_MERGED("merged", f, h)
|
|
|
|
#define OPT_NO_MERGED(f, h) _OPT_MERGED_NO_MERGED("no-merged", f, h)
|
|
|
|
|
2015-06-13 19:37:28 +00:00
|
|
|
/*
|
|
|
|
* API for filtering a set of refs. Based on the type of refs the user
|
|
|
|
* has requested, we iterate through those refs and apply filters
|
|
|
|
* as per the given ref_filter structure and finally store the
|
|
|
|
* filtered refs in the ref_array structure.
|
|
|
|
*/
|
|
|
|
int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type);
|
2015-06-13 19:37:26 +00:00
|
|
|
/* Clear all memory allocated to ref_array */
|
|
|
|
void ref_array_clear(struct ref_array *array);
|
|
|
|
/* Parse format string and sort specifiers */
|
|
|
|
int parse_ref_filter_atom(const char *atom, const char *ep);
|
|
|
|
/* Used to verify if the given format is correct and to parse out the used atoms */
|
2017-07-13 15:01:18 +00:00
|
|
|
int verify_ref_format(struct ref_format *format);
|
2015-06-13 19:37:26 +00:00
|
|
|
/* Sort the given ref_array as per the ref_sorting provided */
|
|
|
|
void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
|
2017-01-10 08:49:39 +00:00
|
|
|
/* Based on the given format and quote_style, fill the strbuf */
|
2017-07-13 15:01:18 +00:00
|
|
|
void format_ref_array_item(struct ref_array_item *info,
|
|
|
|
const struct ref_format *format,
|
|
|
|
struct strbuf *final_buf);
|
2015-06-13 19:37:26 +00:00
|
|
|
/* Print the ref using the given format and quote_style */
|
2017-07-13 15:01:18 +00:00
|
|
|
void show_ref_array_item(struct ref_array_item *info, const struct ref_format *format);
|
2015-06-13 19:37:26 +00:00
|
|
|
/* Callback function for parsing the sort option */
|
|
|
|
int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);
|
|
|
|
/* Default sort option based on refname */
|
|
|
|
struct ref_sorting *ref_default_sorting(void);
|
2015-07-07 16:06:11 +00:00
|
|
|
/* Function to parse --merged and --no-merged options */
|
|
|
|
int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset);
|
2017-01-10 08:49:38 +00:00
|
|
|
/* Get the current HEAD's description */
|
|
|
|
char *get_head_description(void);
|
2017-01-10 08:49:50 +00:00
|
|
|
/* Set up translated strings in the output. */
|
|
|
|
void setup_ref_filter_porcelain_msg(void);
|
2015-06-13 19:37:26 +00:00
|
|
|
|
2017-01-17 23:37:19 +00:00
|
|
|
/*
|
|
|
|
* Print a single ref, outside of any ref-filter. Note that the
|
|
|
|
* name must be a fully qualified refname.
|
|
|
|
*/
|
|
|
|
void pretty_print_ref(const char *name, const unsigned char *sha1,
|
2017-07-13 15:01:18 +00:00
|
|
|
const struct ref_format *format);
|
2017-01-17 23:37:19 +00:00
|
|
|
|
2015-06-13 19:37:26 +00:00
|
|
|
#endif /* REF_FILTER_H */
|