[svk-commit] r3071 - in trunk: lib/SVK

[nobody at bestpractical.com]

Author: clsung
Date: Tue Aug 19 11:35:43 2008
New Revision: 3071

Modified:
   trunk/lib/SVK/Project.pm
   trunk/t/bm/prop-setup.t
   trunk/t/bm/push-pull.t

Log:
- fix http://task.hm/GXJX
  - should explicity specify project name when in non-wc 
- remove my bad commit for Dumper code
- also reflect the doc change for t/bm/prop-setup.t


Modified: trunk/lib/SVK/Project.pm
==============================================================================
--- trunk/lib/SVK/Project.pm	(original)
+++ trunk/lib/SVK/Project.pm	Tue Aug 19 11:35:43 2008
@@ -135,7 +135,7 @@
     my $proj;
 
     foreach my $m_path (@all_mirrors) {
-	if ($pathobj->path eq '/') { # in non-wc path
+	if ($pathobj->path eq '/' and $pname) { # in non-wc path
 	    $proj = $self->_create_from_prop($pathobj, $root, $m_path, $pname);
 	    return $proj if $proj;
 	} elsif ($pathobj->_to_pclass("/local")->subsumes($pathobj->path)) {
@@ -221,8 +221,6 @@
             path     => $path
         }
     );
-    use Data::Dumper;
-    warn Dumper $path_obj;
     $path_obj->refresh_revision;
 
     my ($project_name, $trunk_path, $branch_path, $tag_path) = 

Modified: trunk/t/bm/prop-setup.t
==============================================================================
--- trunk/t/bm/prop-setup.t	(original)
+++ trunk/t/bm/prop-setup.t	Tue Aug 19 11:35:43 2008
@@ -32,7 +32,7 @@
 chdir($copath);
 
 is_output ($svk, 'branch', ['--list', '//mirror/nomeans/A'],
-    ["Project not found. use 'svk branch --setup //mirror/nomeans/A' to initial.",
+    ["Project not found. use 'svk branch --setup //mirror/nomeans/A' to initialize.",
      "No project found."]);
 #TODO: {
 #local $TODO = 'Need to implement br --setup ';

Modified: trunk/t/bm/push-pull.t
==============================================================================
--- trunk/t/bm/push-pull.t	(original)
+++ trunk/t/bm/push-pull.t	Tue Aug 19 11:35:43 2008
@@ -38,7 +38,7 @@
 
 $svk->br('--create','lo2','--local','--project','A');
 
-$svk->br('--checkout','--local','lo2', $corpath_default);
+$svk->br('--checkout','--local','lo2', '--project','A',$corpath_default);
 
 ok (-e "$corpath_default/A/be");
 append_file ("$corpath_default/A/be", "from local branch\n");
@@ -148,12 +148,15 @@
 append_file ("$corpath_default/A/new-file", "some text\n");
 $svk->commit ('-m', 'modification to mirror', "$corpath_default");
 
+my $oldwd = Cwd::getcwd;
+chdir $corpath_default;
 #is_output ($svk, "pull", ["//local/A/lo2"], [
 is_output ($svk, "br", ['--pull', '--local', "lo2"], [
         "Auto-merging (20, 22) /m/A/trunk to /local/A/lo2 (base /m/A/trunk:20).",
         "U   A/new-file",
         "New merge ticket: $test_uuid:/A/trunk:14",
         "Committed revision 23."]);
+chdir $oldwd;
 
 #$svk->copy ('-m', '2nd branch', '//m', '//l2');
 $svk->br('--create','lo3','--local','--project','A');
@@ -179,8 +182,9 @@
 $svk->commit ('-m', 'modification to mirror', "$corpath_default");
 
 #is_output ($svk, "pull", ['--lump', "//local/A/lo2"], [
-is_output ($svk, "branch", ['--pull', '--lump', "--local", "lo2"], [
-        "Auto-merging (22, 25) /m/A/trunk to /local/A/lo2 (base /m/A/trunk:22).",
+is_output ($svk, "branch",
+       ['--pull', '--lump', "--local", "lo2", '--project', 'A'],
+       ["Auto-merging (22, 25) /m/A/trunk to /local/A/lo2 (base /m/A/trunk:22).",
         "U   A/new-file",
         "New merge ticket: $test_uuid:/A/trunk:15",
         "Committed revision 26."]);