From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCHv2 5/5] builtin-remote: Make "remote -v" display push urls
Date: Sat, 13 Jun 2009 18:29:11 +0200 [thread overview]
Message-ID: <1244910551-4420-3-git-send-email-git@drmicha.warpmail.net> (raw)
In-Reply-To: <1244910551-4420-2-git-send-email-git@drmicha.warpmail.net>
Currently, "remote -v" simply lists all urls so that one has to remember
that only the first one is used for fetches, and all are used for
pushes.
Change this so that the role of an url is displayed in parentheses, and
also display push urls.
Example with "one" having one url, "two" two urls, "three" one url and
one pushurl:
one hostone.com:/somepath/repoone.git (fetch)
one hostone.com:/somepath/repoone.git (push)
three http://hostthree.com/otherpath/repothree.git (fetch)
three hostthree.com:/pathforpushes/repothree.git (push)
two hosttwo.com:/somepath/repotwo.git (fetch)
two hosttwo.com:/somepath/repotwo.git (push)
two hosttwobackup.com:/somewheresafe/repotwo.git (push)
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
builtin-remote.c | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index b350b18..80b2536 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -1276,14 +1276,31 @@ static int update(int argc, const char **argv)
static int get_one_entry(struct remote *remote, void *priv)
{
struct string_list *list = priv;
+ const char **url;
+ int i, url_nr;
+ void **utilp;
if (remote->url_nr > 0) {
- int i;
-
- for (i = 0; i < remote->url_nr; i++)
- string_list_append(remote->name, list)->util = (void *)remote->url[i];
+ utilp = &(string_list_append(remote->name, list)->util);
+ *utilp = malloc(strlen(remote->url[0])+strlen(" (fetch)")+1);
+ strcpy((char *) *utilp, remote->url[0]);
+ strcat((char *) *utilp, " (fetch)");
} else
string_list_append(remote->name, list)->util = NULL;
+ if (remote->pushurl_nr) {
+ url = remote->pushurl;
+ url_nr = remote->pushurl_nr;
+ } else {
+ url = remote->url;
+ url_nr = remote->url_nr;
+ }
+ for (i = 0; i < url_nr; i++)
+ {
+ utilp = &(string_list_append(remote->name, list)->util);
+ *utilp = malloc(strlen(url[i])+strlen(" (push)")+1);
+ strcpy((char *) *utilp, url[i]);
+ strcat((char *) *utilp, " (push)");
+ }
return 0;
}
@@ -1291,6 +1308,7 @@ static int get_one_entry(struct remote *remote, void *priv)
static int show_all(void)
{
struct string_list list = { NULL, 0, 0 };
+ list.strdup_strings = 1;
int result = for_each_remote(get_one_entry, &list);
if (!result) {
@@ -1309,6 +1327,7 @@ static int show_all(void)
}
}
}
+ string_list_clear(&list, 1);
return result;
}
--
1.6.3.2.367.gf0de
next prev parent reply other threads:[~2009-06-13 16:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 16:01 [PATCH 0/5] Allow push and fetch urls to be different Michael J Gruber
2009-06-09 16:01 ` [PATCH 1/5] " Michael J Gruber
2009-06-09 16:01 ` [PATCH 2/5] t5516: Check pushurl config setting Michael J Gruber
2009-06-09 16:01 ` [PATCH 3/5] technical/api-remote: Describe new struct remote member pushurl Michael J Gruber
2009-06-09 16:01 ` [PATCH 4/5] builtin-remote: Show push urls as well Michael J Gruber
2009-06-09 16:01 ` [PATCH 5/5] builtin-remote: Make "remote -v" display push urls Michael J Gruber
2009-06-09 16:25 ` Junio C Hamano
2009-06-09 17:47 ` Michael J Gruber
2009-06-09 18:30 ` Junio C Hamano
2009-06-13 16:29 ` [PATCHv2 0/5] " Michael J Gruber
2009-06-13 16:29 ` [PATCHv2 4/5] builtin-remote: Show push urls as well Michael J Gruber
2009-06-13 16:29 ` Michael J Gruber [this message]
2009-06-14 5:54 ` [PATCHv2 5/5] builtin-remote: Make "remote -v" display push urls Junio C Hamano
2009-06-09 16:25 ` [PATCH " Bert Wesarg
2009-06-09 18:07 ` Michael J Gruber
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=1244910551-4420-3-git-send-email-git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--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.
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).