[svk-commit] r3080 - in trunk: lib/SVK t t/added t/deleted t/i18n t/mirror t/smerge
nobody at bestpractical.com
nobody at bestpractical.com
Fri Sep 5 14:05:48 EDT 2008
Author: clkao
Date: Fri Sep 5 14:05:24 2008
New Revision: 3080
Modified:
trunk/lib/SVK/Test.pm
trunk/t/01editor.t
trunk/t/07smerge-branch-renamed.t
trunk/t/07smerge-co-deleted.t
trunk/t/07smerge-copy-co.t
trunk/t/07smerge-copy-outside.t
trunk/t/07smerge-copy.t
trunk/t/07smerge-delete2.t
trunk/t/07smerge-moved.t
trunk/t/07smerge-rename.t
trunk/t/07smerge-rename5.t
trunk/t/07smerge-tags.t
trunk/t/07smerge-to-from.t
trunk/t/07smerge.t
trunk/t/09cmerge.t
trunk/t/10switch-merge-ticket.t
trunk/t/20add-filetype.t
trunk/t/20add-libmagic.t
trunk/t/20add-mmagic.t
trunk/t/20add-nomime.t
trunk/t/25log-filter.t
trunk/t/29update-merge-ticket.t
trunk/t/29update-props.t
trunk/t/added/basics.t
trunk/t/added/co-basics.t
trunk/t/copy-replace.t
trunk/t/deleted/basics.t
trunk/t/deleted/complex.t
trunk/t/deleted/copy-anchor-delete.t
trunk/t/deleted/delete-copy-anchor.t
trunk/t/diff/mixed-checkout.t
trunk/t/i18n/big5dirname.t
trunk/t/i18n/checkout.t
trunk/t/i18n/win32filename.t
trunk/t/mirror/relocate.t
trunk/t/mirror/sync-rebase-multi.t
trunk/t/mirror/sync-replaced-nocopy.t
trunk/t/mirror/sync-replaced.t
trunk/t/mirror/sync-revhole.t
trunk/t/mirror/sync-snapshot.t
trunk/t/remove-many.t
trunk/t/smerge/copy-reuse.t
trunk/t/uri-escape-dav-move.t
Log:
Allow svk test suite to be run in parallel.
Modified: trunk/lib/SVK/Test.pm
==============================================================================
--- trunk/lib/SVK/Test.pm (original)
+++ trunk/lib/SVK/Test.pm Fri Sep 5 14:05:24 2008
@@ -224,6 +224,11 @@
sub get_copath {
my ($name) = @_;
+ unless ($name) {
+ $name = lc($0);
+ $name =~ s/\.t$//;
+ $name =~ s/(\W|[_-])+//g;
+ }
my $copath = SVK::Path::Checkout->copath ('t', "checkout/$name");
mkpath [$copath] unless -d $copath;
rmtree [$copath] if -e $copath;
Modified: trunk/t/01editor.t
==============================================================================
--- trunk/t/01editor.t (original)
+++ trunk/t/01editor.t Fri Sep 5 14:05:24 2008
@@ -4,7 +4,7 @@
use SVK::Test;
our $output;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('prop');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
Modified: trunk/t/07smerge-branch-renamed.t
==============================================================================
--- trunk/t/07smerge-branch-renamed.t (original)
+++ trunk/t/07smerge-branch-renamed.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge-copy');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
my $tree = create_basic_tree ($xd, '//trunk');
$svk->cp ('-m', 'branch', '//trunk', '//local');
Modified: trunk/t/07smerge-co-deleted.t
==============================================================================
--- trunk/t/07smerge-co-deleted.t (original)
+++ trunk/t/07smerge-co-deleted.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
my $tree = create_basic_tree ($xd, '//trunk');
$svk->cp ('-m', 'branch', '//trunk', '//local');
@@ -21,12 +21,12 @@
is_output($svk, 'sm', ['-C', '//trunk', $copath],
['Auto-merging (3, 6) /trunk to /local (base /trunk:3).',
- __('U t/checkout/smerge/me'),
+ __("U $copath/me"),
qr'New merge ticket: .*:/trunk:6']
);
is_output($svk, 'sm', ['//trunk', $copath],
['Auto-merging (3, 6) /trunk to /local (base /trunk:3).',
- __('U t/checkout/smerge/me'),
+ __("U $copath/me"),
qr'New merge ticket: .*:/trunk:6']
);
Modified: trunk/t/07smerge-copy-co.t
==============================================================================
--- trunk/t/07smerge-copy-co.t (original)
+++ trunk/t/07smerge-copy-co.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge-copy-co');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
my $tree = create_basic_tree ($xd, '//trunk');
$svk->cp ('-m', 'branch', '//trunk', '//local');
Modified: trunk/t/07smerge-copy-outside.t
==============================================================================
--- trunk/t/07smerge-copy-outside.t (original)
+++ trunk/t/07smerge-copy-outside.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test('test');
our $output;
-my ($copath, $corpath) = get_copath ('smerge-copy');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-pm', 'trunk', '/test/trunk');
$svk->mkdir ('-pm', 'some other local', '//local/something/fnord');
my $tree = create_basic_tree ($xd, '/test/trunk');
Modified: trunk/t/07smerge-copy.t
==============================================================================
--- trunk/t/07smerge-copy.t (original)
+++ trunk/t/07smerge-copy.t Fri Sep 5 14:05:24 2008
@@ -8,7 +8,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge-copy');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
my $tree = create_basic_tree ($xd, '//trunk');
$svk->cp ('-m', 'branch', '//trunk', '//local');
Modified: trunk/t/07smerge-delete2.t
==============================================================================
--- trunk/t/07smerge-delete2.t (original)
+++ trunk/t/07smerge-delete2.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test();
our $output;
-our ($copath, $corpath) = get_copath ('smerge-delete');
+our ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
$svk->checkout ('//trunk', $copath);
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
Modified: trunk/t/07smerge-moved.t
==============================================================================
--- trunk/t/07smerge-moved.t (original)
+++ trunk/t/07smerge-moved.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge-moved');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
$svk->checkout ('//trunk', $copath);
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
@@ -23,7 +23,7 @@
$svk->mv ('-m', 'move foo', '//trunk/foo', '//trunk/deep/foo');
-($copath, $corpath) = get_copath ('smerge-moved');
+($copath, $corpath) = get_copath();
$svk->checkout ('//local', $copath);
is_output ($svk, 'smerge', ['//trunk', $copath],
Modified: trunk/t/07smerge-rename.t
==============================================================================
--- trunk/t/07smerge-rename.t (original)
+++ trunk/t/07smerge-rename.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge-rename');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
$svk->checkout ('//trunk', $copath);
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
@@ -75,7 +75,7 @@
'Empty merge.',
'2 conflicts found.']);
-my ($lcopath, $lcorpath) = get_copath ('smerge-moved');
+my ($lcopath, $lcorpath) = get_copath ('smerge-rename-moved');
$svk->checkout ('//local', $lcopath);
is_output ($svk, 'smerge', ['--track-rename', '//trunk', $lcopath],
['Auto-merging (2, 8) /trunk to /local (base /trunk:2).',
Modified: trunk/t/07smerge-rename5.t
==============================================================================
--- trunk/t/07smerge-rename5.t (original)
+++ trunk/t/07smerge-rename5.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/07smerge-tags.t
==============================================================================
--- trunk/t/07smerge-tags.t (original)
+++ trunk/t/07smerge-tags.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge-copy');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
$svk->cp ('-m', 'branch', '//trunk', '//branch');
my $tree = create_basic_tree ($xd, '//trunk');
Modified: trunk/t/07smerge-to-from.t
==============================================================================
--- trunk/t/07smerge-to-from.t (original)
+++ trunk/t/07smerge-to-from.t Fri Sep 5 14:05:24 2008
@@ -6,7 +6,7 @@
use SVK::Test;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('smerge-delete');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
$svk->checkout ('//trunk', $copath);
Modified: trunk/t/07smerge.t
==============================================================================
--- trunk/t/07smerge.t (original)
+++ trunk/t/07smerge.t Fri Sep 5 14:05:24 2008
@@ -10,8 +10,8 @@
my $tree = create_basic_tree ($xd, '/test/');
my $pool = SVN::Pool->new_default;
-my ($copath, $corpath) = get_copath ('smerge');
-my ($scopath, $scorpath) = get_copath ('smerge-source');
+my ($copath, $corpath) = get_copath('smerge');
+my ($scopath, $scorpath) = get_copath('smerge-source');
my ($srepospath, $spath, $srepos) = $xd->find_repos ('/test/A', 1);
my $depot = $xd->find_depot('');
Modified: trunk/t/09cmerge.t
==============================================================================
--- trunk/t/09cmerge.t (original)
+++ trunk/t/09cmerge.t Fri Sep 5 14:05:24 2008
@@ -4,7 +4,7 @@
use SVK::Test;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('cherrypicking');
+my ($copath, $corpath) = get_copath();
$svk->checkout ('//', $copath);
mkdir "$copath/trunk";
Modified: trunk/t/10switch-merge-ticket.t
==============================================================================
--- trunk/t/10switch-merge-ticket.t (original)
+++ trunk/t/10switch-merge-ticket.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
@@ -37,16 +37,16 @@
$svk->switch ('//local-another', $copath);
is_output($svk, 'diff', [$copath],
[
- __('=== t/checkout/smerge/me'),
+ __("=== $copath/me"),
'==================================================================',
- __("--- t/checkout/smerge/me\t(revision 9)"),
- __("+++ t/checkout/smerge/me\t(local)"),
+ __("--- $copath/me\t(revision 9)"),
+ __("+++ $copath/me\t(local)"),
'@@ -1,2 +1,3 @@',
' first line in me',
' 2nd line in me - mod',
'+a change',
'',
- __('Property changes on: t/checkout/smerge'),
+ __("Property changes on: $copath"),
'___________________________________________________________________',
'Name: svk:merge',
" $uuid:/local:4",
Modified: trunk/t/20add-filetype.t
==============================================================================
--- trunk/t/20add-filetype.t (original)
+++ trunk/t/20add-filetype.t Fri Sep 5 14:05:24 2008
@@ -4,7 +4,7 @@
use SVK::Test;
our $output;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('add-mime');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
Modified: trunk/t/20add-libmagic.t
==============================================================================
--- trunk/t/20add-libmagic.t (original)
+++ trunk/t/20add-libmagic.t Fri Sep 5 14:05:24 2008
@@ -4,7 +4,7 @@
use SVK::Test;
our $output;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('add-mime');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
Modified: trunk/t/20add-mmagic.t
==============================================================================
--- trunk/t/20add-mmagic.t (original)
+++ trunk/t/20add-mmagic.t Fri Sep 5 14:05:24 2008
@@ -4,7 +4,7 @@
use SVK::Test;
our $output;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('add-mime');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
Modified: trunk/t/20add-nomime.t
==============================================================================
--- trunk/t/20add-nomime.t (original)
+++ trunk/t/20add-nomime.t Fri Sep 5 14:05:24 2008
@@ -5,7 +5,7 @@
our $output;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('add-nomime');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
Modified: trunk/t/25log-filter.t
==============================================================================
--- trunk/t/25log-filter.t (original)
+++ trunk/t/25log-filter.t Fri Sep 5 14:05:24 2008
@@ -6,7 +6,7 @@
# working copy initialization
our $output;
my ($xd, $svk) = build_test('test');
-my ($copath, $corpath) = get_copath ('log-xml');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
chdir ($copath);
Modified: trunk/t/29update-merge-ticket.t
==============================================================================
--- trunk/t/29update-merge-ticket.t (original)
+++ trunk/t/29update-merge-ticket.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
@@ -32,16 +32,16 @@
$svk->up ($copath);
is_output($svk, 'diff', [$copath],
[
- __('=== t/checkout/smerge/me'),
+ __("=== $copath/me"),
'==================================================================',
- __("--- t/checkout/smerge/me\t(revision 8)"),
- __("+++ t/checkout/smerge/me\t(local)"),
+ __("--- $copath/me\t(revision 8)"),
+ __("+++ $copath/me\t(local)"),
'@@ -1,2 +1,3 @@',
' first line in me',
' 2nd line in me - mod',
'+a change',
'',
- __('Property changes on: t/checkout/smerge'),
+ __("Property changes on: $copath"),
'___________________________________________________________________',
'Name: svk:merge',
" $uuid:/local-another:7",
Modified: trunk/t/29update-props.t
==============================================================================
--- trunk/t/29update-props.t (original)
+++ trunk/t/29update-props.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
@@ -25,11 +25,11 @@
$svk->ps ('prop', 'value', "$copath/me");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
- __(" g t/checkout/smerge/me"),
+ __(" g $copath/me"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
- __( " g t/checkout/smerge/me"),
+ __( " g $copath/me"),
] );
is_output($svk, 'st', [$copath], [
] );
@@ -44,14 +44,14 @@
$svk->ps ('another-prop', 'value', "$copath/me");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
- __(" U t/checkout/smerge/me"),
+ __(" U $copath/me"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
- __(" U t/checkout/smerge/me"),
+ __(" U $copath/me"),
] );
is_output($svk, 'st', [$copath], [
- __(" M t/checkout/smerge/me"),
+ __(" M $copath/me"),
] );
is_output($svk, 'di', [$copath], [
"",
@@ -70,16 +70,16 @@
$svk->ps ('prop', 'another-value', "$copath/me");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
- __(" C t/checkout/smerge/me"),
+ __(" C $copath/me"),
"1 conflict found.",
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
- __(" C t/checkout/smerge/me"),
+ __(" C $copath/me"),
"1 conflict found.",
] );
is_output($svk, 'st', [$copath], [
- __(" C t/checkout/smerge/me"),
+ __(" C $copath/me"),
] );
# XXX: this looks wierd a littl without line endings
@@ -112,11 +112,11 @@
$svk->ps ('prop', 'value', "$copath/A");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" g t/checkout/smerge/A"),
+ __(" g $copath/A"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" g t/checkout/smerge/A"),
+ __(" g $copath/A"),
] );
is_output($svk, 'st', [$copath], [
] );
@@ -131,14 +131,14 @@
$svk->ps ('another-prop', 'value', "$copath/A");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" U t/checkout/smerge/A"),
+ __(" U $copath/A"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" U t/checkout/smerge/A"),
+ __(" U $copath/A"),
] );
is_output($svk, 'st', [$copath], [
- __(" M t/checkout/smerge/A"),
+ __(" M $copath/A"),
] );
is_output($svk, 'di', [$copath], [
"",
@@ -157,16 +157,16 @@
$svk->ps ('prop', 'another-value', "$copath/A");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" C t/checkout/smerge/A"),
+ __(" C $copath/A"),
"1 conflict found.",
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" C t/checkout/smerge/A"),
+ __(" C $copath/A"),
"1 conflict found.",
] );
is_output($svk, 'st', [$copath], [
- __(" C t/checkout/smerge/A"),
+ __(" C $copath/A"),
] );
# XXX: this looks wierd a littl without line endings
@@ -194,7 +194,7 @@
is_output($svk, 'up', ['-C', $copath], [
#XXX, TODO: why it's corpath instead copath?
"Syncing //trunk(/trunk) in $corpath to 4.",
- __(" U t/checkout/smerge/me"),
+ __(" U $copath/me"),
] );
is_output($svk, 'st', [$copath], [
] );
@@ -209,7 +209,7 @@
is_output($svk, 'up', ['-C', $copath], [
#XXX, TODO: why it's corpath instead copath?
"Syncing //trunk(/trunk) in $corpath to 5.",
- __(" U t/checkout/smerge/A"),
+ __(" U $copath/A"),
] );
is_output($svk, 'st', [$copath], [
] );
Modified: trunk/t/added/basics.t
==============================================================================
--- trunk/t/added/basics.t (original)
+++ trunk/t/added/basics.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/added/co-basics.t
==============================================================================
--- trunk/t/added/co-basics.t (original)
+++ trunk/t/added/co-basics.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/copy-replace.t
==============================================================================
--- trunk/t/copy-replace.t (original)
+++ trunk/t/copy-replace.t Fri Sep 5 14:05:24 2008
@@ -6,7 +6,7 @@
my ($xd, $svk) = build_test();
$svk->mkdir ('-pm', 'init', '//V/Y');
my $tree = create_basic_tree ($xd, '//V/Y');
-my ($copath, $corpath) = get_copath ('replaced');
+my ($copath, $corpath) = get_copath();
$svk->cp('//V/Y' => '//V/X', -m => 'Y => X');
@@ -16,7 +16,7 @@
$svk->cp('//V/X' => "$copath/Y");
is_output($svk, 'st', [$copath],
- [__('R + t/checkout/replaced/Y')]);
+ [__("R + $copath/Y")]);
$svk->ci(-m => 'go', $copath);
@@ -24,17 +24,17 @@
$svk->cp('//V/X' => "$copath/Y");
$svk->rm("$copath/Y/D");
is_output($svk, 'st', [$copath],
- [__('R + t/checkout/replaced/Y'),
- __('D + t/checkout/replaced/Y/D'),
- __('D + t/checkout/replaced/Y/D/de')]);
+ [__("R + $copath/Y"),
+ __("D + $copath/Y/D"),
+ __("D + $copath/Y/D/de")]);
append_file("$copath/Y/A/be", "bwahaha\n");
is_output($svk, 'st', [$copath],
- [__('R + t/checkout/replaced/Y'),
- __('M + t/checkout/replaced/Y/A/be'),
- __('D + t/checkout/replaced/Y/D'),
- __('D + t/checkout/replaced/Y/D/de')]);
+ [__("R + $copath/Y"),
+ __("M + $copath/Y/A/be"),
+ __("D + $copath/Y/D"),
+ __("D + $copath/Y/D/de")]);
$svk->ci(-m => 'go', $copath);
$svk->admin ('rmcache');
is_output($svk, 'st', [$copath], []);
@@ -44,5 +44,5 @@
append_file("$copath/Y/A/be", "mmmmmm\n");
is_output($svk, 'st', [$copath],
- [__('R + t/checkout/replaced/Y'),
- __('M + t/checkout/replaced/Y/A/be')]);
+ [__("R + $copath/Y"),
+ __("M + $copath/Y/A/be")]);
Modified: trunk/t/deleted/basics.t
==============================================================================
--- trunk/t/deleted/basics.t (original)
+++ trunk/t/deleted/basics.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/deleted/complex.t
==============================================================================
--- trunk/t/deleted/complex.t (original)
+++ trunk/t/deleted/complex.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/deleted/copy-anchor-delete.t
==============================================================================
--- trunk/t/deleted/copy-anchor-delete.t (original)
+++ trunk/t/deleted/copy-anchor-delete.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/deleted/delete-copy-anchor.t
==============================================================================
--- trunk/t/deleted/delete-copy-anchor.t (original)
+++ trunk/t/deleted/delete-copy-anchor.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
my ($xd, $svk) = build_test();
our $output;
-my ($copath, $corpath) = get_copath ('smerge');
+my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
Modified: trunk/t/diff/mixed-checkout.t
==============================================================================
--- trunk/t/diff/mixed-checkout.t (original)
+++ trunk/t/diff/mixed-checkout.t Fri Sep 5 14:05:24 2008
@@ -4,7 +4,7 @@
use SVK::Test;
our $output;
my ($xd, $svk) = build_test();
-my ($copath, $corpath) = get_copath ('diff');
+my ($copath, $corpath) = get_copath();
my ($repospath, undef, $repos) = $xd->find_repos ('//', 1);
$svk->checkout ('//', $copath);
chdir ($copath);
Modified: trunk/t/i18n/big5dirname.t
==============================================================================
--- trunk/t/i18n/big5dirname.t (original)
+++ trunk/t/i18n/big5dirname.t Fri Sep 5 14:05:24 2008
@@ -18,7 +18,7 @@
mkpath ["t/checkout/filenames/$big5dir"], 0, 0700 unless -d "t/checkout/filenames/$big5dir";
my ($xd, $svk) = build_test('dirname_enc');
-my ($copath, $corpath) = get_copath ("filenames/$big5dir");
+my ($copath, $corpath) = get_copath();
my ($repospath, $path, $repos) = $xd->find_repos ('/dirname_enc/', 1);
sub copath { SVK::Path::Checkout->copath($copath, @_) }
Modified: trunk/t/i18n/checkout.t
==============================================================================
--- trunk/t/i18n/checkout.t (original)
+++ trunk/t/i18n/checkout.t Fri Sep 5 14:05:24 2008
@@ -15,7 +15,7 @@
mkpath ["t/checkout/filenames"], 0, 0700 unless -d "t/checkout/filenames";
my ($xd, $svk) = build_test('filename_enc');
-my ($copath, $corpath) = get_copath ('filenames');
+my ($copath, $corpath) = get_copath();
my ($repospath, $path, $repos) = $xd->find_repos ('/filename_enc/', 1);
sub copath { SVK::Path::Checkout->copath($copath, @_) }
Modified: trunk/t/i18n/win32filename.t
==============================================================================
--- trunk/t/i18n/win32filename.t (original)
+++ trunk/t/i18n/win32filename.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
mkpath ["t/checkout/filenames"], 0, 0700 unless -d "t/checkout/filenames";
my ($xd, $svk) = build_test('filename_enc');
-my ($copath, $corpath) = get_copath ('filenames');
+my ($copath, $corpath) = get_copath();
my ($repospath, $path, $repos) = $xd->find_repos ('/filename_enc/', 1);
sub copath { SVK::Path::Checkout->copath($copath, @_) }
Modified: trunk/t/mirror/relocate.t
==============================================================================
--- trunk/t/mirror/relocate.t (original)
+++ trunk/t/mirror/relocate.t Fri Sep 5 14:05:24 2008
@@ -8,7 +8,7 @@
plan tests => 5;
my ($xd, $svk) = build_test('test', 'test2');
-my ($copath, $corpath) = get_copath ('sync-replicate');
+my ($copath, $corpath) = get_copath();
our $output;
Modified: trunk/t/mirror/sync-rebase-multi.t
==============================================================================
--- trunk/t/mirror/sync-rebase-multi.t (original)
+++ trunk/t/mirror/sync-rebase-multi.t Fri Sep 5 14:05:24 2008
@@ -15,7 +15,7 @@
$svk->cp('-m' => 'branch', '/test/foo/bar/proj/trunk' => '/test/foo/bar/proj/branches/branchA');
-my ($copath, $corpath) = get_copath ('sync-rebase-delta');
+my ($copath, $corpath) = get_copath();
$svk->mv(-m => 'move it', '/test/foo' => '/test/blah');
Modified: trunk/t/mirror/sync-replaced-nocopy.t
==============================================================================
--- trunk/t/mirror/sync-replaced-nocopy.t (original)
+++ trunk/t/mirror/sync-replaced-nocopy.t Fri Sep 5 14:05:24 2008
@@ -11,7 +11,7 @@
my $tree = create_basic_tree ($xd, '/test/');
-my ($copath, $corpath) = get_copath ('sync-replaced');
+my ($copath, $corpath) = get_copath();
$svk->checkout ('/test/', $copath);
Modified: trunk/t/mirror/sync-replaced.t
==============================================================================
--- trunk/t/mirror/sync-replaced.t (original)
+++ trunk/t/mirror/sync-replaced.t Fri Sep 5 14:05:24 2008
@@ -11,7 +11,7 @@
my $tree = create_basic_tree ($xd, '/test/');
-my ($copath, $corpath) = get_copath ('sync-replaced');
+my ($copath, $corpath) = get_copath();
$svk->checkout ('/test/', $copath);
Modified: trunk/t/mirror/sync-revhole.t
==============================================================================
--- trunk/t/mirror/sync-revhole.t (original)
+++ trunk/t/mirror/sync-revhole.t Fri Sep 5 14:05:24 2008
@@ -8,7 +8,7 @@
my ($xd, $svk) = build_test('test');
my $depot = $xd->find_depot('test');
-my ($copath, $corpath) = get_copath('sync-revhole');
+my ($copath, $corpath) = get_copath();
our $output;
my ($srepospath, $spath, $srepos) = $xd->find_repos ('/test/A', 1);
Modified: trunk/t/mirror/sync-snapshot.t
==============================================================================
--- trunk/t/mirror/sync-snapshot.t (original)
+++ trunk/t/mirror/sync-snapshot.t Fri Sep 5 14:05:24 2008
@@ -8,7 +8,7 @@
my ($xd, $svk) = build_test('test');
my $depot = $xd->find_depot('test');
-my ($copath, $corpath) = get_copath('sync-revhole');
+my ($copath, $corpath) = get_copath();
our $output;
my ($srepospath, $spath, $srepos) = $xd->find_repos ('/test/', 1);
Modified: trunk/t/remove-many.t
==============================================================================
--- trunk/t/remove-many.t (original)
+++ trunk/t/remove-many.t Fri Sep 5 14:05:24 2008
@@ -9,7 +9,7 @@
$svk->mkdir(-m => 'trunk', '/mv/T');
$svk->mkdir(-m => 'trunk', '/mv/B');
my $tree = create_basic_tree($xd, '/mv/T');
-my ($copath, $corpath) = get_copath ('moving');
+my ($copath, $corpath) = get_copath();
my $depot = $xd->find_depot('mv');
my $uri = uri($depot->repospath);
Modified: trunk/t/smerge/copy-reuse.t
==============================================================================
--- trunk/t/smerge/copy-reuse.t (original)
+++ trunk/t/smerge/copy-reuse.t Fri Sep 5 14:05:24 2008
@@ -7,7 +7,7 @@
my ($xd, $svk) = build_test('test');
our $output;
-my ($copath, $corpath) = get_copath ('smerge-copy');
+my ($copath, $corpath) = get_copath();
$svk->mkdir ('-pm', 'trunk', '/test/trunk');
$svk->mkdir ('-pm', 'some other local', '//local');
my $tree = create_basic_tree ($xd, '/test/trunk');
Modified: trunk/t/uri-escape-dav-move.t
==============================================================================
--- trunk/t/uri-escape-dav-move.t (original)
+++ trunk/t/uri-escape-dav-move.t Fri Sep 5 14:05:24 2008
@@ -104,8 +104,8 @@
$svk->copy ('-p', '-m', 'branch', '//mirror/BK', '//local/BK');
-my ($copath, $corpath) = get_copath ('uri-smerge');
-my ($scopath, $scorpath) = get_copath ('uri-smerge-source');
+my ($copath, $corpath) = get_copath('uri-escape-dav-move');
+my ($scopath, $scorpath) = get_copath('uri-escape-dav-move-source');
$svk->checkout ('//local/BK', $copath);
More information about the svk-commit
mailing list