From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Beller Subject: [PATCHv5 2/3] submodule: Reimplement `module_name` shell function in C Date: Wed, 2 Sep 2015 14:42:25 -0700 Message-ID: <1441230146-26921-3-git-send-email-sbeller@google.com> References: <1441230146-26921-1-git-send-email-sbeller@google.com> Cc: git@vger.kernel.org, jrnieder@gmail.com, johannes.schindelin@gmail.com, Jens.Lehmann@web.de, peff@peff.net To: sbeller@google.com, gitster@pobox.com, sunshine@sunshineco.com X-From: git-owner@vger.kernel.org Wed Sep 02 23:42:55 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZXFny-0001aE-AU for gcvg-git-2@plane.gmane.org; Wed, 02 Sep 2015 23:42:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932216AbbIBVmt (ORCPT ); Wed, 2 Sep 2015 17:42:49 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34948 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755027AbbIBVml (ORCPT ); Wed, 2 Sep 2015 17:42:41 -0400 Received: by pacfv12 with SMTP id fv12so24014266pac.2 for ; Wed, 02 Sep 2015 14:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mOqpeUfG2euUqDcliVG11nhQ+NvGcf+ytXQY7rmnwNw=; b=darywUCcaBBo3WdPywbFCMTJJyPiymOeWYEcq3fV82duNcVy8hEVZOvddNWK3yojip nCaEeXz9n0nL4c3grXM1lMc1KoPM2VWAZaVIY4CSz/CdoXKs7fn2lJ7Vd63CtL6E3lA1 P1roZMudEgSdIENc57ZD729Atgj+LGhQcgWgU5YjqrN5T2mdoLj8MtO4SxYzq9GjeZKD pCJ1KqGp3PlK4gRsyl2TXXLYMdcCqkTZ7ilFAbPjHNfUBlTQ8WHG5bpBaAZAzh/wJpmo GnA81BPR/X0KEgG3lCQJCszk+W9SEuvSYPY6rQw4Iu604NEZXPcghHD3Yq+/hKQ8ntyz SK8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mOqpeUfG2euUqDcliVG11nhQ+NvGcf+ytXQY7rmnwNw=; b=eufEsSp01kkzjOhp3REKWEl+G5W+gAyC6ZAoa16WP0TCDTszaev5ydT51ePzlYSVaK O4RZz6gy0LO/CMLFMjFfeRhR76oXTcGR/MVwP/g4sJjVEmlSIPlrVRHz07XRVM0QCDd7 dHqeKgco9Hghrmdsi3OlWXNG7G139zrAeYqnAzoUKP1vFICVzh9zPwDGZ8PcXtaUqfok uqVc3bb2sDOisDdNCA4ITN+wrtGd1nyRyX22lO2htSuAX95USAZ2gmoLm78r/4kM58Jf WDwr0DVi/Z7MgQrFGpzL+yOvhdaerQPpmEIJJCBsFTyuTR7QXNrFBfYBh1ByEyK20H4L mlxQ== X-Gm-Message-State: ALoCoQlLArGl81x++mIgBjziJ1JEKCH9f0femeVQVAW6r6HLo+uWJnareDuvIiTYUv9MvRZf9H6n X-Received: by 10.66.121.74 with SMTP id li10mr58898001pab.73.1441230161467; Wed, 02 Sep 2015 14:42:41 -0700 (PDT) Received: from localhost ([2620:0:1000:5b00:8100:e957:594c:edb9]) by smtp.gmail.com with ESMTPSA id le8sm22729207pbc.24.2015.09.02.14.42.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 02 Sep 2015 14:42:41 -0700 (PDT) X-Mailer: git-send-email 2.5.0.256.g89f8063.dirty In-Reply-To: <1441230146-26921-1-git-send-email-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This implements the helper `name` in C instead of shell, yielding a nice performance boost. Before this patch, I measured a time (best out of three): $ time ./t7400-submodule-basic.sh >/dev/null real 0m11.066s user 0m3.348s sys 0m8.534s With this patch applied I measured (also best out of three) $ time ./t7400-submodule-basic.sh >/dev/null real 0m10.063s user 0m3.044s sys 0m7.487s Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 22 ++++++++++++++++++++++ git-submodule.sh | 32 +++++++------------------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index e97403e..f989319 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -5,6 +5,9 @@ #include "pathspec.h" #include "dir.h" #include "utf8.h" +#include "submodule.h" +#include "submodule-config.h" +#include "string-list.h" static const struct cache_entry **ce_entries; static int ce_alloc, ce_used; @@ -98,6 +101,24 @@ static int module_list(int argc, const char **argv, const char *prefix) return 0; } +static int module_name(int argc, const char **argv, const char *prefix) +{ + const struct submodule *sub; + + if (argc != 2) + usage(_("git submodule--helper name ")); + + gitmodules_config(); + sub = submodule_from_path(null_sha1, argv[1]); + + if (!sub) + die(_("no submodule mapping found in .gitmodules for path '%s'"), + argv[1]); + + printf("%s\n", sub->name); + + return 0; +} struct cmd_struct { const char *cmd; @@ -106,6 +127,7 @@ struct cmd_struct { static struct cmd_struct commands[] = { {"list", module_list}, + {"name", module_name}, }; int cmd_submodule__helper(int argc, const char **argv, const char *prefix) diff --git a/git-submodule.sh b/git-submodule.sh index 95c04fc..2be8da2 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -178,24 +178,6 @@ get_submodule_config () { printf '%s' "${value:-$default}" } - -# -# Map submodule path to submodule name -# -# $1 = path -# -module_name() -{ - # Do we have "submodule..path = $1" defined in .gitmodules file? - sm_path="$1" - re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g') - name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | - sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' ) - test -z "$name" && - die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$sm_path'")" - printf '%s\n' "$name" -} - # # Clone a submodule # @@ -498,7 +480,7 @@ cmd_foreach() then displaypath=$(relative_path "$sm_path") say "$(eval_gettext "Entering '\$prefix\$displaypath'")" - name=$(module_name "$sm_path") + name=$(git submodule--helper name "$sm_path") ( prefix="$prefix$sm_path/" clear_local_git_env @@ -554,7 +536,7 @@ cmd_init() while read mode sha1 stage sm_path do die_if_unmatched "$mode" - name=$(module_name "$sm_path") || exit + name=$(git submodule--helper name "$sm_path") || exit displaypath=$(relative_path "$sm_path") @@ -636,7 +618,7 @@ cmd_deinit() while read mode sha1 stage sm_path do die_if_unmatched "$mode" - name=$(module_name "$sm_path") || exit + name=$(git submodule--helper name "$sm_path") || exit displaypath=$(relative_path "$sm_path") @@ -758,7 +740,7 @@ cmd_update() echo >&2 "Skipping unmerged submodule $prefix$sm_path" continue fi - name=$(module_name "$sm_path") || exit + name=$(git submodule--helper name "$sm_path") || exit url=$(git config submodule."$name".url) branch=$(get_submodule_config "$name" branch master) if ! test -z "$update" @@ -1022,7 +1004,7 @@ cmd_summary() { # Respect the ignore setting for --for-status. if test -n "$for_status" then - name=$(module_name "$sm_path") + name=$(git submodule--helper name "$sm_path") ignore_config=$(get_submodule_config "$name" ignore none) test $status != A && test $ignore_config = all && continue fi @@ -1184,7 +1166,7 @@ cmd_status() while read mode sha1 stage sm_path do die_if_unmatched "$mode" - name=$(module_name "$sm_path") || exit + name=$(git submodule--helper name "$sm_path") || exit url=$(git config submodule."$name".url) displaypath=$(relative_path "$prefix$sm_path") if test "$stage" = U @@ -1261,7 +1243,7 @@ cmd_sync() while read mode sha1 stage sm_path do die_if_unmatched "$mode" - name=$(module_name "$sm_path") + name=$(git submodule--helper name "$sm_path") url=$(git config -f .gitmodules --get submodule."$name".url) # Possibly a url relative to parent -- 2.5.0.256.g89f8063.dirty