| Message ID | 20210602131259.50350-1-raykar.ath@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,GSoC] submodule--helper: introduce add-clone subcommand | expand |
On Wed, Jun 2, 2021 at 3:13 PM Atharva Raykar <raykar.ath@gmail.com> wrote: > +static void show_fetch_remotes(FILE *output, const char *sm_name, const char *git_dir_path) > +{ > + struct child_process cp_remote = CHILD_PROCESS_INIT; > + struct strbuf sb_remote_out = STRBUF_INIT; > + > + cp_remote.git_cmd = 1; > + strvec_pushf(&cp_remote.env_array, > + "GIT_DIR=%s", git_dir_path); > + strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=."); > + strvec_pushl(&cp_remote.args, "remote", "-v", NULL); > + if (!capture_command(&cp_remote, &sb_remote_out, 0)) { > + char *line; > + char *begin = sb_remote_out.buf; > + char *end = sb_remote_out.buf + sb_remote_out.len; > + while (begin != end && (line = get_next_line(begin, end))) { > + char *name, *url, *tail; > + name = parse_token(&begin, line); > + url = parse_token(&begin, line); > + tail = parse_token(&begin, line); Sorry for not replying to your earlier message, but I think it's a bit better to save a line with: char *name = parse_token(&begin, line); char *url = parse_token(&begin, line); char *tail = parse_token(&begin, line); > + if (!memcmp(tail, "(fetch)", 7)) > + fprintf(output, " %s\t%s\n", name, url); > + free(url); > + free(name); > + free(tail); > + } > + } > + > + strbuf_release(&sb_remote_out); > +} > + > +static int add_submodule(const struct add_data *info) > +{ > + char *submod_gitdir_path; > + /* perhaps the path already exists and is already a git repo, else clone it */ > + if (is_directory(info->sm_path)) { > + printf("sm_path=%s\n", info->sm_path); I don't see which shell code the above printf(...) instruction is replacing. That's why I asked if it's some debugging leftover. [...] > + if (info->dissociate) > + strvec_push(&clone_args, "--dissociate"); > + if (info->depth >= 0) > + strvec_pushf(&clone_args, "--depth=%d", info->depth); It's ok if there is a blank line here. > + if (module_clone(clone_args.nr, clone_args.v, info->prefix)) { > + strvec_clear(&clone_args); > + return -1; > + } > + strvec_clear(&clone_args); > +static int add_clone(int argc, const char **argv, const char *prefix) > +{ > + const char *branch = NULL, *sm_path = NULL; > + const char *wt_prefix = NULL, *realrepo = NULL; > + const char *reference = NULL, *sm_name = NULL; > + int force = 0, quiet = 0, dissociate = 0, depth = -1, progress = 0; > + struct add_data info = ADD_DATA_INIT; Maybe: s/info/add_data/ Also it seems that in many cases it's a bit wasteful to use new variables for option parsing and then to copy them into the add_data struct when the field of the add_data struct could be used directly for option parsing... > + struct option options[] = { > + OPT_STRING('b', "branch", &branch, ...for example, here maybe `&add_data.branch` could be used instead of `&branch`... > + N_("branch"), > + N_("branch of repository to checkout on cloning")), [...] > + info.branch = branch; ...so that the above line would not be needed.
On 04-Jun-2021, at 13:51, Christian Couder <christian.couder@gmail.com> wrote: > > On Wed, Jun 2, 2021 at 3:13 PM Atharva Raykar <raykar.ath@gmail.com> wrote: > >> +static void show_fetch_remotes(FILE *output, const char *sm_name, const char *git_dir_path) >> +{ >> + struct child_process cp_remote = CHILD_PROCESS_INIT; >> + struct strbuf sb_remote_out = STRBUF_INIT; >> + >> + cp_remote.git_cmd = 1; >> + strvec_pushf(&cp_remote.env_array, >> + "GIT_DIR=%s", git_dir_path); >> + strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=."); >> + strvec_pushl(&cp_remote.args, "remote", "-v", NULL); >> + if (!capture_command(&cp_remote, &sb_remote_out, 0)) { >> + char *line; >> + char *begin = sb_remote_out.buf; >> + char *end = sb_remote_out.buf + sb_remote_out.len; >> + while (begin != end && (line = get_next_line(begin, end))) { >> + char *name, *url, *tail; >> + name = parse_token(&begin, line); >> + url = parse_token(&begin, line); >> + tail = parse_token(&begin, line); > > Sorry for not replying to your earlier message, but I think it's a bit > better to save a line with: > > char *name = parse_token(&begin, line); > char *url = parse_token(&begin, line); > char *tail = parse_token(&begin, line); Alright. >> + if (!memcmp(tail, "(fetch)", 7)) >> + fprintf(output, " %s\t%s\n", name, url); >> + free(url); >> + free(name); >> + free(tail); >> + } >> + } >> + >> + strbuf_release(&sb_remote_out); >> +} >> + >> +static int add_submodule(const struct add_data *info) >> +{ >> + char *submod_gitdir_path; >> + /* perhaps the path already exists and is already a git repo, else clone it */ >> + if (is_directory(info->sm_path)) { >> + printf("sm_path=%s\n", info->sm_path); > > I don't see which shell code the above printf(...) instruction is > replacing. That's why I asked if it's some debugging leftover. Oh, my bad. It is a leftover debugging statement. Please excuse my temporary blindness to it (: > [...] > >> + if (info->dissociate) >> + strvec_push(&clone_args, "--dissociate"); >> + if (info->depth >= 0) >> + strvec_pushf(&clone_args, "--depth=%d", info->depth); > > It's ok if there is a blank line here. OK. Makes sense. >> + if (module_clone(clone_args.nr, clone_args.v, info->prefix)) { >> + strvec_clear(&clone_args); >> + return -1; >> + } >> + strvec_clear(&clone_args); > >> +static int add_clone(int argc, const char **argv, const char *prefix) >> +{ >> + const char *branch = NULL, *sm_path = NULL; >> + const char *wt_prefix = NULL, *realrepo = NULL; >> + const char *reference = NULL, *sm_name = NULL; >> + int force = 0, quiet = 0, dissociate = 0, depth = -1, progress = 0; >> + struct add_data info = ADD_DATA_INIT; > > Maybe: s/info/add_data/ 'info' was the local convention for naming similar structures that held the flag values (like summary_cb, module_cb, deinit_cb etc). The exception to the above is 'struct submodule_update_clone', which was named as 'suc'. It did not follow the *_cb naming convention, presumably because it was not used as a parameter passed to any *_cb() function. Since 'struct add_data' is more similar to the latter (as it is not used in any callback function) I guess it would be okay to name it differently and more descriptively as 'add_data'? > Also it seems that in many cases it's a bit wasteful to use new > variables for option parsing and then to copy them into the add_data > struct when the field of the add_data struct could be used directly > for option parsing... > >> + struct option options[] = { >> + OPT_STRING('b', "branch", &branch, > > ...for example, here maybe `&add_data.branch` could be used instead of > `&branch`... I thought of this too, but decided to stick to the surrounding convention, where a new variable is used and then assigned to the struct. I had a looked at the file again, and turns out... OPT_STRING_LIST(0, "reference", &suc.references, N_("repo"), N_("reference repository")), OPT_BOOL(0, "dissociate", &suc.dissociate, N_("use --reference only while cloning")), OPT_STRING(0, "depth", &suc.depth, "<depth>", N_("create a shallow clone truncated to the " "specified number of revisions")), ... update_clone() is the exception again. So there is precedent, and I'd rather follow what you suggested, because that looks much better to me, and saves a lot of redundant code. >> + N_("branch"), >> + N_("branch of repository to checkout on cloning")), > > [...] > >> + info.branch = branch; > > ...so that the above line would not be needed. Yes, although I might still need to use an extra variable for booleans, like 'progress' or 'dissociate', because of the need to use !! to make it either 1 or 0. I am not too familiar with why doing that would be important in this context, but since this is the convention, I'll keep it intact.
Hi Atharva! On Wed, Jun 2, 2021 at 6:43 PM Atharva Raykar <raykar.ath@gmail.com> wrote: > > Let's add a new "add-clone" subcommand to `git submodule--helper` with > the goal of converting part of the shell code in git-submodule.sh > related to `git submodule add` into C code. This new subcommand clones > the repository that is to be added, and checks out to the appropriate > branch. > > This is meant to be a faithful conversion that leaves the behaviour of > 'submodule add' unchanged. The only minor change is that if a submodule name has > been supplied with a name that clashes with a local submodule, the message shown > to the user ("A git directory for 'foo' is found locally...") is prepended with > "error" for clarity. It would be better if commit messages are limited to 72 columns (characters) per line. Though you can obviously write longer lines on the list no problem. > This is part of a series of changes that will result in all of 'submodule add' > being converted to C. > > Signed-off-by: Atharva Raykar <raykar.ath@gmail.com> > Mentored-by: Christian Couder <christian.couder@gmail.com> > Mentored-by: Shourya Shukla <shouryashukla.oo@gmail.com> > Based-on-patch-by: Shourya Shukla <shouryashukla.oo@gmail.com> > Based-on-patch-by: Prathamesh Chavan <pc44800@gmail.com> I and others before me used to sign off the previous authors using 'Signed-off-by:'. This trailer has not been used yet so I am not sure if it should be used though I prefer this over the former. Maybe Christian could comment here? > This is part of a series of changes that will result in all of 'submodule add' > being converted to C, which is a more familiar language for Git developers, and > paves the way to improve performance and portability. > > I have made this patch based on Shourya's patch[1]. I have decided to send the > changes in smaller, more reviewable parts. The add-clone subcommand of > submodule--helper is an intermediate change, while I work on translating all of > the code. > > Another subcommand called 'add-config' will also be added in a separate patch > that handles the configuration on adding the module. > > After those two changes look good enough, I will be converting whatever is left > of 'git submodule add' in the git-submodule.sh past the flag parsing into C code > by having one helper subcommand called 'git submodule--helper add' that will > incorporate the functionality of the other two helpers, as well. In that patch, > the 'add-clone' and 'add-config' subcommands will be removed from the commands > array, as they will be called from within the C code itself. Seems like a good approach! BTW, if this "extra" message is a bit long like the one above, then you can put it in a cover letter instead. If people really want to read this extra information they will read it in a cover letter as well. Just supply the '--cover-letter' option when executing the 'git format-patch' command. > Changes since v1: > * Fixed typos, and made commit message more explicit > * Fixed incorrect usage string > * Some style changes were made To save yourself the trouble of sieving the "top" or "noteworthy" changes from the new version, you could instead just print the 'range-diff' between the two versions. You can do: 'git range-diff b1~n1..b1 b2~n2..b2' Where: - 'b1' is the first branch; 'n1' is the number of top commits you are taking from 'b1' for comparison. - 'b2' is the second branch; 'n2' is the number of top commits you are taking from 'b2' for comparison. It will print a very detailed output showing what differences were there commit-wise amongst the two branches. This can be put at the end of the cover letter. Though, this isn't necessary if your way seems better to you. BTW, it would be helpful if you could send mails addressed to me on my other email <periperidip@gmail.com>.
On 04-Jun-2021, at 17:07, Shourya Shukla <shouryashukla.oo@gmail.com> wrote: > > Hi Atharva! > > On Wed, Jun 2, 2021 at 6:43 PM Atharva Raykar <raykar.ath@gmail.com> wrote: >> >> Let's add a new "add-clone" subcommand to `git submodule--helper` with >> the goal of converting part of the shell code in git-submodule.sh >> related to `git submodule add` into C code. This new subcommand clones >> the repository that is to be added, and checks out to the appropriate >> branch. >> >> This is meant to be a faithful conversion that leaves the behaviour of >> 'submodule add' unchanged. The only minor change is that if a submodule name has >> been supplied with a name that clashes with a local submodule, the message shown >> to the user ("A git directory for 'foo' is found locally...") is prepended with >> "error" for clarity. > > It would be better if commit messages are limited to 72 columns > (characters) per line. > Though you can obviously write longer lines on the list no problem. Good catch. My auto-fill settings had got switched to length 80. I'll be careful next time. >> This is part of a series of changes that will result in all of 'submodule add' >> being converted to C. >> >> Signed-off-by: Atharva Raykar <raykar.ath@gmail.com> >> Mentored-by: Christian Couder <christian.couder@gmail.com> >> Mentored-by: Shourya Shukla <shouryashukla.oo@gmail.com> >> Based-on-patch-by: Shourya Shukla <shouryashukla.oo@gmail.com> >> Based-on-patch-by: Prathamesh Chavan <pc44800@gmail.com> > > > I and others before me used to sign off the previous authors using > 'Signed-off-by:'. This trailer > has not been used yet so I am not sure if it should be used though I > prefer this over the former. > Maybe Christian could comment here? Yeah, I wasn't sure if I should include an S.o.B without explicit acknowledgement from you and Prathamesh. >> This is part of a series of changes that will result in all of 'submodule add' >> being converted to C, which is a more familiar language for Git developers, and >> paves the way to improve performance and portability. >> >> I have made this patch based on Shourya's patch[1]. I have decided to send the >> changes in smaller, more reviewable parts. The add-clone subcommand of >> submodule--helper is an intermediate change, while I work on translating all of >> the code. >> >> Another subcommand called 'add-config' will also be added in a separate patch >> that handles the configuration on adding the module. >> >> After those two changes look good enough, I will be converting whatever is left >> of 'git submodule add' in the git-submodule.sh past the flag parsing into C code >> by having one helper subcommand called 'git submodule--helper add' that will >> incorporate the functionality of the other two helpers, as well. In that patch, >> the 'add-clone' and 'add-config' subcommands will be removed from the commands >> array, as they will be called from within the C code itself. > > Seems like a good approach! BTW, if this "extra" message is a bit long > like the one above, then > you can put it in a cover letter instead. If people really want to > read this extra information > they will read it in a cover letter as well. > > Just supply the '--cover-letter' option when executing the 'git > format-patch' command. Not too familiar with the convention here on how long a description warrants a cover letter. Generally in the mailing list I found [PATCH 0/1] labels far more uncommon than [PATCH] for single patch changes, so I went with the common case. >> Changes since v1: >> * Fixed typos, and made commit message more explicit >> * Fixed incorrect usage string >> * Some style changes were made > > To save yourself the trouble of sieving the "top" or "noteworthy" changes from > the new version, you could instead just print the 'range-diff' between > the two versions. > > You can do: > 'git range-diff b1~n1..b1 b2~n2..b2' > > Where: > > - 'b1' is the first branch; 'n1' is the number of top commits you are > taking from 'b1' for > comparison. > > - 'b2' is the second branch; 'n2' is the number of top commits you are > taking from 'b2' for > comparison. > > It will print a very detailed output showing what differences were > there commit-wise > amongst the two branches. This can be put at the end of the cover > letter. Though, this > isn't necessary if your way seems better to you. Thanks for the tip. I felt since this change was mostly about code style and naming, a range diff for it felt a little extra. I liked it more when you used it in a previous v2 of your patch, where the changes were more significant. > BTW, it would be helpful if you could send mails addressed to me on my > other email <periperidip@gmail.com>. Got it.
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index d55f6262e9..bbbb42088b 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2745,6 +2745,217 @@ static int module_set_branch(int argc, const char **argv, const char *prefix) return !!ret; } +struct add_data { + const char *prefix; + const char *branch; + const char *reference_path; + const char *sm_path; + const char *sm_name; + const char *repo; + const char *realrepo; + int depth; + unsigned int force: 1; + unsigned int quiet: 1; + unsigned int progress: 1; + unsigned int dissociate: 1; +}; +#define ADD_DATA_INIT { 0 } + +static char *parse_token(char **begin, const char *end) +{ + int size; + char *token, *pos = *begin; + while (pos != end && (*pos != ' ' && *pos != '\t' && *pos != '\n')) + pos++; + size = pos - *begin; + token = xstrndup(*begin, size); + *begin = pos + 1; + return token; +} + +static char *get_next_line(char *const begin, const char *const end) +{ + char *pos = begin; + while (pos != end && *pos++ != '\n'); + return pos; +} + +static void show_fetch_remotes(FILE *output, const char *sm_name, const char *git_dir_path) +{ + struct child_process cp_remote = CHILD_PROCESS_INIT; + struct strbuf sb_remote_out = STRBUF_INIT; + + cp_remote.git_cmd = 1; + strvec_pushf(&cp_remote.env_array, + "GIT_DIR=%s", git_dir_path); + strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=."); + strvec_pushl(&cp_remote.args, "remote", "-v", NULL); + if (!capture_command(&cp_remote, &sb_remote_out, 0)) { + char *line; + char *begin = sb_remote_out.buf; + char *end = sb_remote_out.buf + sb_remote_out.len; + while (begin != end && (line = get_next_line(begin, end))) { + char *name, *url, *tail; + name = parse_token(&begin, line); + url = parse_token(&begin, line); + tail = parse_token(&begin, line); + if (!memcmp(tail, "(fetch)", 7)) + fprintf(output, " %s\t%s\n", name, url); + free(url); + free(name); + free(tail); + } + } + + strbuf_release(&sb_remote_out); +} + +static int add_submodule(const struct add_data *info) +{ + char *submod_gitdir_path; + /* perhaps the path already exists and is already a git repo, else clone it */ + if (is_directory(info->sm_path)) { + printf("sm_path=%s\n", info->sm_path); + submod_gitdir_path = xstrfmt("%s/.git", info->sm_path); + if (is_directory(submod_gitdir_path) || file_exists(submod_gitdir_path)) + printf(_("Adding existing path at '%s' to index\n"), + info->sm_path); + else + die(_("'%s' already exists and is not a valid git repo"), + info->sm_path); + free(submod_gitdir_path); + } else { + struct strvec clone_args = STRVEC_INIT; + struct child_process cp = CHILD_PROCESS_INIT; + submod_gitdir_path = xstrfmt(".git/modules/%s", info->sm_name); + + if (is_directory(submod_gitdir_path)) { + if (!info->force) { + error(_("A git directory for '%s' is found " + "locally with remote(s):"), info->sm_name); + show_fetch_remotes(stderr, info->sm_name, + submod_gitdir_path); + fprintf(stderr, + _("If you want to reuse this local git " + "directory instead of cloning again from\n" + " %s\n" + "use the '--force' option. If the local git " + "directory is not the correct repo\n" + "or if you are unsure what this means, choose " + "another name with the '--name' option.\n"), + info->realrepo); + free(submod_gitdir_path); + return 1; + } else { + printf(_("Reactivating local git directory for " + "submodule '%s'\n"), info->sm_name); + } + } + free(submod_gitdir_path); + + strvec_pushl(&clone_args, "clone", "--path", info->sm_path, "--name", + info->sm_name, "--url", info->realrepo, NULL); + if (info->quiet) + strvec_push(&clone_args, "--quiet"); + if (info->progress) + strvec_push(&clone_args, "--progress"); + if (info->prefix) + strvec_pushl(&clone_args, "--prefix", info->prefix, NULL); + if (info->reference_path) + strvec_pushl(&clone_args, "--reference", + info->reference_path, NULL); + if (info->dissociate) + strvec_push(&clone_args, "--dissociate"); + if (info->depth >= 0) + strvec_pushf(&clone_args, "--depth=%d", info->depth); + if (module_clone(clone_args.nr, clone_args.v, info->prefix)) { + strvec_clear(&clone_args); + return -1; + } + strvec_clear(&clone_args); + + prepare_submodule_repo_env(&cp.env_array); + cp.git_cmd = 1; + cp.dir = info->sm_path; + strvec_pushl(&cp.args, "checkout", "-f", "-q", NULL); + + if (info->branch) { + strvec_pushl(&cp.args, "-B", info->branch, NULL); + strvec_pushf(&cp.args, "origin/%s", info->branch); + } + + if (run_command(&cp)) + die(_("unable to checkout submodule '%s'"), info->sm_path); + } + return 0; +} + +static int add_clone(int argc, const char **argv, const char *prefix) +{ + const char *branch = NULL, *sm_path = NULL; + const char *wt_prefix = NULL, *realrepo = NULL; + const char *reference = NULL, *sm_name = NULL; + int force = 0, quiet = 0, dissociate = 0, depth = -1, progress = 0; + struct add_data info = ADD_DATA_INIT; + + struct option options[] = { + OPT_STRING('b', "branch", &branch, + N_("branch"), + N_("branch of repository to checkout on cloning")), + OPT_STRING(0, "prefix", &wt_prefix, + N_("path"), + N_("alternative anchor for relative paths")), + OPT_STRING(0, "path", &sm_path, + N_("path"), + N_("where the new submodule will be cloned to")), + OPT_STRING(0, "name", &sm_name, + N_("string"), + N_("name of the new submodule")), + OPT_STRING(0, "url", &realrepo, + N_("string"), + N_("url where to clone the submodule from")), + OPT_STRING(0, "reference", &reference, + N_("repo"), + N_("reference repository")), + OPT_BOOL(0, "dissociate", &dissociate, + N_("use --reference only while cloning")), + OPT_INTEGER(0, "depth", &depth, + N_("depth for shallow clones")), + OPT_BOOL(0, "progress", &progress, + N_("force cloning progress")), + OPT_BOOL('f', "force", &force, + N_("allow adding an otherwise ignored submodule path")), + OPT__QUIET(&quiet, "Suppress output for cloning a submodule"), + OPT_END() + }; + + const char *const usage[] = { + N_("git submodule--helper add-clone [--prefix=<path>] [--quiet] [--force] " + "[--reference <repository>] [--depth <depth>] [-b|--branch <branch>]" + "[--progress] [--dissociate] --url <url> --path <path> --name <name>"), + NULL + }; + + argc = parse_options(argc, argv, prefix, options, usage, 0); + + info.prefix = prefix; + info.sm_name = sm_name; + info.sm_path = sm_path; + info.realrepo = realrepo; + info.reference_path = reference; + info.branch = branch; + info.depth = depth; + info.progress = !!progress; + info.dissociate = !!dissociate; + info.force = !!force; + info.quiet = !!quiet; + + if (add_submodule(&info)) + return 1; + + return 0; +} + #define SUPPORT_SUPER_PREFIX (1<<0) struct cmd_struct { @@ -2757,6 +2968,7 @@ static struct cmd_struct commands[] = { {"list", module_list, 0}, {"name", module_name, 0}, {"clone", module_clone, 0}, + {"add-clone", add_clone, 0}, {"update-module-mode", module_update_module_mode, 0}, {"update-clone", update_clone, 0}, {"ensure-core-worktree", ensure_core_worktree, 0}, diff --git a/git-submodule.sh b/git-submodule.sh index 4678378424..f71e1e5495 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -241,43 +241,7 @@ cmd_add() die "$(eval_gettext "'$sm_name' is not a valid submodule name")" fi - # perhaps the path exists and is already a git repo, else clone it - if test -e "$sm_path" - then - if test -d "$sm_path"/.git || test -f "$sm_path"/.git - then - eval_gettextln "Adding existing repo at '\$sm_path' to the index" - else - die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")" - fi - - else - if test -d ".git/modules/$sm_name" - then - if test -z "$force" - then - eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):" - GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2 - die "$(eval_gettextln "\ -If you want to reuse this local git directory instead of cloning again from - \$realrepo -use the '--force' option. If the local git directory is not the correct repo -or you are unsure what this means choose another name with the '--name' option.")" - else - eval_gettextln "Reactivating local git directory for submodule '\$sm_name'." - fi - fi - git submodule--helper clone ${GIT_QUIET:+--quiet} ${progress:+"--progress"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit - ( - sanitize_submodule_env - cd "$sm_path" && - # ash fails to wordsplit ${branch:+-b "$branch"...} - case "$branch" in - '') git checkout -f -q ;; - ?*) git checkout -f -q -B "$branch" "origin/$branch" ;; - esac - ) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")" - fi + git submodule--helper add-clone ${GIT_QUIET:+--quiet} ${force:+"--force"} ${progress:+"--progress"} ${branch:+--branch "$branch"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit git config submodule."$sm_name".url "$realrepo" git add --no-warn-embedded-repo $force "$sm_path" ||
Let's add a new "add-clone" subcommand to `git submodule--helper` with the goal of converting part of the shell code in git-submodule.sh related to `git submodule add` into C code. This new subcommand clones the repository that is to be added, and checks out to the appropriate branch. This is meant to be a faithful conversion that leaves the behaviour of 'submodule add' unchanged. The only minor change is that if a submodule name has been supplied with a name that clashes with a local submodule, the message shown to the user ("A git directory for 'foo' is found locally...") is prepended with "error" for clarity. This is part of a series of changes that will result in all of 'submodule add' being converted to C. Signed-off-by: Atharva Raykar <raykar.ath@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Shourya Shukla <shouryashukla.oo@gmail.com> Based-on-patch-by: Shourya Shukla <shouryashukla.oo@gmail.com> Based-on-patch-by: Prathamesh Chavan <pc44800@gmail.com> --- This is part of a series of changes that will result in all of 'submodule add' being converted to C, which is a more familiar language for Git developers, and paves the way to improve performance and portability. I have made this patch based on Shourya's patch[1]. I have decided to send the changes in smaller, more reviewable parts. The add-clone subcommand of submodule--helper is an intermediate change, while I work on translating all of the code. Another subcommand called 'add-config' will also be added in a separate patch that handles the configuration on adding the module. After those two changes look good enough, I will be converting whatever is left of 'git submodule add' in the git-submodule.sh past the flag parsing into C code by having one helper subcommand called 'git submodule--helper add' that will incorporate the functionality of the other two helpers, as well. In that patch, the 'add-clone' and 'add-config' subcommands will be removed from the commands array, as they will be called from within the C code itself. Changes since v1: * Fixed typos, and made commit message more explicit * Fixed incorrect usage string * Some style changes were made builtin/submodule--helper.c | 212 ++++++++++++++++++++++++++++++++++++ git-submodule.sh | 38 +------ 2 files changed, 213 insertions(+), 37 deletions(-)