[PATCHv2 5/5] builtin-remote: Make "remote -v" display push urls
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jun 13, 2009, 16:29 UTC
- Message-ID
- <1244910551-4420-3-git-send-email-git@drmicha.warpmail.net>
- 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