Git development
 help / color / mirror / Atom feed
* [PATCH 1/3] git-svn: properly set path for "info" command
@ 2008-08-05  7:35 Eric Wong
  2008-08-05  7:35 ` [PATCH 2/3] Fix race condition in t9119-git-svn-info.sh Eric Wong
  2008-08-05  7:35 ` [PATCH 3/3] t9119: conditionally re-enable test depending on svn(1) version Eric Wong
  0 siblings, 2 replies; 3+ messages in thread
From: Eric Wong @ 2008-08-05  7:35 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Eric Wong

canonicalize_path() was previously changed to better
fit SVN 1.5, but it makes the "info" command not match
svn(1) in two places:

  1) URL ended up with a trailing slash when run without an
     argument.

  2) "Path: " was displayed instead of "Path: ." when run
     without an argument.

We will also handle odd cases where a user wants to
get information on a file or directory named "0", too.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 git-svn.perl |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index cc35f50..df0ed90 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -796,8 +796,8 @@ sub cmd_commit_diff {
 }
 
 sub cmd_info {
-	my $path = canonicalize_path(shift or ".");
-	unless (scalar(@_) == 0) {
+	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
+	if (exists $_[1]) {
 		die "Too many arguments specified\n";
 	}
 
@@ -813,6 +813,10 @@ sub cmd_info {
 		die "Unable to determine upstream SVN information from ",
 		    "working tree history\n";
 	}
+
+	# canonicalize_path() will return "" to make libsvn 1.5.x happy,
+	$path = "." if $path eq "";
+
 	my $full_url = $url . ($path eq "." ? "" : "/$path");
 
 	if ($_url) {
-- 
1.6.0.rc1.69.g797ea

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-05  7:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-05  7:35 [PATCH 1/3] git-svn: properly set path for "info" command Eric Wong
2008-08-05  7:35 ` [PATCH 2/3] Fix race condition in t9119-git-svn-info.sh Eric Wong
2008-08-05  7:35 ` [PATCH 3/3] t9119: conditionally re-enable test depending on svn(1) version Eric Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox