Re: [PATCH 1/3] git-submodule: rename shell functions for consistency
- From
Imran M Yousuf <imyousuf@gmail.com>
- Date
- Jan 16, 2008, 02:26 UTC
- Message-ID
- <7bfdc29a0801151826u2218f825ga8100b1cc9fa8b2@mail.gmail.com>
- In-Reply-To
- <7vy7are3qo.fsf_-_@gitster.siamese.dyndns.org>
Thanks Junio for showing how it should be done. Due to some pre-scheduled appointment I was unavailable yesterday evening and thus was neither able to reply nor resubmit the changes.
On Jan 15, 2008 5:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 42 quoted lines
> This renames the shell functions used in git-submodule that > implement top-level subcommands. The rule is that the > subcommand $foo is implemented by cmd_$foo function. > > A noteworthy change is that modules_list() is now known as > cmd_status(). There is no "submodule list" command. > > Signed-off-by: Junio C Hamano <gitster@pobox.com> > --- > > * We could probably do something like this. This first part is > about making the command dispatcher maintainable. > > Note that I haven't seriously tested this series. This and > the next one are primarily to illustrate what I think the fix > you are trying should look like. > > git-submodule.sh | 20 ++++++++++---------- > 1 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/git-submodule.sh b/git-submodule.sh > index ad9fe62..3c104e3 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -86,9 +86,9 @@ module_name() > # > # Clone a submodule > # > -# Prior to calling, modules_update checks that a possibly existing > +# Prior to calling, cmd_update checks that a possibly existing > # path is not a git repository. > -# Likewise, module_add checks that path does not exist at all, > +# Likewise, cmd_add checks that path does not exist at all, > # since it is the location of a new submodule. > # > module_clone() > @@ -121,7 +121,7 @@ module_clone() > # > # optional branch is stored in global branch variable > # > -module_add() > +cmd_add()
After reading your reply I was about to suggest renaming module to cmd but you have done it before I could propose or submit the patch.
Show 55 quoted lines
> {
> repo=$1
> path=$2
> @@ -174,7 +174,7 @@ module_add()
> #
> # $@ = requested paths (default to all)
> #
> -modules_init()
> +cmd_init()
> {
> git ls-files --stage -- "$@" | grep -e '^160000 ' |
> while read mode sha1 stage path
> @@ -207,7 +207,7 @@ modules_init()
> #
> # $@ = requested paths (default to all)
> #
> -modules_update()
> +cmd_update()
> {
> git ls-files --stage -- "$@" | grep -e '^160000 ' |
> while read mode sha1 stage path
> @@ -266,7 +266,7 @@ set_name_rev () {
> #
> # $@ = requested paths (default to all)
> #
> -modules_list()
> +cmd_status()
> {
> git ls-files --stage -- "$@" | grep -e '^160000 ' |
> while read mode sha1 stage path
> @@ -347,16 +347,16 @@ esac
>
> case "$add,$init,$update,$status,$cached" in
> 1,,,,)
> - module_add "$@"
> + cmd_add "$@"
> ;;
> ,1,,,)
> - modules_init "$@"
> + cmd_init "$@"
> ;;
> ,,1,,)
> - modules_update "$@"
> + cmd_update "$@"
> ;;
> ,,,*,*)
> - modules_list "$@"
> + cmd_status "$@"
> ;;
> *)
> usage
> --
> 1.5.4.rc3.11.g4e67
>
>-- Imran M Yousuf