comparison app/models/repository/bazaar.rb @ 1464:261b3d9a4903 redmine-2.4

Update to Redmine 2.4 branch rev 12663
author Chris Cannam
date Tue, 14 Jan 2014 14:37:42 +0000
parents 433d4f72a19b
children 51364c0cd58f e248c7af89ec
comparison
equal deleted inserted replaced
1296:038ba2d95de8 1464:261b3d9a4903
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
66 # Set the filesize unless browsing a specific revision 66 # Set the filesize unless browsing a specific revision
67 if identifier.nil? && e.is_file? 67 if identifier.nil? && e.is_file?
68 full_path = File.join(root_url, e.path) 68 full_path = File.join(root_url, e.path)
69 e.size = File.stat(full_path).size if File.file?(full_path) 69 e.size = File.stat(full_path).size if File.file?(full_path)
70 end 70 end
71 c = Change.find( 71 c = Change.
72 :first, 72 includes(:changeset).
73 :include => :changeset, 73 where("#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", e.lastrev.revision, id).
74 :conditions => [ 74 order("#{Changeset.table_name}.revision DESC").
75 "#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", 75 first
76 e.lastrev.revision,
77 id
78 ],
79 :order => "#{Changeset.table_name}.revision DESC")
80 if c 76 if c
81 e.lastrev.identifier = c.changeset.revision 77 e.lastrev.identifier = c.changeset.revision
82 e.lastrev.name = c.changeset.revision 78 e.lastrev.name = c.changeset.revision
83 e.lastrev.author = c.changeset.committer 79 e.lastrev.author = c.changeset.committer
84 end 80 end