[Bps-public-commit] Test-Chimps-Client branch, master, updated. ffb2ae09eabf76920c4eaa1e681de8c92143a484

[Alex M Vandiver]

The branch, master has been updated
       via  ffb2ae09eabf76920c4eaa1e681de8c92143a484 (commit)
       via  61abacf1fcc9f6c923cb7fb81e17c8cec7111022 (commit)
       via  9353dea5b68991fbd6e320c8e58c5c8788f7b665 (commit)
      from  82d9f29b881911c87f378f052a8c8b14be865e14 (commit)

Summary of changes:
 lib/Test/Chimps/Smoker/Git.pm    |    4 ++--
 lib/Test/Chimps/Smoker/Source.pm |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 9353dea5b68991fbd6e320c8e58c5c8788f7b665
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Dec 16 12:39:02 2009 -0500

    Ensure that we end up back in the topmost project's word dir after do_clean

diff --git a/lib/Test/Chimps/Smoker/Source.pm b/lib/Test/Chimps/Smoker/Source.pm
index 51af660..a3cdcc4 100644
--- a/lib/Test/Chimps/Smoker/Source.pm
+++ b/lib/Test/Chimps/Smoker/Source.pm
@@ -165,6 +165,7 @@ sub do_clean {
     foreach my $dep (@{$self->dependencies}) {
         $self->smoker->source( $dep )->do_clean;
     }
+    $self->chdir;
 }
 
 sub remove_checkout {

commit 61abacf1fcc9f6c923cb7fb81e17c8cec7111022
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Dec 16 12:39:18 2009 -0500

    Clean should revert any local changes

diff --git a/lib/Test/Chimps/Smoker/Git.pm b/lib/Test/Chimps/Smoker/Git.pm
index c366815..ee1c343 100644
--- a/lib/Test/Chimps/Smoker/Git.pm
+++ b/lib/Test/Chimps/Smoker/Git.pm
@@ -68,7 +68,7 @@ sub clone {
 sub clean {
     my $self = shift;
     $self->run_cmd(qw(clean -fxd));
-    $self->run_cmd('checkout', $self->branch);
+    $self->run_cmd('checkout', $self->branch, '.');
 }
 
 sub checkout {

commit ffb2ae09eabf76920c4eaa1e681de8c92143a484
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Dec 16 12:39:39 2009 -0500

    Clean quietly

diff --git a/lib/Test/Chimps/Smoker/Git.pm b/lib/Test/Chimps/Smoker/Git.pm
index ee1c343..9f8c0f4 100644
--- a/lib/Test/Chimps/Smoker/Git.pm
+++ b/lib/Test/Chimps/Smoker/Git.pm
@@ -67,7 +67,7 @@ sub clone {
 
 sub clean {
     my $self = shift;
-    $self->run_cmd(qw(clean -fxd));
+    $self->run_cmd(qw(clean -fxdq));
     $self->run_cmd('checkout', $self->branch, '.');
 }
 

-----------------------------------------------------------------------