[Bps-public-commit] r15754 - in Shipwright/trunk: lib/Shipwright/Backend lib/Shipwright/Script

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Sep  4 06:01:46 2008
New Revision: 15754

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Backend/SVK.pm
   Shipwright/trunk/lib/Shipwright/Backend/SVN.pm
   Shipwright/trunk/lib/Shipwright/Script/Import.pm

Log:
 r16433 at sunnavys-mb:  sunnavy | 2008-09-04 17:46:11 +0800
 merged 16398 to trunk


Modified: Shipwright/trunk/lib/Shipwright/Backend/SVK.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Backend/SVK.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Backend/SVK.pm	Thu Sep  4 06:01:46 2008
@@ -140,7 +140,7 @@
     elsif ( $type eq 'delete' ) {
         @cmd = [
             'svk', 'delete', '-m',
-            q{'} . 'delete repository' . q{'},
+            'delete repository',
             $self->repository . $args{path},
         ];
     }
@@ -149,7 +149,7 @@
             'svk',
             'move',
             '-m',
-            q{'} . "move $args{path} to $args{new_path}" . q{'},
+            "move $args{path} to $args{new_path}",
             $self->repository . $args{path},
             $self->repository . $args{new_path}
         ];

Modified: Shipwright/trunk/lib/Shipwright/Backend/SVN.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Backend/SVN.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Backend/SVN.pm	Thu Sep  4 06:01:46 2008
@@ -8,7 +8,7 @@
 use File::Temp qw/tempdir/;
 use File::Copy qw/copy/;
 
-our %REQUIRE_OPTIONS = ( import => [qw/source/], );
+our %REQUIRE_OPTIONS = ( import => [qw/source/] );
 
 use base qw/Shipwright::Backend::Base/;
 
@@ -37,8 +37,8 @@
     $self->delete;    # clean repository in case it exists
     $self->import(
         source      => $dir,
-        comment     => 'create project',
         _initialize => 1,
+        comment     => 'created project',
     );
 
 }
@@ -80,13 +80,13 @@
             @cmd = [
                 'svn',         'import',
                 $args{source}, $self->repository,
-                '-m',          $args{comment}
+                '-m',          $args{comment},
             ];
         }
         elsif ( $args{_extra_tests} ) {
             @cmd = [
                 'svn',         'import',
-                $args{source}, $self->repository . 't/extra',
+                $args{source}, $self->repository . '/t/extra',
                 '-m',          $args{comment},
             ];
         }
@@ -133,8 +133,8 @@
     elsif ( $type eq 'delete' ) {
         @cmd = [
             'svn', 'delete', '-m',
-            q{'} . 'delete' . $args{path} . q{'},
-            $self->repository . $args{path}
+            'delete ' . $args{path},
+            $self->repository . $args{path},
         ];
     }
     elsif ( $type eq 'move' ) {
@@ -142,7 +142,7 @@
             'svn',
             'move',
             '-m',
-            q{'} . "move $args{path} to $args{new_path}" . q{'},
+            "move $args{path} to $args{new_path}",
             $self->repository . $args{path},
             $self->repository . $args{new_path}
         ];

Modified: Shipwright/trunk/lib/Shipwright/Script/Import.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Script/Import.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Script/Import.pm	Thu Sep  4 06:01:46 2008
@@ -176,7 +176,7 @@
 
         $shipwright->backend->import(
             source       => $source,
-            comment      => 'import scripts for' . $source,
+            comment      => 'import scripts for ' . $source,
             build_script => $script_dir,
             overwrite    => 1,
         );
@@ -282,7 +282,7 @@
                     );
                     $shipwright->backend->import(
                         source       => $s,
-                        comment      => 'import scripts for' . $s,
+                        comment      => 'import scripts for ' . $s,
                         build_script => $script_dir,
                         overwrite    => $self->overwrite,
                     );