mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
git svn: add an option to recode pathnames
Introduce a new option 'svn.pathnameencoding' that instructs git svn to recode pathnames to a given encoding. It can be used by windows users and by those who work in non-utf8 locales to avoid corrupted file names with non-ascii characters. [rp: renamed the option and added manpage documentation] Signed-off-by: Dmitry Statyvka <dstatyvka@tmsoft-ltd.kiev.ua> Signed-off-by: Robert Pollak <robert.pollak@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
parent
61bf126ecb
commit
3713e2226b
|
@ -646,6 +646,12 @@ svn.brokenSymlinkWorkaround::
|
||||||
revision fetched. If unset, 'git svn' assumes this option to
|
revision fetched. If unset, 'git svn' assumes this option to
|
||||||
be "true".
|
be "true".
|
||||||
|
|
||||||
|
svn.pathnameencoding::
|
||||||
|
This instructs git svn to recode pathnames to a given encoding.
|
||||||
|
It can be used by windows users and by those who work in non-utf8
|
||||||
|
locales to avoid corrupted file names with non-ASCII characters.
|
||||||
|
Valid encodings are the ones supported by Perl's Encode module.
|
||||||
|
|
||||||
Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
|
Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
|
||||||
options all affect the metadata generated and used by 'git svn'; they
|
options all affect the metadata generated and used by 'git svn'; they
|
||||||
*must* be set in the configuration file before any history is imported
|
*must* be set in the configuration file before any history is imported
|
||||||
|
|
|
@ -4050,6 +4050,7 @@ sub new {
|
||||||
$self->{absent_dir} = {};
|
$self->{absent_dir} = {};
|
||||||
$self->{absent_file} = {};
|
$self->{absent_file} = {};
|
||||||
$self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
|
$self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new });
|
||||||
|
$self->{pathnameencoding} = Git::config('svn.pathnameencoding');
|
||||||
$self;
|
$self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4133,6 +4134,10 @@ sub open_directory {
|
||||||
|
|
||||||
sub git_path {
|
sub git_path {
|
||||||
my ($self, $path) = @_;
|
my ($self, $path) = @_;
|
||||||
|
if (my $enc = $self->{pathnameencoding}) {
|
||||||
|
require Encode;
|
||||||
|
Encode::from_to($path, 'UTF-8', $enc);
|
||||||
|
}
|
||||||
if ($self->{path_strip}) {
|
if ($self->{path_strip}) {
|
||||||
$path =~ s!$self->{path_strip}!! or
|
$path =~ s!$self->{path_strip}!! or
|
||||||
die "Failed to strip path '$path' ($self->{path_strip})\n";
|
die "Failed to strip path '$path' ($self->{path_strip})\n";
|
||||||
|
@ -4521,6 +4526,10 @@ sub split_path {
|
||||||
|
|
||||||
sub repo_path {
|
sub repo_path {
|
||||||
my ($self, $path) = @_;
|
my ($self, $path) = @_;
|
||||||
|
if (my $enc = $self->{pathnameencoding}) {
|
||||||
|
require Encode;
|
||||||
|
Encode::from_to($path, $enc, 'UTF-8');
|
||||||
|
}
|
||||||
$self->{path_prefix}.(defined $path ? $path : '');
|
$self->{path_prefix}.(defined $path ? $path : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue