Hello,
My first patch, please be gentle.
This is a first attempt to get the escaping behavior into git-svn.
I hope I have not screwed up too badly since this I have been looking
at Perl for more or less the first time.
So I would appreciate if any mistakes would be pointed out to me.
The patch works for me during clone, fetch and dcommit. I haven't
tried anything else yet.
Robert
PS: There is a testing script I have used. I suppose it should be put into
the testing infrastructure, something I am not yet familiar with. If
someone is interested I can send it as is.
---
In git some characters are invalid as documented
in git-check-ref-format. In subversion these characters might
be valid, so a translation is required.
This patch does this translation by url escaping characters, that
are not allowed.
Credit for ideas and code snippets goes to Eric Wong, martin f. krafft and
Jan Hudec
Signed-off-by: Robert Ewald <robewald@xxxxxxx>
---
git-svn.perl | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 6c692a7..68e62ab 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -938,8 +938,8 @@ sub resolve_local_globs {
foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
next unless m#^refs/remotes/$ref->{regex}$#;
my $p = $1;
- my $pathname = $path->full_path($p);
- my $refname = $ref->full_path($p);
+ my $pathname = desanitize_refname($path->full_path($p));
+ my $refname = desanitize_refname($ref->full_path($p));
if (my $existing = $fetch->{$pathname}) {
if ($existing ne $refname) {
die "Refspec conflict:\n",
@@ -1239,7 +1239,44 @@ sub new {
$self;
}
-sub refname { "refs/remotes/$_[0]->{ref_id}" }
+sub refname {
+ my ($refname) = "refs/remotes/$_[0]->{ref_id}" ;
+
+ # It cannot end with a slash /, we'll throw up on this because
+ # SVN can't have directories with a slash in their name, either:
+ if ($refname =~ m{/$}) {
+ die "ref: '$refname' ends with a trailing slash, this is ",
+ "not permitted by git nor Subversion\n";
+ }
+
+ # It cannot have ASCII control character space, tilde ~, caret ^,
+ # colon :, question-mark ?, asterisk *, space, or open bracket[
anywhere
+ #
+ # Additionally, % must be escaped because it is used for escaping
+ # and we want our escaped refname to be reversible
+ $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
+
+ # no slash-separated component can begin with a dot .
+ # /.* becomes /%2E*
+ $refname =~ s{/\.}{/%2E}g;
+ # It cannot have two consecutive dots .. anywhere
+ # .. becomes %2E%2E
+ $refname =~ s{\.\.}{%2E%2E}g;
+
+ $refname;
+}
+
+sub desanitize_refname {
+ my ($refname) = @_;
+
+ print "bob: desanitized from $refname ";
+
+ $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
+
+ print " to $refname \n";
+
+ $refname;
+}
sub svm_uuid {
my ($self) = @_;
--
1.5.3.rc3-dirty
--
Robert Ewald
-
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
