[svk-commit] r2932 - in trunk: lib/SVK t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Wed Jun 25 04:22:46 2008
New Revision: 2932

Modified:
   trunk/lib/SVK/Command/Branch.pm
   trunk/lib/SVK/Project.pm
   trunk/t/bm/prop-autoload.t

Log:
- fix the issue
  clkao> cls_bsd: i found if i have a full mirror on root ( /svn/ mirrors the svn repository)
  clkao> it doesn't read the (auto) project info correctly
  clkao> svk br --ls /svn/trunk is supposed to work, without explicit project, right?
- also prove 'ls' for 'list'

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Wed Jun 25 04:22:46 2008
@@ -64,7 +64,7 @@
 my @SUBCOMMANDS = qw(merge move push remove|rm|del|delete checkout|co create diff info setup online offline);
 
 sub options {
-    ('l|list'           => 'list',
+    ('l|list|ls'        => 'list',
      'C|check-only'     => 'check_only',
      'P|patch=s'        => 'patch',
      'all'              => 'all',

Modified: trunk/lib/SVK/Project.pm
==============================================================================
--- trunk/lib/SVK/Project.pm	(original)
+++ trunk/lib/SVK/Project.pm	Wed Jun 25 04:22:46 2008
@@ -131,10 +131,9 @@
     my $fs              = $pathobj->depot->repos->fs;
     my $root            = $fs->revision_root( $fs->youngest_rev );
     my @all_mirrors     = split "\n", $root->node_prop('/','svm:mirror') || '';
-    my $prop_path = '/';
+    my $prop_path = '';
     my $proj;
 
-    return unless $pathobj->path ne '/' or $pname;
     foreach my $m_path (@all_mirrors) {
 	if ($pathobj->path eq '/') { # in non-wc path
 	    $proj = $self->_create_from_prop($pathobj, $root, $m_path, $pname);

Modified: trunk/t/bm/prop-autoload.t
==============================================================================
--- trunk/t/bm/prop-autoload.t	(original)
+++ trunk/t/bm/prop-autoload.t	Wed Jun 25 04:22:46 2008
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
 use strict;
 use SVK::Test;
-plan tests => 3;
+plan tests => 4;
 our $output;
 
-my ($xd, $svk) = build_test('test');
+my ($xd, $svk) = build_test('test','rootProject');
 
 $svk->mkdir(-m => 'trunk', '/test/trunk');
 $svk->mkdir(-m => 'trunk', '/test/branches');
@@ -34,17 +34,14 @@
 
 $svk->mirror('--detach', '//mirror/MyProject');
 
-TODO: {
-local $TODO = "path properties are relative to the mirror root";
-$answer = ['','','y','1', ''];
-$svk->checkout($uri,$copath);
-
-chdir($copath);
+$svk->mirror('/rootProject/', $uri);
+$svk->sync('/rootProject/');
 is_output ($svk, 'propget',
-    ['svk:project:projectA:path-trunk', '//mirror/projectA'],
+    ['svk:project:projectA:path-trunk', '/rootProject/'],
     [$props->{'svk:project:projectA:path-trunk'}]);
 
-# currently core dump, after TODO implemented, remove the following #
-#is_output ($svk, 'branch', ['--list','//mirror/projectA'], ['Foo']);
+is_output ($svk, 'branch', ['--list','/rootProject/'], ['Foo']);
+$svk->checkout('/rootProject/',$copath);
+
+chdir($copath);
 is_output ($svk, 'branch', ['--list'], ['Foo']);
-}