From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?QmrDtnJuIEd1c3RhdnNzb24=?= Subject: [PATCH 8/8] Re-implement 'git remote update' using 'git fetch' Date: Tue, 10 Nov 2009 09:21:32 +0100 Message-ID: <4AF9228C.1010005@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Nov 10 09:21:42 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1N7lyv-0001OX-Dn for gcvg-git-2@lo.gmane.org; Tue, 10 Nov 2009 09:21:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753259AbZKJIVa convert rfc822-to-quoted-printable (ORCPT ); Tue, 10 Nov 2009 03:21:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752836AbZKJIVa (ORCPT ); Tue, 10 Nov 2009 03:21:30 -0500 Received: from mail-ew0-f207.google.com ([209.85.219.207]:32917 "EHLO mail-ew0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753213AbZKJIV3 (ORCPT ); Tue, 10 Nov 2009 03:21:29 -0500 Received: by ewy3 with SMTP id 3so3977234ewy.37 for ; Tue, 10 Nov 2009 00:21:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=0+Rf321qa1SQtB/+2TrLlilh/5DUlhUQnlwYig75zkw=; b=PGINSBGbK0bq4HRExFAD+D5b++xiq9ghQKi2TmIxlQgY75kon2RMpzlxjM4Z8yHXAm yAY1wrpB3E//7iBUBI91suAmuVG9FOfVcn8TlVCkock7YIRtki7Bgsuk50lffpm4LG8U fCdFIX2zFlCiguZN3ZqFUcTVXCbHy9unFGIqc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=IkiEGXW8PFc2Ap0JOZG3a+gtAZ2Bp8T6+I0+Jlzigykc5/X/Yz4hF0g+93g/5PY+Nt XrXbb8i4uhHDM9unBuUi0INiOkkNeF3iktP8QirGzq3LBKCnJkIEvcBA5DfOjrFm7LOi BVYyAiGblMboyGE0e7Vg8CrIv20qZ1t9VUMAs= Received: by 10.213.0.216 with SMTP id 24mr4621240ebc.10.1257841294273; Tue, 10 Nov 2009 00:21:34 -0800 (PST) Received: from ?10.0.1.10? (81-234-150-173-no94.tbcn.telia.com [81.234.150.173]) by mx.google.com with ESMTPS id 10sm1169941eyz.43.2009.11.10.00.21.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 10 Nov 2009 00:21:33 -0800 (PST) User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In order not to duplicate functionality, re-implement 'git remote update' in terms of 'git fetch'. Signed-off-by: Bj=C3=B6rn Gustavsson --- The --prune option will be passed on, as 'git fetch' now supports it. builtin-remote.c | 88 +++++++++++++++++-----------------------------= ------- 1 files changed, 28 insertions(+), 60 deletions(-) diff --git a/builtin-remote.c b/builtin-remote.c index 56cd5af..fb0d66d 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -1173,88 +1173,56 @@ static int prune_remote(const char *remote, int= dry_run) return result; } =20 -static int get_one_remote_for_update(struct remote *remote, void *priv= ) +static int get_remote_default(const char *key, const char *value, void= *priv) { - struct string_list *list =3D priv; - if (!remote->skip_default_update) - string_list_append(remote->name, list); - return 0; -} - -static struct remote_group { - const char *name; - struct string_list *list; -} remote_group; - -static int get_remote_group(const char *key, const char *value, void *= num_hits) -{ - if (!prefixcmp(key, "remotes.") && - !strcmp(key + 8, remote_group.name)) { - /* split list by white space */ - int space =3D strcspn(value, " \t\n"); - while (*value) { - if (space > 1) { - string_list_append(xstrndup(value, space), - remote_group.list); - ++*((int *)num_hits); - } - value +=3D space + (value[space] !=3D '\0'); - space =3D strcspn(value, " \t\n"); - } + if (strcmp(key, "remotes.default") =3D=3D 0) { + int *found =3D priv; + *found =3D 1; } - return 0; } =20 static int update(int argc, const char **argv) { - int i, result =3D 0, prune =3D 0; - struct string_list list =3D { NULL, 0, 0, 0 }; - static const char *default_argv[] =3D { NULL, "default", NULL }; + int i, prune =3D 0; struct option options[] =3D { OPT_GROUP("update specific options"), OPT_BOOLEAN('p', "prune", &prune, "prune remotes after fetching"), OPT_END() }; + const char **fetch_argv; + int fetch_argc =3D 0; + int default_defined =3D 0; + + fetch_argv =3D xmalloc(sizeof(char *) * (argc+5)); =20 argc =3D parse_options(argc, argv, NULL, options, builtin_remote_usag= e, PARSE_OPT_KEEP_ARGV0); - if (argc < 2) { - argc =3D 2; - argv =3D default_argv; - } =20 - remote_group.list =3D &list; - for (i =3D 1; i < argc; i++) { - int groups_found =3D 0; - remote_group.name =3D argv[i]; - result =3D git_config(get_remote_group, &groups_found); - if (!groups_found && (i !=3D 1 || strcmp(argv[1], "default"))) { - struct remote *remote; - if (!remote_is_configured(argv[i])) - die("No such remote or remote group: %s", - argv[i]); - remote =3D remote_get(argv[i]); - string_list_append(remote->name, remote_group.list); - } - } + fetch_argv[fetch_argc++] =3D "fetch"; =20 - if (!result && !list.nr && argc =3D=3D 2 && !strcmp(argv[1], "defaul= t")) - result =3D for_each_remote(get_one_remote_for_update, &list); + if (prune) + fetch_argv[fetch_argc++] =3D "--prune"; + if (verbose) + fetch_argv[fetch_argc++] =3D "-v"; + if (argc < 2) { + fetch_argv[fetch_argc++] =3D "default"; + } else { + fetch_argv[fetch_argc++] =3D "--multiple"; + for (i =3D 1; i < argc; i++) + fetch_argv[fetch_argc++] =3D argv[i]; + } =20 - for (i =3D 0; i < list.nr; i++) { - int err =3D fetch_remote(list.items[i].string); - result |=3D err; - if (!err && prune) - result |=3D prune_remote(list.items[i].string, 0); + if (strcmp(fetch_argv[fetch_argc-1], "default") =3D=3D 0) { + git_config(get_remote_default, &default_defined); + if (!default_defined) + fetch_argv[fetch_argc-1] =3D "--all"; } =20 - /* all names were strdup()ed or strndup()ed */ - list.strdup_strings =3D 1; - string_list_clear(&list, 0); + fetch_argv[fetch_argc] =3D NULL; =20 - return result; + return run_command_v_opt(fetch_argv, RUN_GIT_CMD); } =20 static int get_one_entry(struct remote *remote, void *priv) --=20 1.6.5.1.69.g36942