From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH 5/9] ref-filter: adopt get_head_description() from branch.c
Date: Fri, 2 Oct 2015 23:09:02 +0530 [thread overview]
Message-ID: <1443807546-5985-6-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1443807546-5985-1-git-send-email-Karthik.188@gmail.com>
Copy the implementation of get_head_description() from branch.c.
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.
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 | 4 ++++
ref-filter.c | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index b7a60f4..67ef9f1 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -355,6 +355,10 @@ static void add_verbose_info(struct strbuf *out, struct ref_array_item *item,
strbuf_release(&subject);
}
+/*
+ * This is duplicated in ref-filter.c, will be removed when we adopt
+ * ref-filter's printing APIs.
+ */
static char *get_head_description(void)
{
struct strbuf desc = STRBUF_INIT;
diff --git a/ref-filter.c b/ref-filter.c
index 223daeb..15df421 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -13,6 +13,7 @@
#include "utf8.h"
#include "git-compat-util.h"
#include "version.h"
+#include "wt-status.h"
typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
@@ -915,6 +916,37 @@ static inline char *copy_advance(char *dst, const char *src)
return dst;
}
+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) {
+ /* 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.
*/
@@ -953,9 +985,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;
--
2.6.0
next prev parent reply other threads:[~2015-10-02 17:39 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-02 17:38 [PATCH 0/9] port branch.c to use ref-filter printing APIs Karthik Nayak
2015-10-02 17:38 ` [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2015-10-02 20:45 ` Junio C Hamano
2015-10-03 7:05 ` Karthik Nayak
2015-10-03 9:39 ` Matthieu Moy
2015-10-03 17:01 ` Junio C Hamano
2015-10-04 8:02 ` Matthieu Moy
2015-10-04 17:21 ` Junio C Hamano
2015-10-04 13:59 ` Karthik Nayak
2015-10-02 17:38 ` [PATCH 2/9] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2015-10-02 20:54 ` Junio C Hamano
2015-10-03 7:14 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 3/9] ref-filter: add support for %(path) atom Karthik Nayak
2015-10-03 10:02 ` Matthieu Moy
2015-10-04 17:07 ` Karthik Nayak
2015-10-04 17:51 ` Matthieu Moy
2015-10-04 18:44 ` Junio C Hamano
2015-10-05 6:40 ` Matthieu Moy
2015-10-04 19:12 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2015-10-02 21:02 ` Junio C Hamano
2015-10-03 7:28 ` Karthik Nayak
2015-10-02 17:39 ` Karthik Nayak [this message]
2015-10-02 17:39 ` [PATCH 6/9] ref-filter: introduce format_ref_array_item() Karthik Nayak
2015-10-03 12:02 ` Matthieu Moy
2015-10-05 7:49 ` Karthik Nayak
2015-10-05 8:49 ` Matthieu Moy
2015-10-06 19:16 ` Karthik Nayak
2015-10-06 19:38 ` Matthieu Moy
2015-10-06 19:50 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2015-10-03 12:08 ` Matthieu Moy
2015-10-05 7:49 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 8/9] branch: use ref-filter printing APIs Karthik Nayak
2015-10-03 12:41 ` Matthieu Moy
2015-10-05 17:46 ` Karthik Nayak
2015-10-05 18:43 ` Matthieu Moy
2015-10-06 15:30 ` Karthik Nayak
2015-10-06 19:03 ` Matthieu Moy
2015-10-07 16:47 ` Karthik Nayak
2015-10-07 17:58 ` Matthieu Moy
2015-10-07 18:02 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 9/9] branch: implement '--format' option 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=1443807546-5985-6-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).