From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 26 May 2011 06:15:37 +0000 (+0000)
Subject: scm: bazaar: add "scm_cmd_no_raise" method for "bzr diff".
X-Git-Tag: 1.3.0~1929
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f4ba1a708202a13577cce6efae1a5b53a4c4a615;p=redmine.git

scm: bazaar: add "scm_cmd_no_raise" method for "bzr diff".

"bzr diff" normal exit status is not 0 in Bazaar 2.0.5.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5920 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 46877ad43..39de200f3 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -281,6 +281,14 @@ module Redmine
         end
         private :scm_cmd
 
+        def scm_cmd_no_raise(*args, &block)
+          full_args = [BZR_BIN]
+          full_args += args
+          ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
+          ret
+        end
+        private :scm_cmd_no_raise
+
         def bzr_target(path)
           target(path, false)
         end