git-svn: add an option to skip the creation of empty directories
"git svn mkdirs" (which creates empty directories in the current working copy) can be very slow and is often unnecessary. Provide a config file option "svn-remote.<name>.automkdirs" that prevents empty directories from being created automatically. (They are still created if "git svn mkdirs" is invoked explicitly.) Based-on-patch-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6acef04358
commit
55f9d7a75c
@ -343,6 +343,8 @@ Any other arguments are passed directly to 'git log'
|
||||
Empty directories are automatically recreated when using
|
||||
"git svn clone" and "git svn rebase", so "mkdirs" is intended
|
||||
for use after commands like "git checkout" or "git reset".
|
||||
(See the svn-remote.<name>.automkdirs config file option for
|
||||
more information.)
|
||||
|
||||
'commit-diff'::
|
||||
Commits the diff of two tree-ish arguments from the
|
||||
@ -663,6 +665,14 @@ svn.pathnameencoding::
|
||||
locales to avoid corrupted file names with non-ASCII characters.
|
||||
Valid encodings are the ones supported by Perl's Encode module.
|
||||
|
||||
svn-remote.<name>.automkdirs::
|
||||
Normally, the "git svn clone" and "git svn rebase" commands
|
||||
attempt to recreate empty directories that are in the
|
||||
Subversion repository. If this option is set to "false", then
|
||||
empty directories will only be created if the "git svn mkdirs"
|
||||
command is run explicitly. If unset, 'git svn' assumes this
|
||||
option to be "true".
|
||||
|
||||
Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
|
||||
options all affect the metadata generated and used by 'git svn'; they
|
||||
*must* be set in the configuration file before any history is imported
|
||||
|
17
git-svn.perl
17
git-svn.perl
@ -781,6 +781,15 @@ sub cmd_find_rev {
|
||||
print "$result\n" if $result;
|
||||
}
|
||||
|
||||
sub auto_create_empty_directories {
|
||||
my ($gs) = @_;
|
||||
my $var = eval { command_oneline('config', '--get', '--bool',
|
||||
"svn-remote.$gs->{repo_id}.automkdirs") };
|
||||
# By default, create empty directories by consulting the unhandled log,
|
||||
# but allow setting it to 'false' to skip it.
|
||||
return !($var && $var eq 'false');
|
||||
}
|
||||
|
||||
sub cmd_rebase {
|
||||
command_noisy(qw/update-index --refresh/);
|
||||
my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
|
||||
@ -804,7 +813,9 @@ sub cmd_rebase {
|
||||
$_fetch_all ? $gs->fetch_all : $gs->fetch;
|
||||
}
|
||||
command_noisy(rebase_cmd(), $gs->refname);
|
||||
$gs->mkemptydirs;
|
||||
if (auto_create_empty_directories($gs)) {
|
||||
$gs->mkemptydirs;
|
||||
}
|
||||
}
|
||||
|
||||
sub cmd_show_ignore {
|
||||
@ -1242,7 +1253,9 @@ sub post_fetch_checkout {
|
||||
command_noisy(qw/read-tree -m -u -v HEAD HEAD/);
|
||||
print STDERR "Checked out HEAD:\n ",
|
||||
$gs->full_url, " r", $gs->last_rev, "\n";
|
||||
$gs->mkemptydirs($gs->last_rev);
|
||||
if (auto_create_empty_directories($gs)) {
|
||||
$gs->mkemptydirs($gs->last_rev);
|
||||
}
|
||||
}
|
||||
|
||||
sub complete_svn_url {
|
||||
|
@ -28,6 +28,23 @@ test_expect_success 'empty directories exist' '
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'option automkdirs set to false' '
|
||||
(
|
||||
git svn init "$svnrepo" cloned-no-mkdirs &&
|
||||
cd cloned-no-mkdirs &&
|
||||
git config svn-remote.svn.automkdirs false &&
|
||||
git svn fetch &&
|
||||
for i in a b c d d/e d/e/f "weird file name"
|
||||
do
|
||||
if test -d "$i"
|
||||
then
|
||||
echo >&2 "$i exists"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'more emptiness' '
|
||||
svn_cmd mkdir -m "bang bang" "$svnrepo"/"! !"
|
||||
'
|
||||
|
Loading…
Reference in New Issue
Block a user