git-svn: fix handling of filenames with embedded '@'
svn has trouble parsing files with embedded '@' characters. For example, svn propget svn:keywords foo@bar.c svn: Syntax error parsing revision 'bar.c' I asked about this on #svn and the workaround suggested was to append an explicit revision specifier: svn propget svn:keywords foo@bar.c@BASE This patch appends '@BASE' to the filename in all calls to 'svn propget'. Patch originally by Seth Falcon <sethfalcon@gmail.com> Seth: signoff? [ew: Made to work with older svn that don't support peg revisions] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
May 28, 2006 at 15:23 UTC
8a97e368882afbc2bdc030214339bed54ed6545c
1 file changed
+13
-4
contrib/git-svn/git-svn.perl
+13
-4
@@ -34,7 +34,7 @@ my $sha1_short = qr/[a-f\d]{4,40}/;
34
my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
35
$_find_copies_harder, $_l, $_version, $_upgrade, $_authors);
36
my (@_branch_from, %tree_map, %users);
37
-my $_svn_co_url_revs;
37
+my ($_svn_co_url_revs, $_svn_pg_peg_revs);
38
39
my %fc_opts = ( 'no-ignore-externals' => \$_no_ignore_ext,
40
'branch|b=s' => \@_branch_from,
@@ -336,7 +336,7 @@ sub show_ignore {
336
my %ign;
337
File::Find::find({wanted=>sub{if(lstat $_ && -d _ && -d "$_/.svn"){
338
s#^\./##;
339
- @{$ign{$_}} = safe_qx(qw(svn propget svn:ignore),$_);
339
+ @{$ign{$_}} = svn_propget_base('svn:ignore', $_);
340
}}, no_chdir=>1},'.');
341
342
print "\n# /\n";
@@ -859,7 +859,7 @@ sub sys { system(@_) == 0 or croak $? }
859
860
sub eol_cp {
861
my ($from, $to) = @_;
862
- my $es = safe_qx(qw/svn propget svn:eol-style/, $to);
862
+ my $es = svn_propget_base('svn:eol-style', $to);
863
open my $rfd, '<', $from or croak $!;
864
binmode $rfd or croak $!;
865
open my $wfd, '>', $to or croak $!;
@@ -897,7 +897,7 @@ sub do_update_index {
897
while (my $x = <$p>) {
898
chomp $x;
899
if (!$no_text_base && lstat $x && ! -l _ &&
900
- safe_qx(qw/svn propget svn:keywords/,$x)) {
900
+ svn_propget_base('svn:keywords', $x)) {
901
my $mode = -x _ ? 0755 : 0644;
902
my ($v,$d,$f) = File::Spec->splitpath($x);
903
my $tb = File::Spec->catfile($d, '.svn', 'tmp',
@@ -1135,6 +1135,9 @@ sub svn_compat_check {
1135
if (grep /usage: checkout URL\[\@REV\]/,@co_help) {
1136
$_svn_co_url_revs = 1;
1137
}
1138
+ if (grep /\[TARGET\[\@REV\]\.\.\.\]/, `svn propget -h`) {
1139
+ $_svn_pg_peg_revs = 1;
1140
+ }
1141
1142
# I really, really hope nobody hits this...
1143
unless (grep /stop-on-copy/, (safe_qx(qw(svn log -h)))) {
@@ -1214,6 +1217,12 @@ sub load_authors {
1217
close $authors or croak $!;
1218
}
1219
1220
+sub svn_propget_base {
1221
+ my ($p, $f) = @_;
1222
+ $f .= '@BASE' if $_svn_pg_peg_revs;
1223
+ return safe_qx(qw/svn propget/, $p, $f);
1224
+}
1225
+
1226
__END__
1227
1228
Data structures: