mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
11b087adfd
When color placeholders like %(color:red) are used in a ref-filter format, we unconditionally output the colors, even if the user has asked us for no colors. This usually isn't a problem when the user is constructing a --format on the command line, but it means we may do the wrong thing when the format is fed from a script or alias. For example: $ git config alias.b 'branch --format=%(color:green)%(refname)' $ git b --no-color should probably omit the green color. Likewise, running: $ git b >branches should probably also omit the color, just as we would for all baked-in coloring (and as we recently started to do for user-specified colors in --pretty formats). This commit makes both of those cases work by teaching the ref-filter code to consult want_color() before outputting any color. The color flag in ref_format defaults to "-1", which means we'll consult color.ui, which in turn defaults to the usual isatty() check on stdout. However, callers like git-branch which support their own color config (and command-line options) can override that. The new tests independently cover all three of the callers of ref-filter (for-each-ref, tag, and branch). Even though these seem redundant, it confirms that we've correctly plumbed through all of the necessary config to make colors work by default. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
139 lines
4.2 KiB
C
139 lines
4.2 KiB
C
#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
|
|
|
|
#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)
|
|
|
|
struct atom_value;
|
|
|
|
struct ref_sorting {
|
|
struct ref_sorting *next;
|
|
int atom; /* index into used_atom array (internal) */
|
|
unsigned reverse : 1,
|
|
ignore_case : 1,
|
|
version : 1;
|
|
};
|
|
|
|
struct ref_array_item {
|
|
struct object_id objectname;
|
|
int flag;
|
|
unsigned int kind;
|
|
const char *symref;
|
|
struct commit *commit;
|
|
struct atom_value *value;
|
|
char refname[FLEX_ARRAY];
|
|
};
|
|
|
|
struct ref_array {
|
|
int nr, alloc;
|
|
struct ref_array_item **items;
|
|
struct rev_info *revs;
|
|
};
|
|
|
|
struct ref_filter {
|
|
const char **name_patterns;
|
|
struct oid_array points_at;
|
|
struct commit_list *with_commit;
|
|
struct commit_list *no_commit;
|
|
|
|
enum {
|
|
REF_FILTER_MERGED_NONE = 0,
|
|
REF_FILTER_MERGED_INCLUDE,
|
|
REF_FILTER_MERGED_OMIT
|
|
} merge;
|
|
struct commit *merge_commit;
|
|
|
|
unsigned int with_commit_tag_algo : 1,
|
|
match_as_path : 1,
|
|
ignore_case : 1,
|
|
detached : 1;
|
|
unsigned int kind,
|
|
lines;
|
|
int abbrev,
|
|
verbose;
|
|
};
|
|
|
|
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;
|
|
int use_color;
|
|
|
|
/* Internal state to ref-filter */
|
|
int need_color_reset_at_eol;
|
|
};
|
|
|
|
#define REF_FORMAT_INIT { NULL, 0, -1 }
|
|
|
|
/* 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)
|
|
|
|
/*
|
|
* 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);
|
|
/* Clear all memory allocated to ref_array */
|
|
void ref_array_clear(struct ref_array *array);
|
|
/* Used to verify if the given format is correct and to parse out the used atoms */
|
|
int verify_ref_format(struct ref_format *format);
|
|
/* Sort the given ref_array as per the ref_sorting provided */
|
|
void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
|
|
/* Based on the given format and quote_style, fill the strbuf */
|
|
void format_ref_array_item(struct ref_array_item *info,
|
|
const struct ref_format *format,
|
|
struct strbuf *final_buf);
|
|
/* Print the ref using the given format and quote_style */
|
|
void show_ref_array_item(struct ref_array_item *info, const struct ref_format *format);
|
|
/* Parse a single sort specifier and add it to the list */
|
|
void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *atom);
|
|
/* 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);
|
|
/* Function to parse --merged and --no-merged options */
|
|
int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset);
|
|
/* Get the current HEAD's description */
|
|
char *get_head_description(void);
|
|
/* Set up translated strings in the output. */
|
|
void setup_ref_filter_porcelain_msg(void);
|
|
|
|
/*
|
|
* 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,
|
|
const struct ref_format *format);
|
|
|
|
#endif /* REF_FILTER_H */
|