This is part of unification of the commands 'git tag -l, git branch -l and git for-each-ref'. This ports over branch.c to use ref-filter's printing options.
Initially posted here: $(gmane/279226). It was decided that this series would follow up after refactoring ref-filter parsing mechanism, which is now merged into master (9606218b32344c5c756f7c29349d3845ef60b80c). v1 can be found here: $(gmane/288342) v2 can be found here: $(gmane/288863) v3 can be found here: $(gmane/290299) v4 can be found here: $(gmane/291106) v5b can be found here: $(gmane/292467) v6 can be found here: http://marc.info/?l=git&m=146330914118766&w=2 v7 can be found here: http://marc.info/?l=git&m=147863593317362&w=2 v8 can be found here: http://marc.info/?l=git&m=148112502029302&w=2 Changes in this version: 1. A few formatting errors. 2. Made quote_literal_for_format() static. 3. lstrip and rstrip doesn't die on less components. Thanks Jacob, Junio, Jeff, Ramsay for their suggestions and help. Karthik Nayak (20): ref-filter: implement %(if), %(then), and %(else) atoms ref-filter: include reference to 'used_atom' within 'atom_value' ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) ref-filter: modify "%(objectname:short)" to take length ref-filter: move get_head_description() from branch.c ref-filter: introduce format_ref_array_item() ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams ref-filter: add support for %(upstream:track,nobracket) ref-filter: make "%(symref)" atom work with the ':short' modifier ref-filter: introduce refname_atom_parser_internal() ref-filter: introduce refname_atom_parser() ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() ref-filter: rename the 'strip' option to 'lstrip' ref-filter: Do not abruptly die when using the 'lstrip=<N>' option ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>' ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames ref-filter: allow porcelain to translate messages in the output branch, tag: use porcelain output branch: use ref-filter printing APIs branch: implement '--format' option Documentation/git-branch.txt | 7 +- Documentation/git-for-each-ref.txt | 86 +++++-- builtin/branch.c | 290 +++++++--------------- builtin/tag.c | 6 +- ref-filter.c | 490 +++++++++++++++++++++++++++++++------ ref-filter.h | 7 + t/t3203-branch-output.sh | 16 +- t/t6040-tracking-info.sh | 2 +- t/t6300-for-each-ref.sh | 88 ++++++- t/t6302-for-each-ref-filter.sh | 94 +++++++ 10 files changed, 780 insertions(+), 306 deletions(-) Interdiff: diff --git a/builtin/branch.c b/builtin/branch.c index 6393c3c..4051a18 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -306,9 +306,9 @@ static int calc_maxwidth(struct ref_array *refs, int remote_bonus) return max; } -const char *quote_literal_for_format(const char *s) +static const char *quote_literal_for_format(const char *s) { - struct strbuf buf = STRBUF_INIT; + static struct strbuf buf = STRBUF_INIT; strbuf_reset(&buf); while (*s) { --- a/ref-filter.c +++ b/ref-filter.c @@ -76,10 +77,10 @@ static struct used_atom { struct { enum { RR_REF, RR_TRACK, RR_TRACKSHORT } option; struct refname_atom refname; - unsigned int nobracket: 1; + unsigned int nobracket : 1; } remote_ref; @@ -1106,7 +1126,8 @@ static const char *lstrip_ref_components(const char *refname, int len) const char *p = refname; /* Find total no of '/' separated path-components */ - for (i = 0; p[i]; p[i] == '/' ? i++ : *p++); + for (i = 0; p[i]; p[i] == '/' ? i++ : *p++) + ; /* * The number of components we need to strip is now * the total minus the components to be left (Plus one @@ -1116,11 +1137,10 @@ static const char *lstrip_ref_components(const char *refname, int len) remaining = i + len + 1; } - while (remaining) { + while (remaining > 0) { switch (*start++) { case '\0': - die(_("ref '%s' does not have %d components to :lstrip"), - refname, len); + return ""; case '/': remaining--; break; @@ -1140,7 +1160,8 @@ static const char *rstrip_ref_components(const char *refname, int len) const char *p = refname; /* Find total no of '/' separated path-components */ - for (i = 0; p[i]; p[i] == '/' ? i++ : *p++); + for (i = 0; p[i]; p[i] == '/' ? i++ : *p++) + ; /* * The number of components we need to strip is now * the total minus the components to be left (Plus one @@ -1150,11 +1171,10 @@ static const char *rstrip_ref_components(const char *refname, int len) remaining = i + len + 1; } - while (remaining--) { + while (remaining-- > 0) { char *p = strrchr(start, '/'); if (p == NULL) - die(_("ref '%s' does not have %d components to :rstrip"), - refname, len); + return ""; else p[0] = '\0'; } --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -153,16 +153,6 @@ test_expect_success 'Check invalid atoms names are errors' ' test_must_fail git for-each-ref --format="%(INVALID)" refs/heads ' -test_expect_success 'stripping refnames too far gives an error' ' - test_must_fail git for-each-ref --format="%(refname:lstrip=3)" && - test_must_fail git for-each-ref --format="%(refname:lstrip=-4)" -' - -test_expect_success 'stripping refnames too far gives an error' ' - test_must_fail git for-each-ref --format="%(refname:rstrip=3)" && - test_must_fail git for-each-ref --format="%(refname:rstrip=-4)" -' - test_expect_success 'Check format specifiers are ignored in naming date atoms' ' git for-each-ref --format="%(authordate)" refs/heads && git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads && diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index c72baeb..81db67d 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -92,14 +95,13 @@ refname:: The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict - abbreviation mode. If `lstrip=<N>` or `rstrip=<N>` option can + abbreviation mode. The `lstrip=<N>` or `rstrip=<N>` option can be appended to strip `<N>` slash-separated path components - from or end of the refname respectively (e.g., + from the left or right of the refname respectively (e.g., `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). if `<N>` is a negative number, then only `<N>` path components - are left behind. If a displayed ref has fewer components than - `<N>`, the command aborts with an error. + are left behind. objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`). -- 2.10.2
