From: "Michael G. Schwern" <schwern@pobox.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: robbat2@gentoo.org, bwalton@artsci.utoronto.ca,
normalperson@yhbt.net, jrnieder@gmail.com, schwern@pobox.com
Subject: [PATCH 6/7] Switch path canonicalization to use the SVN API.
Date: Sat, 28 Jul 2012 02:38:31 -0700 [thread overview]
Message-ID: <1343468312-72024-7-git-send-email-schwern@pobox.com> (raw)
In-Reply-To: <1343468312-72024-1-git-send-email-schwern@pobox.com>
From: "Michael G. Schwern" <schwern@pobox.com>
All tests pass with SVN 1.6. SVN 1.7 remains broken, not worrying
about it yet.
SVN changed its path canonicalization API between 1.6 and 1.7.
http://svnbook.red-bean.com/en/1.6/svn.developer.usingapi.html#svn.developer.usingapi.urlpath
http://svnbook.red-bean.com/en/1.7/svn.developer.usingapi.html#svn.developer.usingapi.urlpath
The SVN API does not accept foo/.. but it also doesn't canonicalize
it. We have to do it ourselves.
---
perl/Git/SVN/Utils.pm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm
index 6c8ae53..7ae6fac 100644
--- a/perl/Git/SVN/Utils.pm
+++ b/perl/Git/SVN/Utils.pm
@@ -86,6 +86,27 @@ sub _collapse_dotdot {
sub canonicalize_path {
+ my $path = shift;
+
+ # The 1.7 way to do it
+ if ( defined &SVN::_Core::svn_dirent_canonicalize ) {
+ $path = _collapse_dotdot($path);
+ return SVN::_Core::svn_dirent_canonicalize($path);
+ }
+ # The 1.6 way to do it
+ elsif ( defined &SVN::_Core::svn_path_canonicalize ) {
+ $path = _collapse_dotdot($path);
+ return SVN::_Core::svn_path_canonicalize($path);
+ }
+ # No SVN API canonicalization is available, do it ourselves
+ else {
+ $path = _canonicalize_path_ourselves($path);
+ return $path;
+ }
+}
+
+
+sub _canonicalize_path_ourselves {
my ($path) = @_;
my $dot_slash_added = 0;
if (substr($path, 0, 1) ne "/") {
--
1.7.11.3
next prev parent reply other threads:[~2012-07-28 9:39 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 9:38 Canonicalize the git-svn path & url accessors Michael G. Schwern
2012-07-28 9:38 ` [PATCH 1/7] Move the canonicalization functions to Git::SVN::Utils Michael G. Schwern
2012-07-28 9:38 ` [PATCH 2/7] Change canonicalize_url() to use the SVN 1.7 API when available Michael G. Schwern
2012-07-28 13:50 ` Jonathan Nieder
2012-07-28 19:01 ` Michael G Schwern
2012-07-28 19:30 ` Jonathan Nieder
2012-07-28 19:51 ` Michael G Schwern
2012-07-28 19:57 ` Jonathan Nieder
2012-07-28 20:02 ` Jonathan Nieder
2012-07-28 20:24 ` Michael G Schwern
2012-10-14 11:42 ` [PATCH/RFC 0/2] " Jonathan Nieder
2012-10-14 11:45 ` [PATCH 1/2] git svn: do not overescape URLs (fallback case) Jonathan Nieder
2012-10-14 11:48 ` [PATCH 2/2] git svn: canonicalize_url(): use svn_path_canonicalize when available Jonathan Nieder
2012-10-23 22:58 ` Eric Wong
2012-07-28 9:38 ` [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths Michael G. Schwern
2012-07-30 19:51 ` Eric Wong
2012-07-30 20:46 ` Michael G Schwern
2012-09-26 19:45 ` Jonathan Nieder
2012-09-26 20:58 ` Eric Wong
2012-09-26 21:38 ` Jonathan Nieder
2012-09-26 21:54 ` Eric Wong
2012-09-26 22:43 ` Jonathan Nieder
2012-09-27 0:15 ` Eric Wong
2012-09-27 2:11 ` Jonathan Nieder
2012-07-28 9:38 ` [PATCH 4/7] Add join_paths() to safely concatenate paths Michael G. Schwern
2012-09-26 20:51 ` Jonathan Nieder
2012-07-28 9:38 ` [PATCH 5/7] Remove irrelevant comment Michael G. Schwern
2012-07-28 9:38 ` Michael G. Schwern [this message]
2012-07-28 13:55 ` [PATCH 6/7] Switch path canonicalization to use the SVN API Jonathan Nieder
2012-07-28 19:07 ` Michael G Schwern
2012-07-30 20:04 ` Eric Wong
2012-08-02 21:51 ` Eric Wong
2012-08-02 23:18 ` Michael G Schwern
2012-10-05 7:04 ` [PATCH] git-svn: keep leading slash when canonicalizing paths (fallback case) Jonathan Nieder
2012-10-05 23:12 ` Eric Wong
2012-10-06 5:36 ` Junio C Hamano
2012-07-28 9:38 ` [PATCH 7/7] Make Git::SVN and Git::SVN::Ra canonicalize paths and urls Michael G. Schwern
2012-07-28 14:11 ` Jonathan Nieder
2012-07-28 19:15 ` Michael G Schwern
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=1343468312-72024-7-git-send-email-schwern@pobox.com \
--to=schwern@pobox.com \
--cc=bwalton@artsci.utoronto.ca \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=normalperson@yhbt.net \
--cc=robbat2@gentoo.org \
/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).