From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, jacob.keller@gmail.com,
Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH v3 00/16] port branch.c to use ref-filter's printing options
Date: Wed, 30 Mar 2016 15:09:44 +0530 [thread overview]
Message-ID: <1459330800-12525-1-git-send-email-Karthik.188@gmail.com> (raw)
I kinda waited before sending this, since there was lot of discussions
happening regarding to GSOC16, didn't want to clutter the mailing list.
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)
Changes in this version:
1. Only Documentation and commit message changes as suggested by
Jacob in v2.
Thanks to Jacob for his suggestions on the previous iteration.
Karthik Nayak (16):
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 symref_atom_parser()
ref-filter: introduce refname_atom_parser()
ref-filter: add support for %(refname:dir) and %(refname:base)
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 | 63 +++++-
builtin/branch.c | 267 ++++++----------------
builtin/tag.c | 2 +
ref-filter.c | 447 +++++++++++++++++++++++++++++++------
ref-filter.h | 7 +
t/t3203-branch-output.sh | 12 +
t/t6040-tracking-info.sh | 2 +-
t/t6300-for-each-ref.sh | 40 +++-
t/t6302-for-each-ref-filter.sh | 88 ++++++++
10 files changed, 657 insertions(+), 278 deletions(-)
Interdiff:
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 0d7d80f..578bbd1 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -109,10 +109,6 @@ objectsize::
objectname::
The object name (aka SHA-1).
For a non-ambiguous abbreviation of the object name append `:short`.
- For an abbreviation of the object name with desired length append
- `:short=<length>`, where the minimum length is MINIMUM_ABBREV. The
- length may be exceeded to ensure unique object names.
-
upstream::
The name of a local ref which can be considered ``upstream''
@@ -120,11 +116,12 @@ upstream::
`refname` above. Additionally respects `:track` to show
"[ahead N, behind M]" and `:trackshort` to show the terse
version: ">" (ahead), "<" (behind), "<>" (ahead and behind),
- or "=" (in sync). `:track` also prints "[gone]" whenever
- unknown upstream ref is encountered. Append `:track,nobracket`
- to show tracking information without brackets (i.e "ahead N,
- behind M"). Has no effect if the ref does not have tracking
- information associated with it.
+ or "=" (in sync). Has no effect if the ref does not have
+ tracking information associated with it. `:track` also prints
+ "[gone]" whenever unknown upstream ref is encountered. Append
+ `:track,nobracket` to show tracking information without
+ brackets (i.e "ahead N, behind M"). Has no effect if the ref
+ does not have tracking information associated with it.
push::
The name of a local ref which represents the `@{push}` location
--
2.7.4
next reply other threads:[~2016-03-30 9:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 9:39 Karthik Nayak [this message]
2016-03-30 9:39 ` [PATCH v3 01/16] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 02/16] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-03-30 22:12 ` Junio C Hamano
2016-03-30 9:39 ` [PATCH v3 03/16] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 04/16] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 05/16] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-03-30 22:16 ` Junio C Hamano
2016-04-01 18:41 ` Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 06/16] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 07/16] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 08/16] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 09/16] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-03-30 22:17 ` Junio C Hamano
2016-04-01 18:13 ` Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 10/16] ref-filter: introduce symref_atom_parser() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 11/16] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 12/16] ref-filter: add support for %(refname:dir) and %(refname:base) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-03-30 21:58 ` Junio C Hamano
2016-04-01 19:00 ` Karthik Nayak
2016-04-04 8:05 ` Matthieu Moy
2016-04-04 16:12 ` Junio C Hamano
2016-03-30 9:39 ` [PATCH v3 14/16] branch, tag: use porcelain output Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 15/16] branch: use ref-filter printing APIs Karthik Nayak
2016-03-30 9:40 ` [PATCH v3 16/16] branch: implement '--format' option Karthik Nayak
2016-03-30 22:19 ` [PATCH v3 00/16] port branch.c to use ref-filter's printing options Junio C Hamano
2016-04-01 13:31 ` Dennis Kaarsemaker
2016-04-01 13:44 ` Dennis Kaarsemaker
2016-04-01 15:15 ` Ramsay Jones
2016-04-01 19:42 ` Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459330800-12525-1-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).