Merge branch 'pc/submodule-helper'
Rewrite two more "git submodule" subcommands in C. * pc/submodule-helper: submodule: port submodule subcommand 'deinit' from shell to C submodule: port submodule subcommand 'sync' from shell to C
This commit is contained in:
Junio C Hamano
commit
ead8dbe2e1
@ -20,6 +20,7 @@
|
||||
#define OPT_QUIET (1 << 0)
|
||||
#define OPT_CACHED (1 << 1)
|
||||
#define OPT_RECURSIVE (1 << 2)
|
||||
#define OPT_FORCE (1 << 3)
|
||||
|
||||
typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
|
||||
void *cb_data);
|
||||
@ -50,6 +51,20 @@ static char *get_default_remote(void)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int print_default_remote(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
const char *remote;
|
||||
|
||||
if (argc != 1)
|
||||
die(_("submodule--helper print-default-remote takes no arguments"));
|
||||
|
||||
remote = get_default_remote();
|
||||
if (remote)
|
||||
printf("%s\n", remote);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int starts_with_dot_slash(const char *str)
|
||||
{
|
||||
return str[0] == '.' && is_dir_sep(str[1]);
|
||||
@ -358,6 +373,25 @@ static void module_list_active(struct module_list *list)
|
||||
*list = active_modules;
|
||||
}
|
||||
|
||||
static char *get_up_path(const char *path)
|
||||
{
|
||||
int i;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
|
||||
for (i = count_slashes(path); i; i--)
|
||||
strbuf_addstr(&sb, "../");
|
||||
|
||||
/*
|
||||
* Check if 'path' ends with slash or not
|
||||
* for having the same output for dir/sub_dir
|
||||
* and dir/sub_dir/
|
||||
*/
|
||||
if (!is_dir_sep(path[strlen(path) - 1]))
|
||||
strbuf_addstr(&sb, "../");
|
||||
|
||||
return strbuf_detach(&sb, NULL);
|
||||
}
|
||||
|
||||
static int module_list(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int i;
|
||||
@ -718,6 +752,309 @@ static int module_name(int argc, const char **argv, const char *prefix)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct sync_cb {
|
||||
const char *prefix;
|
||||
unsigned int flags;
|
||||
};
|
||||
|
||||
#define SYNC_CB_INIT { NULL, 0 }
|
||||
|
||||
static void sync_submodule(const char *path, const char *prefix,
|
||||
unsigned int flags)
|
||||
{
|
||||
const struct submodule *sub;
|
||||
char *remote_key = NULL;
|
||||
char *sub_origin_url, *super_config_url, *displaypath;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
struct child_process cp = CHILD_PROCESS_INIT;
|
||||
char *sub_config_path = NULL;
|
||||
|
||||
if (!is_submodule_active(the_repository, path))
|
||||
return;
|
||||
|
||||
sub = submodule_from_path(&null_oid, path);
|
||||
|
||||
if (sub && sub->url) {
|
||||
if (starts_with_dot_dot_slash(sub->url) ||
|
||||
starts_with_dot_slash(sub->url)) {
|
||||
char *remote_url, *up_path;
|
||||
char *remote = get_default_remote();
|
||||
strbuf_addf(&sb, "remote.%s.url", remote);
|
||||
|
||||
if (git_config_get_string(sb.buf, &remote_url))
|
||||
remote_url = xgetcwd();
|
||||
|
||||
up_path = get_up_path(path);
|
||||
sub_origin_url = relative_url(remote_url, sub->url, up_path);
|
||||
super_config_url = relative_url(remote_url, sub->url, NULL);
|
||||
|
||||
free(remote);
|
||||
free(up_path);
|
||||
free(remote_url);
|
||||
} else {
|
||||
sub_origin_url = xstrdup(sub->url);
|
||||
super_config_url = xstrdup(sub->url);
|
||||
}
|
||||
} else {
|
||||
sub_origin_url = xstrdup("");
|
||||
super_config_url = xstrdup("");
|
||||
}
|
||||
|
||||
displaypath = get_submodule_displaypath(path, prefix);
|
||||
|
||||
if (!(flags & OPT_QUIET))
|
||||
printf(_("Synchronizing submodule url for '%s'\n"),
|
||||
displaypath);
|
||||
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "submodule.%s.url", sub->name);
|
||||
if (git_config_set_gently(sb.buf, super_config_url))
|
||||
die(_("failed to register url for submodule path '%s'"),
|
||||
displaypath);
|
||||
|
||||
if (!is_submodule_populated_gently(path, NULL))
|
||||
goto cleanup;
|
||||
|
||||
prepare_submodule_repo_env(&cp.env_array);
|
||||
cp.git_cmd = 1;
|
||||
cp.dir = path;
|
||||
argv_array_pushl(&cp.args, "submodule--helper",
|
||||
"print-default-remote", NULL);
|
||||
|
||||
strbuf_reset(&sb);
|
||||
if (capture_command(&cp, &sb, 0))
|
||||
die(_("failed to get the default remote for submodule '%s'"),
|
||||
path);
|
||||
|
||||
strbuf_strip_suffix(&sb, "\n");
|
||||
remote_key = xstrfmt("remote.%s.url", sb.buf);
|
||||
|
||||
strbuf_reset(&sb);
|
||||
submodule_to_gitdir(&sb, path);
|
||||
strbuf_addstr(&sb, "/config");
|
||||
|
||||
if (git_config_set_in_file_gently(sb.buf, remote_key, sub_origin_url))
|
||||
die(_("failed to update remote for submodule '%s'"),
|
||||
path);
|
||||
|
||||
if (flags & OPT_RECURSIVE) {
|
||||
struct child_process cpr = CHILD_PROCESS_INIT;
|
||||
|
||||
cpr.git_cmd = 1;
|
||||
cpr.dir = path;
|
||||
prepare_submodule_repo_env(&cpr.env_array);
|
||||
|
||||
argv_array_push(&cpr.args, "--super-prefix");
|
||||
argv_array_pushf(&cpr.args, "%s/", displaypath);
|
||||
argv_array_pushl(&cpr.args, "submodule--helper", "sync",
|
||||
"--recursive", NULL);
|
||||
|
||||
if (flags & OPT_QUIET)
|
||||
argv_array_push(&cpr.args, "--quiet");
|
||||
|
||||
if (run_command(&cpr))
|
||||
die(_("failed to recurse into submodule '%s'"),
|
||||
path);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
free(super_config_url);
|
||||
free(sub_origin_url);
|
||||
strbuf_release(&sb);
|
||||
free(remote_key);
|
||||
free(displaypath);
|
||||
free(sub_config_path);
|
||||
}
|
||||
|
||||
static void sync_submodule_cb(const struct cache_entry *list_item, void *cb_data)
|
||||
{
|
||||
struct sync_cb *info = cb_data;
|
||||
sync_submodule(list_item->name, info->prefix, info->flags);
|
||||
|
||||
}
|
||||
|
||||
static int module_sync(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct sync_cb info = SYNC_CB_INIT;
|
||||
struct pathspec pathspec;
|
||||
struct module_list list = MODULE_LIST_INIT;
|
||||
int quiet = 0;
|
||||
int recursive = 0;
|
||||
|
||||
struct option module_sync_options[] = {
|
||||
OPT__QUIET(&quiet, N_("Suppress output of synchronizing submodule url")),
|
||||
OPT_BOOL(0, "recursive", &recursive,
|
||||
N_("Recurse into nested submodules")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
const char *const git_submodule_helper_usage[] = {
|
||||
N_("git submodule--helper sync [--quiet] [--recursive] [<path>]"),
|
||||
NULL
|
||||
};
|
||||
|
||||
argc = parse_options(argc, argv, prefix, module_sync_options,
|
||||
git_submodule_helper_usage, 0);
|
||||
|
||||
if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
|
||||
return 1;
|
||||
|
||||
info.prefix = prefix;
|
||||
if (quiet)
|
||||
info.flags |= OPT_QUIET;
|
||||
if (recursive)
|
||||
info.flags |= OPT_RECURSIVE;
|
||||
|
||||
for_each_listed_submodule(&list, sync_submodule_cb, &info);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct deinit_cb {
|
||||
const char *prefix;
|
||||
unsigned int flags;
|
||||
};
|
||||
#define DEINIT_CB_INIT { NULL, 0 }
|
||||
|
||||
static void deinit_submodule(const char *path, const char *prefix,
|
||||
unsigned int flags)
|
||||
{
|
||||
const struct submodule *sub;
|
||||
char *displaypath = NULL;
|
||||
struct child_process cp_config = CHILD_PROCESS_INIT;
|
||||
struct strbuf sb_config = STRBUF_INIT;
|
||||
char *sub_git_dir = xstrfmt("%s/.git", path);
|
||||
|
||||
sub = submodule_from_path(&null_oid, path);
|
||||
|
||||
if (!sub || !sub->name)
|
||||
goto cleanup;
|
||||
|
||||
displaypath = get_submodule_displaypath(path, prefix);
|
||||
|
||||
/* remove the submodule work tree (unless the user already did it) */
|
||||
if (is_directory(path)) {
|
||||
struct strbuf sb_rm = STRBUF_INIT;
|
||||
const char *format;
|
||||
|
||||
/*
|
||||
* protect submodules containing a .git directory
|
||||
* NEEDSWORK: instead of dying, automatically call
|
||||
* absorbgitdirs and (possibly) warn.
|
||||
*/
|
||||
if (is_directory(sub_git_dir))
|
||||
die(_("Submodule work tree '%s' contains a .git "
|
||||
"directory (use 'rm -rf' if you really want "
|
||||
"to remove it including all of its history)"),
|
||||
displaypath);
|
||||
|
||||
if (!(flags & OPT_FORCE)) {
|
||||
struct child_process cp_rm = CHILD_PROCESS_INIT;
|
||||
cp_rm.git_cmd = 1;
|
||||
argv_array_pushl(&cp_rm.args, "rm", "-qn",
|
||||
path, NULL);
|
||||
|
||||
if (run_command(&cp_rm))
|
||||
die(_("Submodule work tree '%s' contains local "
|
||||
"modifications; use '-f' to discard them"),
|
||||
displaypath);
|
||||
}
|
||||
|
||||
strbuf_addstr(&sb_rm, path);
|
||||
|
||||
if (!remove_dir_recursively(&sb_rm, 0))
|
||||
format = _("Cleared directory '%s'\n");
|
||||
else
|
||||
format = _("Could not remove submodule work tree '%s'\n");
|
||||
|
||||
if (!(flags & OPT_QUIET))
|
||||
printf(format, displaypath);
|
||||
|
||||
strbuf_release(&sb_rm);
|
||||
}
|
||||
|
||||
if (mkdir(path, 0777))
|
||||
printf(_("could not create empty submodule directory %s"),
|
||||
displaypath);
|
||||
|
||||
cp_config.git_cmd = 1;
|
||||
argv_array_pushl(&cp_config.args, "config", "--get-regexp", NULL);
|
||||
argv_array_pushf(&cp_config.args, "submodule.%s\\.", sub->name);
|
||||
|
||||
/* remove the .git/config entries (unless the user already did it) */
|
||||
if (!capture_command(&cp_config, &sb_config, 0) && sb_config.len) {
|
||||
char *sub_key = xstrfmt("submodule.%s", sub->name);
|
||||
/*
|
||||
* remove the whole section so we have a clean state when
|
||||
* the user later decides to init this submodule again
|
||||
*/
|
||||
git_config_rename_section_in_file(NULL, sub_key, NULL);
|
||||
if (!(flags & OPT_QUIET))
|
||||
printf(_("Submodule '%s' (%s) unregistered for path '%s'\n"),
|
||||
sub->name, sub->url, displaypath);
|
||||
free(sub_key);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
free(displaypath);
|
||||
free(sub_git_dir);
|
||||
strbuf_release(&sb_config);
|
||||
}
|
||||
|
||||
static void deinit_submodule_cb(const struct cache_entry *list_item,
|
||||
void *cb_data)
|
||||
{
|
||||
struct deinit_cb *info = cb_data;
|
||||
deinit_submodule(list_item->name, info->prefix, info->flags);
|
||||
}
|
||||
|
||||
static int module_deinit(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct deinit_cb info = DEINIT_CB_INIT;
|
||||
struct pathspec pathspec;
|
||||
struct module_list list = MODULE_LIST_INIT;
|
||||
int quiet = 0;
|
||||
int force = 0;
|
||||
int all = 0;
|
||||
|
||||
struct option module_deinit_options[] = {
|
||||
OPT__QUIET(&quiet, N_("Suppress submodule status output")),
|
||||
OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes")),
|
||||
OPT_BOOL(0, "all", &all, N_("Unregister all submodules")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
const char *const git_submodule_helper_usage[] = {
|
||||
N_("git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"),
|
||||
NULL
|
||||
};
|
||||
|
||||
argc = parse_options(argc, argv, prefix, module_deinit_options,
|
||||
git_submodule_helper_usage, 0);
|
||||
|
||||
if (all && argc) {
|
||||
error("pathspec and --all are incompatible");
|
||||
usage_with_options(git_submodule_helper_usage,
|
||||
module_deinit_options);
|
||||
}
|
||||
|
||||
if (!argc && !all)
|
||||
die(_("Use '--all' if you really want to deinitialize all submodules"));
|
||||
|
||||
if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
|
||||
BUG("module_list_compute should not choke on empty pathspec");
|
||||
|
||||
info.prefix = prefix;
|
||||
if (quiet)
|
||||
info.flags |= OPT_QUIET;
|
||||
if (force)
|
||||
info.flags |= OPT_FORCE;
|
||||
|
||||
for_each_listed_submodule(&list, deinit_submodule_cb, &info);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int clone_submodule(const char *path, const char *gitdir, const char *url,
|
||||
const char *depth, struct string_list *reference,
|
||||
int quiet, int progress)
|
||||
@ -1498,6 +1835,9 @@ static struct cmd_struct commands[] = {
|
||||
{"resolve-relative-url-test", resolve_relative_url_test, 0},
|
||||
{"init", module_init, SUPPORT_SUPER_PREFIX},
|
||||
{"status", module_status, SUPPORT_SUPER_PREFIX},
|
||||
{"print-default-remote", print_default_remote, 0},
|
||||
{"sync", module_sync, SUPPORT_SUPER_PREFIX},
|
||||
{"deinit", module_deinit, 0},
|
||||
{"remote-branch", resolve_remote_submodule_branch, 0},
|
||||
{"push-check", push_check, 0},
|
||||
{"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
|
||||
|
||||
112
git-submodule.sh
112
git-submodule.sh
@ -428,60 +428,7 @@ cmd_deinit()
|
||||
shift
|
||||
done
|
||||
|
||||
if test -n "$deinit_all" && test "$#" -ne 0
|
||||
then
|
||||
echo >&2 "$(eval_gettext "pathspec and --all are incompatible")"
|
||||
usage
|
||||
fi
|
||||
if test $# = 0 && test -z "$deinit_all"
|
||||
then
|
||||
die "$(eval_gettext "Use '--all' if you really want to deinitialize all submodules")"
|
||||
fi
|
||||
|
||||
{
|
||||
git submodule--helper list --prefix "$wt_prefix" "$@" ||
|
||||
echo "#unmatched" $?
|
||||
} |
|
||||
while read -r mode sha1 stage sm_path
|
||||
do
|
||||
die_if_unmatched "$mode" "$sha1"
|
||||
name=$(git submodule--helper name "$sm_path") || exit
|
||||
|
||||
displaypath=$(git submodule--helper relative-path "$sm_path" "$wt_prefix")
|
||||
|
||||
# Remove the submodule work tree (unless the user already did it)
|
||||
if test -d "$sm_path"
|
||||
then
|
||||
# Protect submodules containing a .git directory
|
||||
if test -d "$sm_path/.git"
|
||||
then
|
||||
die "$(eval_gettext "\
|
||||
Submodule work tree '\$displaypath' contains a .git directory
|
||||
(use 'rm -rf' if you really want to remove it including all of its history)")"
|
||||
fi
|
||||
|
||||
if test -z "$force"
|
||||
then
|
||||
git rm -qn "$sm_path" ||
|
||||
die "$(eval_gettext "Submodule work tree '\$displaypath' contains local modifications; use '-f' to discard them")"
|
||||
fi
|
||||
rm -rf "$sm_path" &&
|
||||
say "$(eval_gettext "Cleared directory '\$displaypath'")" ||
|
||||
say "$(eval_gettext "Could not remove submodule work tree '\$displaypath'")"
|
||||
fi
|
||||
|
||||
mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$displaypath'")"
|
||||
|
||||
# Remove the .git/config entries (unless the user already did it)
|
||||
if test -n "$(git config --get-regexp submodule."$name\.")"
|
||||
then
|
||||
# Remove the whole section so we have a clean state when
|
||||
# the user later decides to init this submodule again
|
||||
url=$(git config submodule."$name".url)
|
||||
git config --remove-section submodule."$name" 2>/dev/null &&
|
||||
say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$displaypath'")"
|
||||
fi
|
||||
done
|
||||
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} ${force:+--force} ${deinit_all:+--all} "$@"
|
||||
}
|
||||
|
||||
is_tip_reachable () (
|
||||
@ -1036,63 +983,8 @@ cmd_sync()
|
||||
;;
|
||||
esac
|
||||
done
|
||||
cd_to_toplevel
|
||||
{
|
||||
git submodule--helper list --prefix "$wt_prefix" "$@" ||
|
||||
echo "#unmatched" $?
|
||||
} |
|
||||
while read -r mode sha1 stage sm_path
|
||||
do
|
||||
die_if_unmatched "$mode" "$sha1"
|
||||
|
||||
# skip inactive submodules
|
||||
if ! git submodule--helper is-active "$sm_path"
|
||||
then
|
||||
continue
|
||||
fi
|
||||
|
||||
name=$(git submodule--helper name "$sm_path")
|
||||
url=$(git config -f .gitmodules --get submodule."$name".url)
|
||||
|
||||
# Possibly a url relative to parent
|
||||
case "$url" in
|
||||
./*|../*)
|
||||
# rewrite foo/bar as ../.. to find path from
|
||||
# submodule work tree to superproject work tree
|
||||
up_path="$(printf '%s\n' "$sm_path" | sed "s/[^/][^/]*/../g")" &&
|
||||
# guarantee a trailing /
|
||||
up_path=${up_path%/}/ &&
|
||||
# path from submodule work tree to submodule origin repo
|
||||
sub_origin_url=$(git submodule--helper resolve-relative-url "$url" "$up_path") &&
|
||||
# path from superproject work tree to submodule origin repo
|
||||
super_config_url=$(git submodule--helper resolve-relative-url "$url") || exit
|
||||
;;
|
||||
*)
|
||||
sub_origin_url="$url"
|
||||
super_config_url="$url"
|
||||
;;
|
||||
esac
|
||||
|
||||
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
|
||||
say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")"
|
||||
git config submodule."$name".url "$super_config_url"
|
||||
|
||||
if test -e "$sm_path"/.git
|
||||
then
|
||||
(
|
||||
sanitize_submodule_env
|
||||
cd "$sm_path"
|
||||
remote=$(get_default_remote)
|
||||
git config remote."$remote".url "$sub_origin_url"
|
||||
|
||||
if test -n "$recursive"
|
||||
then
|
||||
prefix="$prefix$sm_path/"
|
||||
eval cmd_sync
|
||||
fi
|
||||
)
|
||||
fi
|
||||
done
|
||||
git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} "$@"
|
||||
}
|
||||
|
||||
cmd_absorbgitdirs()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user