Thread (6 messages) flat view 6 messages, 5 authors, 2016-06-15

Re: [PATCH] translate bad characters in refnames during git-svn fetch

From: Eric Wong <hidden>
Date: 2016-06-15 22:43:21

martin f krafft [off-list ref] wrote:
also sprach Eric Wong [off-list ref] [2007.07.16.0530 +0200]:
quoted
The major issue with this is that it doesn't handle odd cases
where a refname is sanitized into something (say "1234~2"
sanitizes to "1234=2"), and then another branch is created named
"1234=2".
Well, we can't please everyone, can we? :)

I like Jan's proposal about using the % escape, even though it
doesn't make pretty branch names.
I like it, too.  How about something like the two functions below?  This
will break things a bit for people currently using % in refnames,
however.

I think this will work rather nicely once I've figured out how the path
globbing code works[1] and where to sanitize/desanitize the refnames
properly.

It would be far easier to take your approach and sanitize them only
for the command-line, but storing unsanitized git refnames into the
.git/config is something I want to avoid:

  Somebody naming directories on the SVN side with the path component
  ":refs/remotes" in them could screw things up for us.

# transform the refname as per rules in git-check-ref-format(1):
sub sanitize_ref_name {
	my ($refname) = @_;

	# 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 *, 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_ref_name {
	my ($refname) = @_;
	$refname =~ s{%(?:([0-9A-F]{2})}{chr hex($1)}g;

	$refname;
}
On the other hand, we could make the translation regexps
configurable...
Hopefully not needed.  I fear it would just add to confusion.


[1] I don't remember writing the globbing code myself, maybe it was my
psychotic alter ego, but I'm having trouble following it at this time of
the night/morning.

-- 
Eric Wong
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help