mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
submodule: rewrite module_clone shell function in C
This reimplements the helper function `module_clone` in shell in C as `clone`. This functionality is needed for converting `git submodule update` later on, which we want to add threading to. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
Junio C Hamano
parent
0ea306ef17
commit
ee8838d157
|
|
@ -8,6 +8,7 @@
|
|||
#include "submodule.h"
|
||||
#include "submodule-config.h"
|
||||
#include "string-list.h"
|
||||
#include "run-command.h"
|
||||
|
||||
struct module_list {
|
||||
const struct cache_entry **entries;
|
||||
|
|
@ -123,6 +124,136 @@ static int module_name(int argc, const char **argv, const char *prefix)
|
|||
|
||||
return 0;
|
||||
}
|
||||
static int clone_submodule(const char *path, const char *gitdir, const char *url,
|
||||
const char *depth, const char *reference, int quiet)
|
||||
{
|
||||
struct child_process cp;
|
||||
child_process_init(&cp);
|
||||
|
||||
argv_array_push(&cp.args, "clone");
|
||||
argv_array_push(&cp.args, "--no-checkout");
|
||||
if (quiet)
|
||||
argv_array_push(&cp.args, "--quiet");
|
||||
if (depth && *depth)
|
||||
argv_array_pushl(&cp.args, "--depth", depth, NULL);
|
||||
if (reference && *reference)
|
||||
argv_array_pushl(&cp.args, "--reference", reference, NULL);
|
||||
if (gitdir && *gitdir)
|
||||
argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
|
||||
|
||||
argv_array_push(&cp.args, url);
|
||||
argv_array_push(&cp.args, path);
|
||||
|
||||
cp.git_cmd = 1;
|
||||
cp.env = local_repo_env;
|
||||
cp.no_stdin = 1;
|
||||
|
||||
return run_command(&cp);
|
||||
}
|
||||
|
||||
static int module_clone(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
const char *path = NULL, *name = NULL, *url = NULL;
|
||||
const char *reference = NULL, *depth = NULL;
|
||||
int quiet = 0;
|
||||
FILE *submodule_dot_git;
|
||||
char *sm_gitdir, *cwd, *p;
|
||||
struct strbuf rel_path = STRBUF_INIT;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
struct option module_clone_options[] = {
|
||||
OPT_STRING(0, "prefix", &prefix,
|
||||
N_("path"),
|
||||
N_("alternative anchor for relative paths")),
|
||||
OPT_STRING(0, "path", &path,
|
||||
N_("path"),
|
||||
N_("where the new submodule will be cloned to")),
|
||||
OPT_STRING(0, "name", &name,
|
||||
N_("string"),
|
||||
N_("name of the new submodule")),
|
||||
OPT_STRING(0, "url", &url,
|
||||
N_("string"),
|
||||
N_("url where to clone the submodule from")),
|
||||
OPT_STRING(0, "reference", &reference,
|
||||
N_("string"),
|
||||
N_("reference repository")),
|
||||
OPT_STRING(0, "depth", &depth,
|
||||
N_("string"),
|
||||
N_("depth for shallow clones")),
|
||||
OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
const char *const git_submodule_helper_usage[] = {
|
||||
N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
|
||||
"[--reference <repository>] [--name <name>] [--url <url>]"
|
||||
"[--depth <depth>] [--] [<path>...]"),
|
||||
NULL
|
||||
};
|
||||
|
||||
argc = parse_options(argc, argv, prefix, module_clone_options,
|
||||
git_submodule_helper_usage, 0);
|
||||
|
||||
strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
|
||||
sm_gitdir = strbuf_detach(&sb, NULL);
|
||||
|
||||
if (!file_exists(sm_gitdir)) {
|
||||
if (safe_create_leading_directories_const(sm_gitdir) < 0)
|
||||
die(_("could not create directory '%s'"), sm_gitdir);
|
||||
if (clone_submodule(path, sm_gitdir, url, depth, reference, quiet))
|
||||
die(_("clone of '%s' into submodule path '%s' failed"),
|
||||
url, path);
|
||||
} else {
|
||||
if (safe_create_leading_directories_const(path) < 0)
|
||||
die(_("could not create directory '%s'"), path);
|
||||
strbuf_addf(&sb, "%s/index", sm_gitdir);
|
||||
unlink_or_warn(sb.buf);
|
||||
strbuf_reset(&sb);
|
||||
}
|
||||
|
||||
/* Write a .git file in the submodule to redirect to the superproject. */
|
||||
if (safe_create_leading_directories_const(path) < 0)
|
||||
die(_("could not create directory '%s'"), path);
|
||||
|
||||
if (path && *path)
|
||||
strbuf_addf(&sb, "%s/.git", path);
|
||||
else
|
||||
strbuf_addstr(&sb, ".git");
|
||||
|
||||
if (safe_create_leading_directories_const(sb.buf) < 0)
|
||||
die(_("could not create leading directories of '%s'"), sb.buf);
|
||||
submodule_dot_git = fopen(sb.buf, "w");
|
||||
if (!submodule_dot_git)
|
||||
die_errno(_("cannot open file '%s'"), sb.buf);
|
||||
|
||||
fprintf(submodule_dot_git, "gitdir: %s\n",
|
||||
relative_path(sm_gitdir, path, &rel_path));
|
||||
if (fclose(submodule_dot_git))
|
||||
die(_("could not close file %s"), sb.buf);
|
||||
strbuf_reset(&sb);
|
||||
strbuf_reset(&rel_path);
|
||||
|
||||
cwd = xgetcwd();
|
||||
/* Redirect the worktree of the submodule in the superproject's config */
|
||||
if (!is_absolute_path(sm_gitdir)) {
|
||||
strbuf_addf(&sb, "%s/%s", cwd, sm_gitdir);
|
||||
free(sm_gitdir);
|
||||
sm_gitdir = strbuf_detach(&sb, NULL);
|
||||
}
|
||||
|
||||
strbuf_addf(&sb, "%s/%s", cwd, path);
|
||||
p = git_pathdup_submodule(path, "config");
|
||||
if (!p)
|
||||
die(_("could not get submodule directory for '%s'"), path);
|
||||
git_config_set_in_file(p, "core.worktree",
|
||||
relative_path(sb.buf, sm_gitdir, &rel_path));
|
||||
strbuf_release(&sb);
|
||||
strbuf_release(&rel_path);
|
||||
free(sm_gitdir);
|
||||
free(cwd);
|
||||
free(p);
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct cmd_struct {
|
||||
const char *cmd;
|
||||
|
|
@ -132,6 +263,7 @@ struct cmd_struct {
|
|||
static struct cmd_struct commands[] = {
|
||||
{"list", module_list},
|
||||
{"name", module_name},
|
||||
{"clone", module_clone},
|
||||
};
|
||||
|
||||
int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
|
||||
|
|
|
|||
|
|
@ -178,80 +178,6 @@ get_submodule_config () {
|
|||
printf '%s' "${value:-$default}"
|
||||
}
|
||||
|
||||
#
|
||||
# Clone a submodule
|
||||
#
|
||||
# $1 = submodule path
|
||||
# $2 = submodule name
|
||||
# $3 = URL to clone
|
||||
# $4 = reference repository to reuse (empty for independent)
|
||||
# $5 = depth argument for shallow clones (empty for deep)
|
||||
#
|
||||
# Prior to calling, cmd_update checks that a possibly existing
|
||||
# path is not a git repository.
|
||||
# Likewise, cmd_add checks that path does not exist at all,
|
||||
# since it is the location of a new submodule.
|
||||
#
|
||||
module_clone()
|
||||
{
|
||||
sm_path=$1
|
||||
name=$2
|
||||
url=$3
|
||||
reference="$4"
|
||||
depth="$5"
|
||||
quiet=
|
||||
if test -n "$GIT_QUIET"
|
||||
then
|
||||
quiet=-q
|
||||
fi
|
||||
|
||||
gitdir=
|
||||
gitdir_base=
|
||||
base_name=$(dirname "$name")
|
||||
|
||||
gitdir=$(git rev-parse --git-dir)
|
||||
gitdir_base="$gitdir/modules/$base_name"
|
||||
gitdir="$gitdir/modules/$name"
|
||||
|
||||
if test -d "$gitdir"
|
||||
then
|
||||
mkdir -p "$sm_path"
|
||||
rm -f "$gitdir/index"
|
||||
else
|
||||
mkdir -p "$gitdir_base"
|
||||
(
|
||||
clear_local_git_env
|
||||
git clone $quiet ${depth:+"$depth"} -n ${reference:+"$reference"} \
|
||||
--separate-git-dir "$gitdir" "$url" "$sm_path"
|
||||
) ||
|
||||
die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
|
||||
fi
|
||||
|
||||
# We already are at the root of the work tree but cd_to_toplevel will
|
||||
# resolve any symlinks that might be present in $PWD
|
||||
a=$(cd_to_toplevel && cd "$gitdir" && pwd)/
|
||||
b=$(cd_to_toplevel && cd "$sm_path" && pwd)/
|
||||
# Remove all common leading directories after a sanity check
|
||||
if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then
|
||||
die "$(eval_gettext "Gitdir '\$a' is part of the submodule path '\$b' or vice versa")"
|
||||
fi
|
||||
while test "${a%%/*}" = "${b%%/*}"
|
||||
do
|
||||
a=${a#*/}
|
||||
b=${b#*/}
|
||||
done
|
||||
# Now chop off the trailing '/'s that were added in the beginning
|
||||
a=${a%/}
|
||||
b=${b%/}
|
||||
|
||||
# Turn each leading "*/" component into "../"
|
||||
rel=$(printf '%s\n' "$b" | sed -e 's|[^/][^/]*|..|g')
|
||||
printf '%s\n' "gitdir: $rel/$a" >"$sm_path/.git"
|
||||
|
||||
rel=$(printf '%s\n' "$a" | sed -e 's|[^/][^/]*|..|g')
|
||||
(clear_local_git_env; cd "$sm_path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
|
||||
}
|
||||
|
||||
isnumber()
|
||||
{
|
||||
n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
|
||||
|
|
@ -412,7 +338,7 @@ Use -f if you really want to add it." >&2
|
|||
echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
|
||||
fi
|
||||
fi
|
||||
module_clone "$sm_path" "$sm_name" "$realrepo" "$reference" "$depth" || exit
|
||||
git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" "$reference" "$depth" || exit
|
||||
(
|
||||
clear_local_git_env
|
||||
cd "$sm_path" &&
|
||||
|
|
@ -774,7 +700,7 @@ Maybe you want to use 'update --init'?")"
|
|||
|
||||
if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git
|
||||
then
|
||||
module_clone "$sm_path" "$name" "$url" "$reference" "$depth" || exit
|
||||
git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$prefix" --path "$sm_path" --name "$name" --url "$url" "$reference" "$depth" || exit
|
||||
cloned_modules="$cloned_modules;$name"
|
||||
subsha1=
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue