From 76998ddf52df2e426dfa0b228b6fa80b3a3f742c Mon Sep 17 00:00:00 2001 From: Alex Speller Date: Fri, 10 Jun 2011 14:29:24 +0100 Subject: [PATCH 1/3] fix namespace issue --- config/initializers/capistrano_namespace_rake_fix.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/initializers/capistrano_namespace_rake_fix.rb b/config/initializers/capistrano_namespace_rake_fix.rb index 5f72b1599..a50d046d5 100644 --- a/config/initializers/capistrano_namespace_rake_fix.rb +++ b/config/initializers/capistrano_namespace_rake_fix.rb @@ -1,2 +1,5 @@ # see http://groups.google.com/group/capistrano/browse_thread/thread/b5e11c0ebf37a8be -Capistrano::Configuration::Namespaces::Namespace.class_eval { undef :symlink } \ No newline at end of file +Capistrano::Configuration::Namespaces::Namespace.class_eval do + undef :symlink + undef :install +end \ No newline at end of file From 27a358916a9434254698f58340b6c0cc8b09e7d7 Mon Sep 17 00:00:00 2001 From: Alex Speller Date: Thu, 9 Jun 2011 14:44:14 +0100 Subject: [PATCH 2/3] Fix bug with private method being called --- lib/webistrano/deployer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/webistrano/deployer.rb b/lib/webistrano/deployer.rb index 327ef6945..3dc807441 100644 --- a/lib/webistrano/deployer.rb +++ b/lib/webistrano/deployer.rb @@ -22,7 +22,7 @@ def initialize(deployment) @deployment = deployment - if(@deployment.task && !@deployment.new_record?) + if(@deployment.send(:task) && !@deployment.new_record?) # a read deployment @logger = Webistrano::Logger.new(deployment) @logger.level = Webistrano::Logger::TRACE From 1f2b6b1938ff18d520ad34b7f80e24a119b8ec01 Mon Sep 17 00:00:00 2001 From: Alex Speller Date: Fri, 10 Jun 2011 14:31:17 +0100 Subject: [PATCH 3/3] Deployer shouldn't do a local query with mercurial eiter --- lib/webistrano/deployer.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/webistrano/deployer.rb b/lib/webistrano/deployer.rb index 3dc807441..bb9e28f17 100644 --- a/lib/webistrano/deployer.rb +++ b/lib/webistrano/deployer.rb @@ -63,8 +63,12 @@ def execute! set_webistrano_logger(config) set_up_config(config) - - exchange_real_revision(config) unless (config.fetch(:scm).to_s == 'git') # git cannot do a local query by default + + # git and mercurial cannot do a local query by default + unless %w(git mercurial).include? config.fetch(:scm).to_s + exchange_real_revision(config) + end + save_revision(config) save_pid