From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Wong Subject: Re: Fix git-svn for SVN 1.7 Date: Thu, 2 Aug 2012 21:55:44 +0000 Message-ID: <20120802215544.GA28193@dcvr.yhbt.net> References: <1343468872-72133-1-git-send-email-schwern@pobox.com> <20120802103122.GA24385@dcvr.yhbt.net> <20120802160753.GA17158@copier> <20120802205123.GA14391@dcvr.yhbt.net> <7vmx2dc7lw.fsf@alter.siamese.dyndns.org> <20120802214201.GB24385@dcvr.yhbt.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jonathan Nieder , git@vger.kernel.org, robbat2@gentoo.org, bwalton@artsci.utoronto.ca, "Michael G. Schwern" To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Aug 02 23:55:51 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sx3N0-0001i9-Ps for gcvg-git-2@plane.gmane.org; Thu, 02 Aug 2012 23:55:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753092Ab2HBVzq (ORCPT ); Thu, 2 Aug 2012 17:55:46 -0400 Received: from dcvr.yhbt.net ([64.71.152.64]:33469 "EHLO dcvr.yhbt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752217Ab2HBVzp (ORCPT ); Thu, 2 Aug 2012 17:55:45 -0400 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id B766C1F42D; Thu, 2 Aug 2012 21:55:44 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20120802214201.GB24385@dcvr.yhbt.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Eric Wong wrote: > Junio C Hamano wrote: > > Eric Wong writes: > > > 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