[svk-commit] r3069 - in trunk/lib/SVK: .

[nobody at bestpractical.com]

Author: clsung
Date: Tue Aug 19 10:59:08 2008
New Revision: 3069

Modified:
   trunk/lib/SVK/Command/Branch.pm
   trunk/lib/SVK/Project.pm

Log:
- fix #GXJX, part I
  - when specify --project in a non-br-wc, it will try to 
    get the first matched project w/o considering the pname

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Tue Aug 19 10:59:08 2008
@@ -118,7 +118,7 @@
     my $proj = SVK::Project->create_from_prop($target, $self->{project});
     $fromProp = 1 if $proj;
     $proj ||= SVK::Project->create_from_path(
-	    $target->depot, $target->path );
+	    $target->depot, $target->path, $self->{project});
     return $proj if $proj;
 
     return if $self->{setup};

Modified: trunk/lib/SVK/Project.pm
==============================================================================
--- trunk/lib/SVK/Project.pm	(original)
+++ trunk/lib/SVK/Project.pm	Tue Aug 19 10:59:08 2008
@@ -213,7 +213,7 @@
 }
 
 sub create_from_path {
-    my ($self, $depot, $path) = @_;
+    my ($self, $depot, $path, $pname) = @_;
     my $rev = undef;
 
     my $path_obj = SVK::Path->real_new(
@@ -221,12 +221,15 @@
             path     => $path
         }
     );
+    use Data::Dumper;
+    warn Dumper $path_obj;
     $path_obj->refresh_revision;
 
     my ($project_name, $trunk_path, $branch_path, $tag_path) = 
 	$self->_find_project_path($path_obj);
 
     return undef unless $project_name;
+#    return undef if $pname and $pname ne $project_name;
     return SVK::Project->new(
 	{   
 	    name            => $project_name,