Mercurial > hg > soundsoftware-site
diff app/models/repository/darcs.rb @ 1115:433d4f72a19b redmine-2.2
Update to Redmine SVN revision 11137 on 2.2-stable branch
author | Chris Cannam |
---|---|
date | Mon, 07 Jan 2013 12:01:42 +0000 |
parents | cbce1fd3b1b7 |
children | 51d7f3e06556 622f24f53b42 |
line wrap: on
line diff
--- a/app/models/repository/darcs.rb Wed Jun 27 14:54:18 2012 +0100 +++ b/app/models/repository/darcs.rb Mon Jan 07 12:01:42 2013 +0000 @@ -1,5 +1,5 @@ # Redmine - project management software -# Copyright (C) 2006-2011 Jean-Philippe Lang +# Copyright (C) 2006-2012 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -20,12 +20,12 @@ class Repository::Darcs < Repository validates_presence_of :url, :log_encoding - def self.human_attribute_name(attribute_key_name) - attr_name = attribute_key_name + def self.human_attribute_name(attribute_key_name, *args) + attr_name = attribute_key_name.to_s if attr_name == "url" attr_name = "path_to_repository" end - super(attr_name) + super(attr_name, *args) end def self.scm_adapter_class @@ -66,6 +66,7 @@ end end end + load_entries_changesets(entries) entries end @@ -79,7 +80,7 @@ return nil if patch_from.nil? patch_to = changesets.find_by_revision(rev_to) if rev_to if path.blank? - path = patch_from.changes.collect{|change| change.path}.join(' ') + path = patch_from.filechanges.collect{|change| change.path}.join(' ') end patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil end