ref-filter: sort detached HEAD lines firstly

Before this patch, "git branch" would put "(HEAD detached...)" and "(no
branch, rebasing...)" lines before all the other branches *in most
cases* except for when using Chinese-language messages. zh_CN generally
uses a full-width "(" symbol (codepoint FF08) to match the full-width
proportions of Chinese characters, and the translated strings we had did
use them. This meant that the detached HEAD line would appear after all
local refs and even after the remote refs if there were any.

AFAIK, it is sometimes not jarring to see the half-width parenthesis in
"full-width" text as in the CJK languages, for instance when there are
no characters preceding or following the parenthesized text fragment. By
removing the parenthesis from the localizable text, we can share strings
with wt-status.c and remove a cautionary comment to translators.

Remove the ( from the localizable portion of messages so the sorting
happens properly regardless of locale.

Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index 422a9c9ae3fd2cfd552ce48c5e68ce18919b1eb9..1d76690c237e19393a35fba2f580380906e402b1 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1441,35 +1441,35 @@ char *get_head_description(void)
        struct wt_status_state state;
        memset(&state, 0, sizeof(state));
        wt_status_get_state(the_repository, &state, 1);
        struct wt_status_state state;
        memset(&state, 0, sizeof(state));
        wt_status_get_state(the_repository, &state, 1);

+
+       /*
+        * The ( character must be hard-coded and not part of a localizable
+        * string, since the description is used as a sort key and compared
+        * with ref names.
+        */
+       strbuf_addch(&desc, '(');

        if (state.rebase_in_progress ||
            state.rebase_interactive_in_progress) {
                if (state.branch)
        if (state.rebase_in_progress ||
            state.rebase_interactive_in_progress) {
                if (state.branch)

-                       strbuf_addf(&desc, _("(no branch, rebasing %s)"),
+                       strbuf_addf(&desc, _("no branch, rebasing %s"),

                                    state.branch);
                else
                                    state.branch);
                else

-                       strbuf_addf(&desc, _("(no branch, rebasing detached HEAD %s)"),
+                       strbuf_addf(&desc, _("no branch, rebasing detached HEAD %s"),

                                    state.detached_from);
        } else if (state.bisect_in_progress)
                                    state.detached_from);
        } else if (state.bisect_in_progress)

-               strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
+               strbuf_addf(&desc, _("no branch, bisect started on %s"),

                            state.branch);
        else if (state.detached_from) {
                if (state.detached_at)
                            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);
+                       strbuf_addstr(&desc, HEAD_DETACHED_AT);

                else
                else

-                       /*
-                        * TRANSLATORS: make sure this matches "HEAD
-                        * detached from " in wt-status.c
-                        */
-                       strbuf_addf(&desc, _("(HEAD detached from %s)"),
-                               state.detached_from);
+                       strbuf_addstr(&desc, HEAD_DETACHED_FROM);
+               strbuf_addstr(&desc, state.detached_from);

        }
        else
        }
        else

-               strbuf_addstr(&desc, _("(no branch)"));
+               strbuf_addstr(&desc, _("no branch"));
+       strbuf_addch(&desc, ')');
+

        free(state.branch);
        free(state.onto);
        free(state.detached_from);
        free(state.branch);
        free(state.onto);
        free(state.detached_from);

diff --git a/wt-status.c b/wt-status.c
index 1f564b12d259956fa71fb0dce78c6e4c3c006897..9e24855b82f1a919b79daf34ed4273d0dc7d8777 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1628,9 +1628,9 @@ static void wt_longstatus_print(struct wt_status *s)
                        } else if (s->state.detached_from) {
                                branch_name = s->state.detached_from;
                                if (s->state.detached_at)
                        } else if (s->state.detached_from) {
                                branch_name = s->state.detached_from;
                                if (s->state.detached_at)

-                                       on_what = _("HEAD detached at ");
+                                       on_what = HEAD_DETACHED_AT;

                                else
                                else

-                                       on_what = _("HEAD detached from ");
+                                       on_what = HEAD_DETACHED_FROM;

                        } else {
                                branch_name = "";
                                on_what = _("Not currently on any branch.");
                        } else {
                                branch_name = "";
                                on_what = _("Not currently on any branch.");

diff --git a/wt-status.h b/wt-status.h
index 3a95975032bb1ee8d87cca4e8a1bbc0afe62e42c..ecdeb828a1a85ae83551b38a5dc6e042086f1790 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -65,6 +65,9 @@ enum wt_status_format {
        STATUS_FORMAT_UNSPECIFIED
 };
 
        STATUS_FORMAT_UNSPECIFIED
 };
 

+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+

 struct wt_status_state {
        int merge_in_progress;
        int am_in_progress;
 struct wt_status_state {
        int merge_in_progress;
        int am_in_progress;