Re: Fix git-svn for SVN 1.7

3 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: Fix git-svn for SVN 1.7

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:24

Eric Wong [off-list ref] writes:
Jonathan Nieder [off-list ref] wrote:
quoted
Thanks from me as well.  I'm still worried about whether the increased
use of canonicalize_url will introduce regressions for the existing
SVN 1.6 support, and I should have time to look it over this weekend.

The comment in canonicalize_url "There wasn't a 1.6 way to do it" is
not true.  The relevant thread on the git list had a little
conversation about keeping svn 1.4 support, but I'm not sure why
that's relevant, given that svn_canonicalize_path has worked largely
the same way starting with SVN 1.1 (and on the other hand had
significant changes in SVN 1.7).

Hopefully you've looked this over carefully already and I'm worrying
needlessly.
Thanks for reminding me, I went back to an old chroot 1.4.2 indeed
does fail canonicalization.

Will bisect and squash a fix in.
Oops; should I eject this out of next and wait for a reroll, then?

Re: Fix git-svn for SVN 1.7

From: Eric Wong <hidden>
Date: 2016-06-15 22:54:24

Junio C Hamano [off-list ref] wrote:
Eric Wong [off-list ref] writes:
quoted
Thanks for reminding me, I went back to an old chroot 1.4.2 indeed
does fail canonicalization.

Will bisect and squash a fix in.
Oops; should I eject this out of next and wait for a reroll, then?
Your call, I doubt anybody on next uses SVN 1.4.2.   Rerolling now.

Re: Fix git-svn for SVN 1.7

From: Eric Wong <hidden>
Date: 2016-06-15 22:54:24

Eric Wong [off-list ref] wrote:
Junio C Hamano [off-list ref] wrote:
quoted
Eric Wong [off-list ref] writes:
quoted
Thanks for reminding me, I went back to an old chroot 1.4.2 indeed
does fail canonicalization.

Will bisect and squash a fix in.
Oops; should I eject this out of next and wait for a reroll, then?
Your call, I doubt anybody on next uses SVN 1.4.2.   Rerolling now.
OK, rerolled with the patch in
http://mid.gmane.org/20120802215141.GA5284@dcvr.yhbt.net squashed into
[PATCH 11/20] git-svn: path canonicalization uses SVN API

The following changes since commit 05a20c87abd08441c98dfcca0606bc0f8432ab26:

  Merge git://github.com/git-l10n/git-po (2012-08-01 15:59:08 -0700)

are available in the git repository at:


  git://bogomips.org/git-svn master

for you to fetch changes up to 5eaa1fd086e826b1ac8d9346a740527edbdb3c34:

  git-svn: remove ad-hoc canonicalizations (2012-08-02 21:46:06 +0000)

----------------------------------------------------------------
Michael G. Schwern (20):
      Git::SVN: use accessors internally for path
      Git::SVN: use accessor for URLs internally
      Git::SVN::Ra: use accessor for URLs
      use Git::SVN->path accessor globally
      use Git::SVN{,::RA}->url accessor globally
      git-svn: move canonicalization to Git::SVN::Utils
      git-svn: use SVN 1.7 to canonicalize when possible
      git-svn: factor out _collapse_dotdot function
      git-svn: add join_paths() to safely concatenate paths
      Git::SVN::Utils: remove irrelevant comment
      git-svn: path canonicalization uses SVN API
      Git::SVN{,::Ra}: canonicalize earlier
      t9118: workaround inconsistency between SVN versions
      t9107: fix typo
      git-svn: attempt to mimic SVN 1.7 URL canonicalization
      git-svn: replace URL escapes with canonicalization
      git-svn: canonicalize earlier
      git-svn: introduce add_path_to_url function
      git-svn: canonicalize newly-minted URLs
      git-svn: remove ad-hoc canonicalizations

 git-svn.perl                          |  92 ++++++------------
 perl/Git/SVN.pm                       | 174 +++++++++++++++++++++------------
 perl/Git/SVN/Fetcher.pm               |   2 +-
 perl/Git/SVN/Migration.pm             |   6 +-
 perl/Git/SVN/Ra.pm                    |  92 ++++++++++--------
 perl/Git/SVN/Utils.pm                 | 176 +++++++++++++++++++++++++++++++++-
 t/Git-SVN/Utils/add_path_to_url.t     |  27 ++++++
 t/Git-SVN/Utils/canonicalize_url.t    |  26 +++++
 t/Git-SVN/Utils/collapse_dotdot.t     |  23 +++++
 t/Git-SVN/Utils/join_paths.t          |  32 +++++++
 t/t9107-git-svn-migrate.sh            |   6 +-
 t/t9118-git-svn-funky-branch-names.sh |   7 +-
 12 files changed, 489 insertions(+), 174 deletions(-)
 create mode 100644 t/Git-SVN/Utils/add_path_to_url.t
 create mode 100644 t/Git-SVN/Utils/canonicalize_url.t
 create mode 100644 t/Git-SVN/Utils/collapse_dotdot.t
 create mode 100644 t/Git-SVN/Utils/join_paths.t
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help