From: Kir Kolyshkin <kolyshkin@gmail.com>
To: git@vger.kernel.org
Cc: Kir Kolyshkin <kolyshkin@gmail.com>, Roman Dodin <dodin.roman@gmail.com>
Subject: [PATCH] remote: align columns on -v
Date: Tue, 7 Feb 2023 15:52:38 -0800 [thread overview]
Message-ID: <20230207235238.1850757-1-kolyshkin@gmail.com> (raw)
Currently, git remote -v produces a misaligned output when a remote name
is more than 8 characters long (i.e. longer than a tab step). Here's how
it looks like:
giuseppe https://github.com/giuseppe/runc (fetch)
giuseppe https://github.com/giuseppe/runc (push)
kir git@github.com:kolyshkin/runc.git (fetch)
kir git@github.com:kolyshkin/runc.git (push)
lifubang https://github.com/lifubang/runc (fetch)
lifubang https://github.com/lifubang/runc (push)
marquiz https://github.com/marquiz/runc (fetch)
marquiz https://github.com/marquiz/runc (push)
Let's find the maximum width and use it for alignment.
While at it, let's keep the \t in case some tools depend on it
for parsing (there will still be trailing spaces in the remote name).
With this change, the output is like this now:
giuseppe https://github.com/giuseppe/runc (fetch)
giuseppe https://github.com/giuseppe/runc (push)
kir git@github.com:kolyshkin/runc.git (fetch)
kir git@github.com:kolyshkin/runc.git (push)
lifubang https://github.com/lifubang/runc (fetch)
lifubang https://github.com/lifubang/runc (push)
marquiz https://github.com/marquiz/runc (fetch)
marquiz https://github.com/marquiz/runc (push)
Reported-by: Roman Dodin <dodin.roman@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
builtin/remote.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index 729f6f3643..116417574d 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1245,13 +1245,21 @@ static int show_all(void)
result = for_each_remote(get_one_entry, &list);
if (!result) {
- int i;
+ int i, width = 7;
+
+ if (verbose) {
+ for (i = 0; i < list.nr; i++) {
+ int len = strlen((list.items + i)->string);
+ if (len > width)
+ width = len;
+ }
+ }
string_list_sort(&list);
for (i = 0; i < list.nr; i++) {
struct string_list_item *item = list.items + i;
if (verbose)
- printf("%s\t%s\n", item->string,
+ printf("%-*s\t%s\n", width, item->string,
item->util ? (const char *)item->util : "");
else {
if (i && !strcmp((item - 1)->string, item->string))
--
2.39.0
next reply other threads:[~2023-02-07 23:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 23:52 Kir Kolyshkin [this message]
2023-02-08 16:12 ` [PATCH] remote: align columns on -v Torsten Bögershausen
2023-02-08 16:32 ` Junio C Hamano
2023-02-09 1:02 ` Kirill Kolyshkin
2023-02-08 16:19 ` Junio C Hamano
2023-02-09 1:11 ` Kirill Kolyshkin
2023-02-09 1:12 ` Kir Kolyshkin
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=20230207235238.1850757-1-kolyshkin@gmail.com \
--to=kolyshkin@gmail.com \
--cc=dodin.roman@gmail.com \
--cc=git@vger.kernel.org \
/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).