From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, gitster@pobox.com,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v10 05/20] ref-filter: move get_head_description() from branch.c
Date: Tue, 10 Jan 2017 14:19:38 +0530 [thread overview]
Message-ID: <20170110084953.15890-6-Karthik.188@gmail.com> (raw)
In-Reply-To: <20170110084953.15890-1-Karthik.188@gmail.com>
From: Karthik Nayak <karthik.188@gmail.com>
Move the implementation of get_head_description() from branch.c to
ref-filter. This gives a description of the HEAD ref if called. This
is used as the refname for the HEAD ref whenever the
FILTER_REFS_DETACHED_HEAD option is used. Make it public because we
need it to calculate the length of the HEAD refs description in
branch.c:calc_maxwidth() when we port branch.c to use ref-filter
APIs.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
builtin/branch.c | 33 ---------------------------------
ref-filter.c | 38 ++++++++++++++++++++++++++++++++++++--
ref-filter.h | 2 ++
3 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 9d30f55b0..6423ebce5 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -364,39 +364,6 @@ static void add_verbose_info(struct strbuf *out, struct ref_array_item *item,
strbuf_release(&subject);
}
-static char *get_head_description(void)
-{
- struct strbuf desc = STRBUF_INIT;
- struct wt_status_state state;
- memset(&state, 0, sizeof(state));
- wt_status_get_state(&state, 1);
- if (state.rebase_in_progress ||
- state.rebase_interactive_in_progress)
- strbuf_addf(&desc, _("(no branch, rebasing %s)"),
- state.branch);
- else if (state.bisect_in_progress)
- strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
- state.branch);
- else if (state.detached_from) {
- if (state.detached_at)
- /* TRANSLATORS: make sure this matches
- "HEAD detached at " in wt-status.c */
- strbuf_addf(&desc, _("(HEAD detached at %s)"),
- state.detached_from);
- else
- /* TRANSLATORS: make sure this matches
- "HEAD detached from " in wt-status.c */
- strbuf_addf(&desc, _("(HEAD detached from %s)"),
- state.detached_from);
- }
- else
- strbuf_addstr(&desc, _("(no branch)"));
- free(state.branch);
- free(state.onto);
- free(state.detached_from);
- return strbuf_detach(&desc, NULL);
-}
-
static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth,
struct ref_filter *filter, const char *remote_prefix)
{
diff --git a/ref-filter.c b/ref-filter.c
index 385fc04d0..5511a200c 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -14,6 +14,7 @@
#include "git-compat-util.h"
#include "version.h"
#include "trailer.h"
+#include "wt-status.h"
typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
typedef enum { COMPARE_EQUAL, COMPARE_UNEQUAL, COMPARE_NONE } cmp_status;
@@ -1101,6 +1102,37 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
*s = refname;
}
+char *get_head_description(void)
+{
+ struct strbuf desc = STRBUF_INIT;
+ struct wt_status_state state;
+ memset(&state, 0, sizeof(state));
+ wt_status_get_state(&state, 1);
+ if (state.rebase_in_progress ||
+ state.rebase_interactive_in_progress)
+ strbuf_addf(&desc, _("(no branch, rebasing %s)"),
+ state.branch);
+ else if (state.bisect_in_progress)
+ strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
+ state.branch);
+ else if (state.detached_from) {
+ /* TRANSLATORS: make sure these match _("HEAD detached at ")
+ and _("HEAD detached from ") in wt-status.c */
+ if (state.detached_at)
+ strbuf_addf(&desc, _("(HEAD detached at %s)"),
+ state.detached_from);
+ else
+ strbuf_addf(&desc, _("(HEAD detached from %s)"),
+ state.detached_from);
+ }
+ else
+ strbuf_addstr(&desc, _("(no branch)"));
+ free(state.branch);
+ free(state.onto);
+ free(state.detached_from);
+ return strbuf_detach(&desc, NULL);
+}
+
/*
* Parse the object referred by ref, and grab needed value.
*/
@@ -1140,9 +1172,11 @@ static void populate_value(struct ref_array_item *ref)
name++;
}
- if (starts_with(name, "refname"))
+ if (starts_with(name, "refname")) {
refname = ref->refname;
- else if (starts_with(name, "symref"))
+ if (ref->kind & FILTER_REFS_DETACHED_HEAD)
+ refname = get_head_description();
+ } else if (starts_with(name, "symref"))
refname = ref->symref ? ref->symref : "";
else if (starts_with(name, "upstream")) {
const char *branch_name;
diff --git a/ref-filter.h b/ref-filter.h
index fc55fa357..f78323de0 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -108,5 +108,7 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);
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);
#endif /* REF_FILTER_H */
--
2.11.0
next prev parent reply other threads:[~2017-01-10 8:49 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 8:49 [PATCH v10 00/20] port branch.c to use ref-filter's printing options Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 01/20] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 02/20] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 03/20] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2017-01-10 20:45 ` Junio C Hamano
2017-01-14 10:02 ` Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 04/20] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2017-01-10 8:49 ` Karthik Nayak [this message]
2017-01-10 8:49 ` [PATCH v10 06/20] ref-filter: introduce format_ref_array_item() Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 07/20] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 08/20] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 09/20] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 10/20] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 11/20] ref-filter: introduce refname_atom_parser() Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 12/20] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 13/20] ref-filter: rename the 'strip' option to 'lstrip' Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 14/20] ref-filter: Do not abruptly die when using the 'lstrip=<N>' option Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 15/20] ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>' Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 16/20] ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 17/20] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 18/20] branch, tag: use porcelain output Karthik Nayak
2017-01-10 8:49 ` [PATCH v10 19/20] branch: use ref-filter printing APIs Karthik Nayak
2017-01-11 23:47 ` Jacob Keller
2017-01-14 10:01 ` Karthik Nayak
2017-01-15 5:51 ` Jacob Keller
2017-01-10 8:49 ` [PATCH v10 20/20] branch: implement '--format' option Karthik Nayak
2017-01-10 20:51 ` [PATCH v10 00/20] port branch.c to use ref-filter's printing options Junio C Hamano
2017-01-14 10:03 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170110084953.15890-6-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).