When initializing a git-svn repository from a Subversion repository, it
is common to be interested in a path which did not exist in the initial
commit to Subversion. In a large repository like e.g. Apache, this may
take some time while the user receives no additional feedback. Print
the highest revision number scanned thus far to let the user know
something is still happening.
Signed-off-by: Deskin Miller <deskinm@xxxxxxxxx>
---
This came about on account of patmaddox asking on #git why git-svn
seemed to be hung on clone. Despite the admonition that this might take
a long time, I also like to have some indication that progress is being
made. My first version of this printed using '\rChecked through
r$revision' but the subsequent output line when the path is found ends
up clobbered on the same line, and I'm not skilled enough at the
terminal or Perl to address this cleanly. If the current version is
felt to be too verbose since it is printing a new line, I'd be up for
squelching the output to e.g. every 1000 revisions or so.
Anecdotally, it looks like Subversion looks for the path in blocks of
100 revisions, so we get the nice whole revision number for free. I
couldn't find any documentation on the proper format of the error
message, so I just came up with the regular expressions to parse the
revision myself; if they need to be more explicit to avoid really
egregious path names, I can make an effort.
I tested on both http:// and file:// transport, to come up with the
different error strings; since the error number for file is the same as
svn:// I'm hoping that the error string is the same too. If someone can
bounce this off a svn:// repo I'd appreciate it, otherwise I'll dig out
the documentation and set up a network-served svn repository myself
(which is really my job as the patch author anyway).
Deskin Miller
git-svn.perl | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 79888a0..60b56be 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4542,6 +4542,12 @@ sub skip_unknown_revs {
# More codes may be discovered later...
if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
my $err_key = $err->expanded_message;
+ my $revision = $err_key;
+ if ($errno == 175007 || $errno == 175002 ) {
+ $revision =~ s/.*!svn\/bc\/(\d+).*/$1/;
+ } elsif ($errno == 160013) {
+ $revision =~ s/.*File not found: revision (\d+).*/$1/;
+ }
# revision numbers change every time, filter them out
$err_key =~ s/\d+/\0/g;
$err_key = "$errno\0$err_key";
@@ -4555,6 +4561,7 @@ sub skip_unknown_revs {
"This may take a while on large repositories\n";
$ignored_err{$err_key} = 1;
}
+ print "Checked through r$revision\n";
return;
}
die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
--
1.6.1.399.g0d272
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
