[svk-commit] r2654 - in branches/bm: t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Fri Dec 21 10:23:41 2007
New Revision: 2654

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

Log:
- remove '/mirror/' from property
- preserve depotroot for bm in svk checkout 

Modified: branches/bm/lib/SVK/Command.pm
==============================================================================
--- branches/bm/lib/SVK/Command.pm	(original)
+++ branches/bm/lib/SVK/Command.pm	Fri Dec 21 10:23:41 2007
@@ -473,6 +473,7 @@
 
     # try to get prop of project first
     #
+    my ($project_depot_root) = $path =~ m{^(/[^/]*/[^/]+)/};
     $uri =~ s/\/$//;
     my $ra = SVN::Ra->new($uri);
     my %prop = %{ ($ra->get_file('',$ra->get_latest_revnum, undef))[1] };
@@ -504,7 +505,7 @@
 		qr(^\d+$)
 		));
 	    $proj_answer--;
-	    $path = $projects{$projs[$proj_answer]};
+	    $path = $project_depot_root.$projects{$projs[$proj_answer]};
 	}
     }
 

Modified: branches/bm/lib/SVK/Project.pm
==============================================================================
--- branches/bm/lib/SVK/Project.pm	(original)
+++ branches/bm/lib/SVK/Project.pm	Fri Dec 21 10:23:41 2007
@@ -133,7 +133,7 @@
     
     for my $project_name (keys %projnames)  {
 	my %props = 
-	    map { $_ => $allprops->{'svk:project:'.$project_name.':'.$_} }
+	    map { $_ => '/mirror'.$allprops->{'svk:project:'.$project_name.':'.$_} }
 		('path-trunk', 'path-branches', 'path-tags');
     
 	# only the current path matches one of the branches/trunk/tags, the project

Modified: branches/bm/t/bm/prop-autoload.t
==============================================================================
--- branches/bm/t/bm/prop-autoload.t	(original)
+++ branches/bm/t/bm/prop-autoload.t	Fri Dec 21 10:23:41 2007
@@ -17,9 +17,9 @@
 my ($copath, $corpath) = get_copath('basic-trunk');
 
 my $props = { 
-    'svk:project:projectA:path-trunk' => '/mirror/projectA/trunk',
-    'svk:project:projectA:path-branches' => '/mirror/projectA/branches',
-    'svk:project:projectA:path-tags' => '/mirror/projectA/tags',
+    'svk:project:projectA:path-trunk' => '/projectA/trunk',
+    'svk:project:projectA:path-branches' => '/projectA/branches',
+    'svk:project:projectA:path-tags' => '/projectA/tags',
 };
 
 add_prop_to_basic_tree($xd, '/test/',$props);