Chris@0
|
1 # Redmine - project management software
|
Chris@1115
|
2 # Copyright (C) 2006-2012 Jean-Philippe Lang
|
Chris@0
|
3 #
|
Chris@0
|
4 # This program is free software; you can redistribute it and/or
|
Chris@0
|
5 # modify it under the terms of the GNU General Public License
|
Chris@0
|
6 # as published by the Free Software Foundation; either version 2
|
Chris@0
|
7 # of the License, or (at your option) any later version.
|
Chris@441
|
8 #
|
Chris@0
|
9 # This program is distributed in the hope that it will be useful,
|
Chris@0
|
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
|
Chris@0
|
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
Chris@0
|
12 # GNU General Public License for more details.
|
Chris@441
|
13 #
|
Chris@0
|
14 # You should have received a copy of the GNU General Public License
|
Chris@0
|
15 # along with this program; if not, write to the Free Software
|
Chris@0
|
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
Chris@0
|
17
|
Chris@0
|
18 require 'iconv'
|
Chris@0
|
19
|
Chris@0
|
20 class Changeset < ActiveRecord::Base
|
Chris@0
|
21 belongs_to :repository
|
Chris@0
|
22 belongs_to :user
|
Chris@1115
|
23 has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
|
Chris@0
|
24 has_and_belongs_to_many :issues
|
Chris@909
|
25 has_and_belongs_to_many :parents,
|
Chris@909
|
26 :class_name => "Changeset",
|
Chris@909
|
27 :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
|
Chris@909
|
28 :association_foreign_key => 'parent_id', :foreign_key => 'changeset_id'
|
Chris@909
|
29 has_and_belongs_to_many :children,
|
Chris@909
|
30 :class_name => "Changeset",
|
Chris@909
|
31 :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
|
Chris@909
|
32 :association_foreign_key => 'changeset_id', :foreign_key => 'parent_id'
|
Chris@0
|
33
|
Chris@1115
|
34 acts_as_event :title => Proc.new {|o| o.title},
|
Chris@0
|
35 :description => :long_comments,
|
Chris@0
|
36 :datetime => :committed_on,
|
Chris@1115
|
37 :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
|
Chris@441
|
38
|
Chris@0
|
39 acts_as_searchable :columns => 'comments',
|
Chris@0
|
40 :include => {:repository => :project},
|
Chris@0
|
41 :project_key => "#{Repository.table_name}.project_id",
|
Chris@0
|
42 :date_column => 'committed_on'
|
Chris@441
|
43
|
Chris@0
|
44 acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
|
Chris@0
|
45 :author_key => :user_id,
|
Chris@0
|
46 :find_options => {:include => [:user, {:repository => :project}]}
|
Chris@441
|
47
|
Chris@0
|
48 validates_presence_of :repository_id, :revision, :committed_on, :commit_date
|
Chris@0
|
49 validates_uniqueness_of :revision, :scope => :repository_id
|
Chris@0
|
50 validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
|
Chris@441
|
51
|
Chris@1115
|
52 scope :visible,
|
Chris@1115
|
53 lambda {|*args| { :include => {:repository => :project},
|
Chris@441
|
54 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args) } }
|
Chris@441
|
55
|
Chris@909
|
56 after_create :scan_for_issues
|
Chris@909
|
57 before_create :before_create_cs
|
Chris@909
|
58
|
Chris@0
|
59 def revision=(r)
|
Chris@0
|
60 write_attribute :revision, (r.nil? ? nil : r.to_s)
|
Chris@0
|
61 end
|
Chris@119
|
62
|
Chris@119
|
63 # Returns the identifier of this changeset; depending on repository backends
|
Chris@119
|
64 def identifier
|
Chris@119
|
65 if repository.class.respond_to? :changeset_identifier
|
Chris@119
|
66 repository.class.changeset_identifier self
|
Chris@119
|
67 else
|
Chris@119
|
68 revision.to_s
|
Chris@119
|
69 end
|
Chris@119
|
70 end
|
Chris@0
|
71
|
Chris@0
|
72 def committed_on=(date)
|
Chris@0
|
73 self.commit_date = date
|
Chris@0
|
74 super
|
Chris@0
|
75 end
|
Chris@119
|
76
|
Chris@119
|
77 # Returns the readable identifier
|
Chris@119
|
78 def format_identifier
|
Chris@119
|
79 if repository.class.respond_to? :format_changeset_identifier
|
Chris@119
|
80 repository.class.format_changeset_identifier self
|
Chris@119
|
81 else
|
Chris@119
|
82 identifier
|
Chris@119
|
83 end
|
Chris@119
|
84 end
|
Chris@441
|
85
|
Chris@0
|
86 def project
|
Chris@0
|
87 repository.project
|
Chris@0
|
88 end
|
Chris@441
|
89
|
Chris@0
|
90 def author
|
Chris@0
|
91 user || committer.to_s.split('<').first
|
Chris@0
|
92 end
|
Chris@441
|
93
|
Chris@909
|
94 def before_create_cs
|
Chris@245
|
95 self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
|
Chris@441
|
96 self.comments = self.class.normalize_comments(
|
Chris@441
|
97 self.comments, repository.repo_log_encoding)
|
Chris@245
|
98 self.user = repository.find_committer_user(self.committer)
|
Chris@0
|
99 end
|
Chris@245
|
100
|
Chris@909
|
101 def scan_for_issues
|
Chris@0
|
102 scan_comment_for_issue_ids
|
Chris@0
|
103 end
|
Chris@441
|
104
|
Chris@119
|
105 TIMELOG_RE = /
|
Chris@119
|
106 (
|
Chris@245
|
107 ((\d+)(h|hours?))((\d+)(m|min)?)?
|
Chris@245
|
108 |
|
Chris@245
|
109 ((\d+)(h|hours?|m|min))
|
Chris@119
|
110 |
|
Chris@119
|
111 (\d+):(\d+)
|
Chris@119
|
112 |
|
Chris@245
|
113 (\d+([\.,]\d+)?)h?
|
Chris@119
|
114 )
|
Chris@119
|
115 /x
|
Chris@441
|
116
|
Chris@0
|
117 def scan_comment_for_issue_ids
|
Chris@0
|
118 return if comments.blank?
|
Chris@0
|
119 # keywords used to reference issues
|
Chris@0
|
120 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
|
Chris@119
|
121 ref_keywords_any = ref_keywords.delete('*')
|
Chris@0
|
122 # keywords used to fix issues
|
Chris@0
|
123 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
|
Chris@441
|
124
|
Chris@0
|
125 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
|
Chris@441
|
126
|
Chris@0
|
127 referenced_issues = []
|
Chris@441
|
128
|
Chris@119
|
129 comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
|
Chris@119
|
130 action, refs = match[2], match[3]
|
Chris@119
|
131 next unless action.present? || ref_keywords_any
|
Chris@441
|
132
|
Chris@119
|
133 refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
|
Chris@119
|
134 issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
|
Chris@119
|
135 if issue
|
Chris@119
|
136 referenced_issues << issue
|
Chris@119
|
137 fix_issue(issue) if fix_keywords.include?(action.to_s.downcase)
|
Chris@119
|
138 log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
|
Chris@0
|
139 end
|
Chris@0
|
140 end
|
Chris@0
|
141 end
|
Chris@441
|
142
|
Chris@0
|
143 referenced_issues.uniq!
|
Chris@0
|
144 self.issues = referenced_issues unless referenced_issues.empty?
|
Chris@0
|
145 end
|
Chris@441
|
146
|
Chris@0
|
147 def short_comments
|
Chris@0
|
148 @short_comments || split_comments.first
|
Chris@0
|
149 end
|
Chris@441
|
150
|
Chris@0
|
151 def long_comments
|
Chris@0
|
152 @long_comments || split_comments.last
|
Chris@0
|
153 end
|
Chris@119
|
154
|
Chris@929
|
155 def text_tag(ref_project=nil)
|
Chris@929
|
156 tag = if scmid?
|
Chris@119
|
157 "commit:#{scmid}"
|
Chris@119
|
158 else
|
Chris@119
|
159 "r#{revision}"
|
Chris@119
|
160 end
|
Chris@1115
|
161 if repository && repository.identifier.present?
|
Chris@1115
|
162 tag = "#{repository.identifier}|#{tag}"
|
Chris@1115
|
163 end
|
Chris@929
|
164 if ref_project && project && ref_project != project
|
Chris@1115
|
165 tag = "#{project.identifier}:#{tag}"
|
Chris@929
|
166 end
|
Chris@929
|
167 tag
|
Chris@119
|
168 end
|
Chris@441
|
169
|
Chris@1115
|
170 # Returns the title used for the changeset in the activity/search results
|
Chris@1115
|
171 def title
|
Chris@1115
|
172 repo = (repository && repository.identifier.present?) ? " (#{repository.identifier})" : ''
|
Chris@1115
|
173 comm = short_comments.blank? ? '' : (': ' + short_comments)
|
Chris@1115
|
174 "#{l(:label_revision)} #{format_identifier}#{repo}#{comm}"
|
Chris@1115
|
175 end
|
Chris@1115
|
176
|
Chris@0
|
177 # Returns the previous changeset
|
Chris@0
|
178 def previous
|
Chris@1115
|
179 @previous ||= Changeset.where(["id < ? AND repository_id = ?", id, repository_id]).order('id DESC').first
|
Chris@0
|
180 end
|
Chris@0
|
181
|
Chris@0
|
182 # Returns the next changeset
|
Chris@0
|
183 def next
|
Chris@1115
|
184 @next ||= Changeset.where(["id > ? AND repository_id = ?", id, repository_id]).order('id ASC').first
|
Chris@0
|
185 end
|
Chris@441
|
186
|
Chris@0
|
187 # Creates a new Change from it's common parameters
|
Chris@0
|
188 def create_change(change)
|
Chris@441
|
189 Change.create(:changeset => self,
|
Chris@441
|
190 :action => change[:action],
|
Chris@441
|
191 :path => change[:path],
|
Chris@441
|
192 :from_path => change[:from_path],
|
Chris@0
|
193 :from_revision => change[:from_revision])
|
Chris@0
|
194 end
|
Chris@245
|
195
|
Chris@119
|
196 # Finds an issue that can be referenced by the commit message
|
Chris@119
|
197 def find_referenced_issue_by_id(id)
|
Chris@119
|
198 return nil if id.blank?
|
Chris@119
|
199 issue = Issue.find_by_id(id.to_i, :include => :project)
|
Chris@1115
|
200 if Setting.commit_cross_project_ref?
|
Chris@1115
|
201 # all issues can be referenced/fixed
|
Chris@1115
|
202 elsif issue
|
Chris@1115
|
203 # issue that belong to the repository project, a subproject or a parent project only
|
Chris@441
|
204 unless issue.project &&
|
Chris@441
|
205 (project == issue.project || project.is_ancestor_of?(issue.project) ||
|
Chris@441
|
206 project.is_descendant_of?(issue.project))
|
Chris@119
|
207 issue = nil
|
Chris@119
|
208 end
|
Chris@119
|
209 end
|
Chris@119
|
210 issue
|
Chris@119
|
211 end
|
Chris@441
|
212
|
Chris@1115
|
213 private
|
Chris@1115
|
214
|
Chris@119
|
215 def fix_issue(issue)
|
Chris@119
|
216 status = IssueStatus.find_by_id(Setting.commit_fix_status_id.to_i)
|
Chris@119
|
217 if status.nil?
|
Chris@909
|
218 logger.warn("No status matches commit_fix_status_id setting (#{Setting.commit_fix_status_id})") if logger
|
Chris@119
|
219 return issue
|
Chris@119
|
220 end
|
Chris@441
|
221
|
Chris@119
|
222 # the issue may have been updated by the closure of another one (eg. duplicate)
|
Chris@119
|
223 issue.reload
|
Chris@119
|
224 # don't change the status is the issue is closed
|
Chris@119
|
225 return if issue.status && issue.status.is_closed?
|
Chris@441
|
226
|
Chris@929
|
227 journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag(issue.project)))
|
Chris@119
|
228 issue.status = status
|
Chris@119
|
229 unless Setting.commit_fix_done_ratio.blank?
|
Chris@119
|
230 issue.done_ratio = Setting.commit_fix_done_ratio.to_i
|
Chris@119
|
231 end
|
Chris@119
|
232 Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
|
Chris@119
|
233 { :changeset => self, :issue => issue })
|
Chris@119
|
234 unless issue.save
|
Chris@119
|
235 logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
|
Chris@119
|
236 end
|
Chris@119
|
237 issue
|
Chris@119
|
238 end
|
Chris@441
|
239
|
Chris@119
|
240 def log_time(issue, hours)
|
Chris@119
|
241 time_entry = TimeEntry.new(
|
Chris@119
|
242 :user => user,
|
Chris@119
|
243 :hours => hours,
|
Chris@119
|
244 :issue => issue,
|
Chris@119
|
245 :spent_on => commit_date,
|
Chris@929
|
246 :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
|
Chris@441
|
247 :locale => Setting.default_language)
|
Chris@119
|
248 )
|
Chris@119
|
249 time_entry.activity = log_time_activity unless log_time_activity.nil?
|
Chris@441
|
250
|
Chris@119
|
251 unless time_entry.save
|
Chris@119
|
252 logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
|
Chris@119
|
253 end
|
Chris@119
|
254 time_entry
|
Chris@119
|
255 end
|
Chris@441
|
256
|
Chris@119
|
257 def log_time_activity
|
Chris@119
|
258 if Setting.commit_logtime_activity_id.to_i > 0
|
Chris@119
|
259 TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
|
Chris@119
|
260 end
|
Chris@0
|
261 end
|
Chris@441
|
262
|
Chris@0
|
263 def split_comments
|
Chris@0
|
264 comments =~ /\A(.+?)\r?\n(.*)$/m
|
Chris@0
|
265 @short_comments = $1 || comments
|
Chris@0
|
266 @long_comments = $2.to_s.strip
|
Chris@0
|
267 return @short_comments, @long_comments
|
Chris@0
|
268 end
|
Chris@0
|
269
|
Chris@245
|
270 public
|
Chris@119
|
271
|
Chris@245
|
272 # Strips and reencodes a commit log before insertion into the database
|
Chris@245
|
273 def self.normalize_comments(str, encoding)
|
Chris@245
|
274 Changeset.to_utf8(str.to_s.strip, encoding)
|
Chris@245
|
275 end
|
Chris@245
|
276
|
Chris@245
|
277 def self.to_utf8(str, encoding)
|
Chris@909
|
278 Redmine::CodesetUtil.to_utf8(str, encoding)
|
Chris@0
|
279 end
|
Chris@0
|
280 end
|