diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-05-26 06:16:44 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-05-26 06:16:44 +0000 |
| commit | 4825bbd93bd52488b06196d747c0e54c13c62074 (patch) | |
| tree | 33ebcfa68f2b00bc7815319fc525bbb51cadde3d /lib/redmine/scm/adapters/bazaar_adapter.rb | |
| parent | 2598f0fdeba5434fe57b4da54f033e38618f02cc (diff) | |
| download | redmine-4825bbd93bd52488b06196d747c0e54c13c62074.tar.gz redmine-4825bbd93bd52488b06196d747c0e54c13c62074.zip | |
scm: bazaar: refactor adapter diff to use scm_cmd_no_raise().
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5923 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters/bazaar_adapter.rb')
| -rw-r--r-- | lib/redmine/scm/adapters/bazaar_adapter.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index 39de200f3..97c1e322d 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -174,14 +174,15 @@ module Redmine if identifier_from identifier_from = identifier_from.to_i end - cmd = "#{self.class.sq_bin} diff -r#{identifier_to}..#{identifier_from} #{target(path)}" diff = [] - shellout(cmd) do |io| + cmd_args = %w|diff| + cmd_args << "-r#{identifier_to}..#{identifier_from}" + cmd_args << bzr_target(path) + scm_cmd_no_raise(*cmd_args) do |io| io.each_line do |line| diff << line end end - #return nil if $? && $?.exitstatus != 0 diff end |