undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git svn info: always quote URLs in 'info' output

Browse Source 
Changes 'git svn info' to always URL-escape the 'URL' and 'Repository'
fields and --url output, like SVN (at least 1.5) does.

Note that reusing the escape_url() further down in Git::SVN::Ra is not
possible because it only triggers for http(s) URLs.  I did not know
whether extending it to all schemes would break SVN access anywhere,
so I made a new one that quotes in all schemes.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Thomas Rast 2008-08-26 21:32:37 +02:00 committed by Eric Wong
parent edde9112ab
commit 05427b91f0
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
git-svn.perl
View File

@ -803,6 +803,25 @@ sub cmd_commit_diff {
} }
} }
sub escape_uri_only {
my ($uri) = @_;
my @tmp;
foreach (split m{/}, $uri) {
s/([^\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
push @tmp, $_;
}
join('/', @tmp);
}
sub escape_url {
my ($url) = @_;
if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
$url = "$scheme://$domain$uri";
}
$url;
}
sub cmd_info { sub cmd_info {
my $path = canonicalize_path(defined($_[0]) ? $_[0] : "."); my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
my $fullpath = canonicalize_path($cmd_dir_prefix . $path); my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
@ -829,18 +848,18 @@ sub cmd_info {
my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath"); my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
if ($_url) { if ($_url) {
print $full_url, "\n"; print escape_url($full_url), "\n";
return; return;
} }
my $result = "Path: $path\n"; my $result = "Path: $path\n";
$result .= "Name: " . basename($path) . "\n" if $file_type ne "dir"; $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
$result .= "URL: " . $full_url . "\n"; $result .= "URL: " . escape_url($full_url) . "\n";
eval { eval {
my $repos_root = $gs->repos_root; my $repos_root = $gs->repos_root;
Git::SVN::remove_username($repos_root); Git::SVN::remove_username($repos_root);
$result .= "Repository Root: $repos_root\n"; $result .= "Repository Root: " . escape_url($repos_root) . "\n";
}; };
if ($@) { if ($@) {
$result .= "Repository Root: (offline)\n"; $result .= "Repository Root: (offline)\n";

30
t/t9119-git-svn-info.sh
View File

@ -34,6 +34,8 @@ ptouch() {
' "`svn info $2 | grep '^Text Last Updated:'`" "$1" ' "`svn info $2 | grep '^Text Last Updated:'`" "$1"
} }
quoted_svnrepo="$(echo $svnrepo | sed 's/ /%20/')"
test_expect_success 'setup repository and import' ' test_expect_success 'setup repository and import' '
mkdir info && mkdir info &&
cd info && cd info &&
@ -70,7 +72,7 @@ test_expect_success 'info' "
" "
test_expect_success 'info --url' ' test_expect_success 'info --url' '
test "$(cd gitwc; git-svn info --url)" = "$svnrepo" test "$(cd gitwc; git-svn info --url)" = "$quoted_svnrepo"
' '
test_expect_success 'info .' " test_expect_success 'info .' "
@ -80,7 +82,7 @@ test_expect_success 'info .' "
" "
test_expect_success 'info --url .' ' test_expect_success 'info --url .' '
test "$(cd gitwc; git-svn info --url .)" = "$svnrepo" test "$(cd gitwc; git-svn info --url .)" = "$quoted_svnrepo"
' '
test_expect_success 'info file' " test_expect_success 'info file' "
@ -90,7 +92,7 @@ test_expect_success 'info file' "
" "
test_expect_success 'info --url file' ' test_expect_success 'info --url file' '
test "$(cd gitwc; git-svn info --url file)" = "$svnrepo/file" test "$(cd gitwc; git-svn info --url file)" = "$quoted_svnrepo/file"
' '
test_expect_success 'info directory' " test_expect_success 'info directory' "
@ -106,7 +108,7 @@ test_expect_success 'info inside directory' "
" "
test_expect_success 'info --url directory' ' test_expect_success 'info --url directory' '
test "$(cd gitwc; git-svn info --url directory)" = "$svnrepo/directory" test "$(cd gitwc; git-svn info --url directory)" = "$quoted_svnrepo/directory"
' '
test_expect_success 'info symlink-file' " test_expect_success 'info symlink-file' "
@ -117,7 +119,7 @@ test_expect_success 'info symlink-file' "
test_expect_success 'info --url symlink-file' ' test_expect_success 'info --url symlink-file' '
test "$(cd gitwc; git-svn info --url symlink-file)" \ test "$(cd gitwc; git-svn info --url symlink-file)" \
= "$svnrepo/symlink-file" = "$quoted_svnrepo/symlink-file"
' '
test_expect_success 'info symlink-directory' " test_expect_success 'info symlink-directory' "
@ -130,7 +132,7 @@ test_expect_success 'info symlink-directory' "
test_expect_success 'info --url symlink-directory' ' test_expect_success 'info --url symlink-directory' '
test "$(cd gitwc; git-svn info --url symlink-directory)" \ test "$(cd gitwc; git-svn info --url symlink-directory)" \
= "$svnrepo/symlink-directory" = "$quoted_svnrepo/symlink-directory"
' '
test_expect_success 'info added-file' " test_expect_success 'info added-file' "
@ -150,7 +152,7 @@ test_expect_success 'info added-file' "
test_expect_success 'info --url added-file' ' test_expect_success 'info --url added-file' '
test "$(cd gitwc; git-svn info --url added-file)" \ test "$(cd gitwc; git-svn info --url added-file)" \
= "$svnrepo/added-file" = "$quoted_svnrepo/added-file"
' '
test_expect_success 'info added-directory' " test_expect_success 'info added-directory' "
@ -172,7 +174,7 @@ test_expect_success 'info added-directory' "
test_expect_success 'info --url added-directory' ' test_expect_success 'info --url added-directory' '
test "$(cd gitwc; git-svn info --url added-directory)" \ test "$(cd gitwc; git-svn info --url added-directory)" \
= "$svnrepo/added-directory" = "$quoted_svnrepo/added-directory"
' '
test_expect_success 'info added-symlink-file' " test_expect_success 'info added-symlink-file' "
@ -195,7 +197,7 @@ test_expect_success 'info added-symlink-file' "
test_expect_success 'info --url added-symlink-file' ' test_expect_success 'info --url added-symlink-file' '
test "$(cd gitwc; git-svn info --url added-symlink-file)" \ test "$(cd gitwc; git-svn info --url added-symlink-file)" \
= "$svnrepo/added-symlink-file" = "$quoted_svnrepo/added-symlink-file"
' '
test_expect_success 'info added-symlink-directory' " test_expect_success 'info added-symlink-directory' "
@ -218,7 +220,7 @@ test_expect_success 'info added-symlink-directory' "
test_expect_success 'info --url added-symlink-directory' ' test_expect_success 'info --url added-symlink-directory' '
test "$(cd gitwc; git-svn info --url added-symlink-directory)" \ test "$(cd gitwc; git-svn info --url added-symlink-directory)" \
= "$svnrepo/added-symlink-directory" = "$quoted_svnrepo/added-symlink-directory"
' '
# The next few tests replace the "Text Last Updated" value with a # The next few tests replace the "Text Last Updated" value with a
@ -244,7 +246,7 @@ test_expect_success 'info deleted-file' "
test_expect_success 'info --url file (deleted)' ' test_expect_success 'info --url file (deleted)' '
test "$(cd gitwc; git-svn info --url file)" \ test "$(cd gitwc; git-svn info --url file)" \
= "$svnrepo/file" = "$quoted_svnrepo/file"
' '
test_expect_success 'info deleted-directory' " test_expect_success 'info deleted-directory' "
@ -265,7 +267,7 @@ test_expect_success 'info deleted-directory' "
test_expect_success 'info --url directory (deleted)' ' test_expect_success 'info --url directory (deleted)' '
test "$(cd gitwc; git-svn info --url directory)" \ test "$(cd gitwc; git-svn info --url directory)" \
= "$svnrepo/directory" = "$quoted_svnrepo/directory"
' '
test_expect_success 'info deleted-symlink-file' " test_expect_success 'info deleted-symlink-file' "
@ -287,7 +289,7 @@ test_expect_success 'info deleted-symlink-file' "
test_expect_success 'info --url symlink-file (deleted)' ' test_expect_success 'info --url symlink-file (deleted)' '
test "$(cd gitwc; git-svn info --url symlink-file)" \ test "$(cd gitwc; git-svn info --url symlink-file)" \
= "$svnrepo/symlink-file" = "$quoted_svnrepo/symlink-file"
' '
test_expect_success 'info deleted-symlink-directory' " test_expect_success 'info deleted-symlink-directory' "
@ -309,7 +311,7 @@ test_expect_success 'info deleted-symlink-directory' "
test_expect_success 'info --url symlink-directory (deleted)' ' test_expect_success 'info --url symlink-directory (deleted)' '
test "$(cd gitwc; git-svn info --url symlink-directory)" \ test "$(cd gitwc; git-svn info --url symlink-directory)" \
= "$svnrepo/symlink-directory" = "$quoted_svnrepo/symlink-directory"
' '
# NOTE: git does not have the concept of replaced objects, # NOTE: git does not have the concept of replaced objects,