From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH 04/10] branch: roll show_detached HEAD into regular ref_list Date: Tue, 4 Aug 2015 18:31:17 +0530 Message-ID: <1438693282-15516-4-git-send-email-Karthik.188@gmail.com> References: Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr, gitster@pobox.com, Karthik Nayak , Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 04 15:01:38 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZMbqb-0003IO-QC for gcvg-git-2@plane.gmane.org; Tue, 04 Aug 2015 15:01:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933870AbbHDNBf (ORCPT ); Tue, 4 Aug 2015 09:01:35 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35331 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933986AbbHDNB2 (ORCPT ); Tue, 4 Aug 2015 09:01:28 -0400 Received: by pasy3 with SMTP id y3so8186554pas.2 for ; Tue, 04 Aug 2015 06:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0pL3wRVU708T/cef1ui5ke2p6xwwLmFqV63RSJamgN0=; b=Ukhlbdmt+8dUcB1IQK5Ag3pYZK4veFbo0v94v5OpeFOFrJ0gZeM3xTsUn/gK9cfzDv XiI16en2uCSLe8oHJ6hBTHbtzjyCPwC5d6i7BmU/1ZhjUrTyJsvYDfGvqW4B8ji3GoEp j4lJwrZxDYCYXjxV6BCB3JPH3lc6eFITTvTwPKJnu2MiJJrOQsttSrJ/z/9TlP1J32U8 Gqxtysr7jWjn2PXFEvuH/M8CLdpjJN3SWmua0YgACnCkJRqc+6JZhEFxomw+maE8oqdj TtlDDmjd8RBZeK8baowRQqDx9gociiUYJ15G2n6tP9VBX7kX72I47sTAJ7s7jVKNv4KH 0ggg== X-Received: by 10.66.161.232 with SMTP id xv8mr7547807pab.137.1438693287828; Tue, 04 Aug 2015 06:01:27 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by smtp.gmail.com with ESMTPSA id uy6sm1450657pbc.13.2015.08.04.06.01.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Aug 2015 06:01:27 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.5.0 In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Remove show_detached() and make detached HEAD to be rolled into regular ref_list by adding REF_DETACHED_HEAD as a kind of branch and supporting the same in append_ref(). This eliminates the need for an extra function and helps in easier porting of branch.c to use ref-filter APIs. Before show_detached() used to check if the HEAD branch satisfies the '--contains' option, now that is taken care by append_ref(). Based-on-patch-by: Jeff King Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- builtin/branch.c | 68 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 65f6d0d..81815c9 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -30,6 +30,7 @@ static const char * const builtin_branch_usage[] = { #define REF_LOCAL_BRANCH 0x01 #define REF_REMOTE_BRANCH 0x02 +#define REF_DETACHED_HEAD 0x04 static const char *head; static unsigned char head_sha1[20]; @@ -352,8 +353,12 @@ static int append_ref(const char *refname, const struct object_id *oid, int flag break; } } - if (ARRAY_SIZE(ref_kind) <= i) - return 0; + if (ARRAY_SIZE(ref_kind) <= i) { + if (!strcmp(refname, "HEAD")) + kind = REF_DETACHED_HEAD; + else + return 0; + } /* Don't add types the caller doesn't want */ if ((kind & ref_list->kinds) == 0) @@ -535,6 +540,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, int color; struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; const char *prefix = ""; + const char *desc = item->name; if (item->ignore) return; @@ -547,6 +553,10 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, color = BRANCH_COLOR_REMOTE; prefix = remote_prefix; break; + case REF_DETACHED_HEAD: + color = BRANCH_COLOR_CURRENT; + desc = get_head_description(); + break; default: color = BRANCH_COLOR_PLAIN; break; @@ -558,7 +568,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, color = BRANCH_COLOR_CURRENT; } - strbuf_addf(&name, "%s%s", prefix, item->name); + strbuf_addf(&name, "%s%s", prefix, desc); if (verbose) { int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf); strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), @@ -581,6 +591,8 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, } strbuf_release(&name); strbuf_release(&out); + if (item->kind == REF_DETACHED_HEAD) + free((void *)desc); } static int calc_maxwidth(struct ref_list *refs, int remote_bonus) @@ -600,25 +612,9 @@ static int calc_maxwidth(struct ref_list *refs, int remote_bonus) return max; } -static void show_detached(struct ref_list *ref_list, int maxwidth) -{ - struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); - - if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { - struct ref_item item; - item.name = get_head_description(); - item.kind = REF_LOCAL_BRANCH; - item.dest = NULL; - item.commit = head_commit; - item.ignore = 0; - print_ref_item(&item, maxwidth, ref_list->verbose, ref_list->abbrev, 1, ""); - free(item.name); - } -} - static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern) { - int i; + int i, index; struct append_ref_cb cb; struct ref_list ref_list; int maxwidth = 0; @@ -642,7 +638,14 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru cb.ref_list = &ref_list; cb.pattern = pattern; cb.ret = 0; + /* + * First we obtain all regular branch refs and then if the + * HEAD is detached then we insert that ref to the end of the + * ref_fist so that it can be printed first. + */ for_each_rawref(append_ref, &cb); + if (detached) + head_ref(append_ref, &cb); /* * The following implementation is currently duplicated in ref-filter. It * will eventually be removed when we port branch.c to use ref-filter APIs. @@ -678,15 +681,20 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru if (verbose) maxwidth = calc_maxwidth(&ref_list, strlen(remote_prefix)); - qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); + index = ref_list.index; + + /* Print detached HEAD before sorting and printing the rest */ + if (detached && (ref_list.list[index - 1].kind == REF_DETACHED_HEAD) && + !strcmp(ref_list.list[index - 1].name, head)) { + print_ref_item(&ref_list.list[index - 1], maxwidth, verbose, abbrev, + 1, remote_prefix); + index -= 1; + } - detached = (detached && (kinds & REF_LOCAL_BRANCH)); - if (detached && match_patterns(pattern, "HEAD")) - show_detached(&ref_list, maxwidth); + qsort(ref_list.list, index, sizeof(struct ref_item), ref_cmp); - for (i = 0; i < ref_list.index; i++) { - int current = !detached && - (ref_list.list[i].kind == REF_LOCAL_BRANCH) && + for (i = 0; i < index; i++) { + int current = !detached && (ref_list.list[i].kind == REF_LOCAL_BRANCH) && !strcmp(ref_list.list[i].name, head); print_ref_item(&ref_list.list[i], maxwidth, verbose, abbrev, current, remote_prefix); @@ -913,7 +921,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix) die(_("branch name required")); return delete_branches(argc, argv, delete > 1, kinds, quiet); } else if (list) { - int ret = print_ref_list(kinds, detached, verbose, abbrev, + int ret; + /* git branch --local also shows HEAD when it is detached */ + if (kinds & REF_LOCAL_BRANCH) + kinds |= REF_DETACHED_HEAD; + ret = print_ref_list(kinds, detached, verbose, abbrev, with_commit, argv); print_columns(&output, colopts, NULL); string_list_clear(&output, 0); -- 2.5.0