git-svn: add --prefix= option to multi-init
Also, document --{trunk,branches,tags} options while we're documenting multi-init options. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
59b5f52047
commit
ae41098714
@ -139,6 +139,24 @@ manually joining branches on commit.
|
|||||||
where the repository URL ends and where the repository path
|
where the repository URL ends and where the repository path
|
||||||
begins.
|
begins.
|
||||||
|
|
||||||
|
-T<trunk_subdir>::
|
||||||
|
--trunk=<trunk_subdir>::
|
||||||
|
-t<tags_subdir>::
|
||||||
|
--tags=<tags_subdir>::
|
||||||
|
-b<branches_subdir>::
|
||||||
|
--branches=<branches_subdir>::
|
||||||
|
These are the command-line options for multi-init. Each of
|
||||||
|
these flags can point to a relative repository path
|
||||||
|
(--tags=project/tags') or a full url
|
||||||
|
(--tags=https://foo.org/project/tags)
|
||||||
|
|
||||||
|
--prefix=<prefix>
|
||||||
|
This allows one to specify a prefix which is prepended to the
|
||||||
|
names of remotes. The prefix does not automatically include a
|
||||||
|
trailing slash, so be sure you include one in the argument if
|
||||||
|
that is what you want. This is useful if you wish to track
|
||||||
|
multiple projects that share a common repository.
|
||||||
|
|
||||||
'multi-fetch'::
|
'multi-fetch'::
|
||||||
This runs fetch on all known SVN branches we're tracking. This
|
This runs fetch on all known SVN branches we're tracking. This
|
||||||
will NOT discover new branches (unlike git-svnimport), so
|
will NOT discover new branches (unlike git-svnimport), so
|
||||||
|
@ -70,7 +70,7 @@ my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
|
|||||||
$_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m,
|
$_version, $_upgrade, $_authors, $_branch_all_refs, @_opt_m,
|
||||||
$_merge, $_strategy, $_dry_run, $_ignore_nodate, $_non_recursive,
|
$_merge, $_strategy, $_dry_run, $_ignore_nodate, $_non_recursive,
|
||||||
$_username, $_config_dir, $_no_auth_cache,
|
$_username, $_config_dir, $_no_auth_cache,
|
||||||
$_pager, $_color);
|
$_pager, $_color, $_prefix);
|
||||||
my (@_branch_from, %tree_map, %users, %rusers, %equiv);
|
my (@_branch_from, %tree_map, %users, %rusers, %equiv);
|
||||||
my ($_svn_can_do_switch);
|
my ($_svn_can_do_switch);
|
||||||
my @repo_path_split_cache;
|
my @repo_path_split_cache;
|
||||||
@ -134,6 +134,7 @@ my %cmd = (
|
|||||||
'username=s' => \$_username,
|
'username=s' => \$_username,
|
||||||
'config-dir=s' => \$_config_dir,
|
'config-dir=s' => \$_config_dir,
|
||||||
'no-auth-cache' => \$_no_auth_cache,
|
'no-auth-cache' => \$_no_auth_cache,
|
||||||
|
'prefix=s' => \$_prefix,
|
||||||
} ],
|
} ],
|
||||||
'multi-fetch' => [ \&multi_fetch,
|
'multi-fetch' => [ \&multi_fetch,
|
||||||
'Fetch multiple trees (like git-svnimport)',
|
'Fetch multiple trees (like git-svnimport)',
|
||||||
@ -595,8 +596,9 @@ sub multi_init {
|
|||||||
command_noisy('repo-config', 'svn.trunk', $trunk_url);
|
command_noisy('repo-config', 'svn.trunk', $trunk_url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
complete_url_ls_init($url, $_branches, '--branches/-b', '');
|
$_prefix = '' unless defined $_prefix;
|
||||||
complete_url_ls_init($url, $_tags, '--tags/-t', 'tags/');
|
complete_url_ls_init($url, $_branches, '--branches/-b', $_prefix);
|
||||||
|
complete_url_ls_init($url, $_tags, '--tags/-t', $_prefix . 'tags/');
|
||||||
}
|
}
|
||||||
|
|
||||||
sub multi_fetch {
|
sub multi_fetch {
|
||||||
|
Loading…
Reference in New Issue
Block a user