[svk-commit] r2899 - trunk/lib/SVK/Command

[nobody at bestpractical.com]

Author: clsung
Date: Wed May 21 03:17:50 2008
New Revision: 2899

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

Log:
- fix empty project name if we already in a project-ed repos but
  not in that project path, and we still issue a --setup
- remove extra message since there's enough info

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Wed May 21 03:17:50 2008
@@ -247,7 +247,7 @@
 	$logger->info( "I can't figure out what project you'd like to create a branch in. Please");
 	$logger->info("either run '$0 branch --create' from within an existing checkout or specify");
 	$logger->info("a project root using the --project flag");
-	die $msg;
+	exit;
     }
     return ($proj, $target, $dst);
 }
@@ -715,10 +715,11 @@
 
     my $proj = $self->load_project($self->arg_depotpath('/'.$target->depot->depotname.$preceding_path));
 
-    $project_name = $proj->in_which_project($target) if $proj;
+    my $which_project = $proj->in_which_project($target) if $proj;
 
     my $ans = 'n';
-    if ($proj && $fromProp && $project_name) {
+    if ($proj && $fromProp && $which_project) {
+	$project_name = $which_project;
 	$logger->info( loc("Project already set in properties: %1\n", $target->depotpath));
 	$ans = lc (get_prompt(
 	    loc("Is the project '%1' match? [Y/n]", $project_name)