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

[Alex M Vandiver]

The branch, master has been updated
       via  20a4e5b7b329bb1ca3e8d1c7191349ec370abb26 (commit)
       via  05978adfe9fb46a843da9f7dafa76cecff811fb3 (commit)
      from  78fbe860b1f7feb655551fda53614ea58ae8d172 (commit)

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

- Log -----------------------------------------------------------------
commit 05978adfe9fb46a843da9f7dafa76cecff811fb3
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 18 19:02:12 2009 -0500

    `git co branch .` puts the tip of the branch in the index, _not_ reverts all files

diff --git a/lib/Test/Chimps/Smoker/Git.pm b/lib/Test/Chimps/Smoker/Git.pm
index 617d5bf..1fc77f7 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 -fxdq));
-    $self->run_cmd('checkout', $self->branch, '.');
+    $self->run_cmd('checkout', 'HEAD', '.');
 }
 
 sub checkout {

commit 20a4e5b7b329bb1ca3e8d1c7191349ec370abb26
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 18 19:03:33 2009 -0500

    Make SVN's next method be quieter when it hits the end

diff --git a/lib/Test/Chimps/Smoker/SVN.pm b/lib/Test/Chimps/Smoker/SVN.pm
index ee5aad2..e72fb81 100644
--- a/lib/Test/Chimps/Smoker/SVN.pm
+++ b/lib/Test/Chimps/Smoker/SVN.pm
@@ -63,6 +63,9 @@ sub next {
     my $self = shift;
 
     my $revision = $self->revision;
+    my $info = `svn info @{[$self->uri]}`;
+    return () unless $info =~ /^Last Changed Rev: (d+)/m and $1 > $revision;
+
     my $cmd = "svn log --limit 1 -q -r ". ($revision+1) .":HEAD ". $self->uri;
     my ($next, $committer, $committed_date) = (`$cmd` =~
             m/^r([0-9]+)\s+\|\s*(.*?)\s*\|\s*([^(]*)/m);

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