From: Sasha Khapyorsky <sashak@voltaire.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH] git-svnimport: clean svn path when accessing SVN repo
Date: Sun, 7 Jan 2007 02:22:10 +0200 [thread overview]
Message-ID: <20070107002210.GC16771@sashak.voltaire.com> (raw)
In-Reply-To: <20061214214327.GH7838@sashak.voltaire.com>
Clean svn path from leading '/' when accessing SVN repo.
Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
---
This fixes git-svnimport problems reported in this thread ("git-svnimport
breakage as of git-1.4.4"). Finally I forgot to submit this then, sorry
about that.
git-svnimport.perl | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/git-svnimport.perl b/git-svnimport.perl
index cbaa8ab..071777b 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -146,6 +146,7 @@ sub file {
print "... $rev $path ...\n" if $opt_v;
my (undef, $properties);
my $pool = SVN::Pool->new();
+ $path =~ s#^/*##;
eval { (undef, $properties)
= $self->{'svn'}->get_file($path,$rev,$fh,$pool); };
$pool->clear;
@@ -181,6 +182,7 @@ sub ignore {
my($self,$path,$rev) = @_;
print "... $rev $path ...\n" if $opt_v;
+ $path =~ s#^/*##;
my (undef,undef,$properties)
= $self->{'svn'}->get_dir($path,$rev,undef);
if (exists $properties->{'svn:ignore'}) {
@@ -197,6 +199,7 @@ sub ignore {
sub dir_list {
my($self,$path,$rev) = @_;
+ $path =~ s#^/*##;
my ($dirents,undef,$properties)
= $self->{'svn'}->get_dir($path,$rev,undef);
return $dirents;
@@ -354,6 +357,7 @@ open BRANCHES,">>", "$git_dir/svn2git";
sub node_kind($$) {
my ($svnpath, $revision) = @_;
my $pool=SVN::Pool->new;
+ $svnpath =~ s#^/*##;
my $kind = $svn->{'svn'}->check_path($svnpath,$revision,$pool);
$pool->clear;
return $kind;
--
1.5.0.rc0.g2484-dirty
prev parent reply other threads:[~2007-01-07 0:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-07 15:26 git-svnimport breakage as of git-1.4.4 Daniel Drake
2006-12-08 20:32 ` Sasha Khapyorsky
2006-12-10 3:49 ` Dongsheng Song
2006-12-10 11:47 ` Sasha Khapyorsky
2006-12-11 20:00 ` Dongsheng Song
2006-12-11 20:50 ` Sasha Khapyorsky
2006-12-11 21:01 ` Dongsheng Song
2006-12-14 2:25 ` Sasha Khapyorsky
2006-12-11 14:27 ` Daniel Drake
2006-12-11 20:49 ` Sasha Khapyorsky
2006-12-11 21:03 ` Daniel Drake
2006-12-11 22:03 ` Sasha Khapyorsky
2006-12-13 16:28 ` Daniel Drake
2006-12-14 2:21 ` Sasha Khapyorsky
2006-12-14 21:05 ` Daniel Drake
2006-12-14 21:20 ` Sasha Khapyorsky
2006-12-14 21:32 ` Junio C Hamano
2006-12-14 21:43 ` Sasha Khapyorsky
2007-01-07 0:22 ` Sasha Khapyorsky [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070107002210.GC16771@sashak.voltaire.com \
--to=sashak@voltaire.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).