diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-12 20:28:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-03-12 20:28:49 +0000 |
| commit | 3a9b0988c7515371531e47f9eef9f8e60ce352aa (patch) | |
| tree | 2a2deaedbd321dcf838c631dfed357f3c1110dbe /lib/redmine/scm/adapters/darcs_adapter.rb | |
| parent | 6fcc512cb77a0851ab8c3c693fd178b564a600dd (diff) | |
| download | redmine-3a9b0988c7515371531e47f9eef9f8e60ce352aa.tar.gz redmine-3a9b0988c7515371531e47f9eef9f8e60ce352aa.zip | |
Merged Git support branch (r1200 to r1226).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1236 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters/darcs_adapter.rb')
| -rw-r--r-- | lib/redmine/scm/adapters/darcs_adapter.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb index 2955b26dc..cd8610121 100644 --- a/lib/redmine/scm/adapters/darcs_adapter.rb +++ b/lib/redmine/scm/adapters/darcs_adapter.rb @@ -102,8 +102,12 @@ module Redmine def diff(path, identifier_from, identifier_to=nil, type="inline") path = '*' if path.blank? cmd = "#{DARCS_BIN} diff --repodir #{@url}" - cmd << " --to-match \"hash #{identifier_from}\"" - cmd << " --from-match \"hash #{identifier_to}\"" if identifier_to + if identifier_to.nil? + cmd << " --match \"hash #{identifier_from}\"" + else + cmd << " --to-match \"hash #{identifier_from}\"" + cmd << " --from-match \"hash #{identifier_to}\"" + end cmd << " -u #{path}" diff = [] shellout(cmd) do |io| |