[svk-commit] r2888 - in trunk: lib/SVK/Mirror/Backend

[nobody at bestpractical.com]

Author: clsung
Date: Mon May 19 03:48:42 2008
New Revision: 2888

Modified:
   trunk/lib/SVK/Mirror/Backend/SVNRa.pm
   trunk/t/uri-escape-dav-smerge.t

Log:
- fix t/uri-escape-dav-smerge.t problem
  http://lists.bestpractical.com/pipermail/svk-users/2008-April/000230.html
- 'cos %args may contains (url => blah), which is not clear if we already
  define url => in SVN::Ra->new( ... );

Modified: trunk/lib/SVK/Mirror/Backend/SVNRa.pm
==============================================================================
--- trunk/lib/SVK/Mirror/Backend/SVNRa.pm	(original)
+++ trunk/lib/SVK/Mirror/Backend/SVNRa.pm	Mon May 19 03:48:42 2008
@@ -332,6 +332,7 @@
         }
     }
     $self->_initialize_svn;
+    $args{url} = uri_escape($args{url}) if $args{url};
     return SVN::Ra->new(
         url    => uri_escape($self->mirror->url),
         auth   => $self->_auth_baton,

Modified: trunk/t/uri-escape-dav-smerge.t
==============================================================================
--- trunk/t/uri-escape-dav-smerge.t	(original)
+++ trunk/t/uri-escape-dav-smerge.t	Mon May 19 03:48:42 2008
@@ -121,22 +121,23 @@
 $svk->sync ('//mirror/BK');
 
 is_output ($svk, 'push', ['-C'],
-    ['Auto-merging (0, 4) /local/BK to /mirror/BK (base /mirror/BK:2).',
+    ['Auto-merging (0, 5) /local/BK to /mirror/BK (base /mirror/BK:2).',
      '===> Auto-merging (0, 3) /local/BK to /mirror/BK (base /mirror/BK:2).',
      'Empty merge.',
-     '===> Auto-merging (3, 4) /local/BK to /mirror/BK (base /mirror/BK:2).',
+     '===> Auto-merging (3, 5) /local/BK to /mirror/BK (base /mirror/BK:2).',
      'U   data/N M/HOWTO.txt',
-     qr'New merge ticket: .*:/local/BK:4']);
+     qr'New merge ticket: .*:/local/BK:5']);
 
 is_output ($svk, 'push', [''],
-    ['Auto-merging (0, 4) /local/BK to /mirror/BK (base /mirror/BK:2).',
+    ['Auto-merging (0, 5) /local/BK to /mirror/BK (base /mirror/BK:2).',
      '===> Auto-merging (0, 3) /local/BK to /mirror/BK (base /mirror/BK:2).',
+     qr'Merging back to mirror source http://[^/]+/svn/B and K/A/N P1/trunk.',
      'Empty merge.',
-     '===> Auto-merging (3, 4) /local/BK to /mirror/BK (base /mirror/BK:2).',
+     '===> Auto-merging (3, 5) /local/BK to /mirror/BK (base /mirror/BK:2).',
+     qr'Merging back to mirror source http://[^/]+/svn/B and K/A/N P1/trunk.',
      'U   data/N M/HOWTO.txt',
-     qr'New merge ticket: .*:/local/BK:4']);
-
-warn $output;
-#Auto-merging (0, 4) /local/BK to /mirror/BK (base /mirror/BK:2).
-#===> Auto-merging (0, 3) /local/BK to /mirror/BK (base /mirror/BK:2).
-#Merging back to mirror source http://localhost:8529/svn/B and K/A/N P1/trunk.
+     qr'New merge ticket: .*:/local/BK:5',
+     'Merge back committed as revision 3.',
+     qr'Syncing http://[^/]+/svn/B and K/A/N P1/trunk',
+     'Retrieving log information from 3 to 3',
+     'Committed revision 6 from revision 3.']);