[PATCH 5/5] builtin-remote: Make "remote -v" display push urls
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jun 9, 2009, 16:01 UTC
- Message-ID
- <1244563298-15479-6-git-send-email-git@drmicha.warpmail.net>
- In-Reply-To
- <1244563298-15479-5-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 "mjg" having 1 url and 1 pushurl, "origin" having 3 urls, sb having 1 url:
mjg git://repo.or.cz/git/mjg.git (fetch) mjg repoor:/srv/git/git/mjg.git (push) origin git://repo.or.cz/git.git (fetch) origin git://repo.or.cz/git.git (push) origin git://git2.kernel.org/pub/scm/git/git.git (push) origin git://repo.or.cz/alt-git.git (push) sb git://repo.or.cz/git/sbeyer.git (fetch) sb git://repo.or.cz/git/sbeyer.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.278.gb6431.dirty