| @@ -1,151 +1,156 | |||
|
|
1 | 1 | # redMine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2007 Jean-Philippe Lang |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 | 8 | # |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 | 13 | # |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | require 'iconv' |
|
|
19 | 19 | |
|
|
20 | 20 | class Changeset < ActiveRecord::Base |
|
|
21 | 21 | belongs_to :repository |
|
|
22 | 22 | has_many :changes, :dependent => :delete_all |
|
|
23 | 23 | has_and_belongs_to_many :issues |
|
|
24 | 24 | |
|
|
25 | 25 | acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))}, |
|
|
26 | 26 | :description => :comments, |
|
|
27 | 27 | :datetime => :committed_on, |
|
|
28 | 28 | :author => :committer, |
|
|
29 | 29 | :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}} |
|
|
30 | 30 | |
|
|
31 | 31 | acts_as_searchable :columns => 'comments', |
|
|
32 | 32 | :include => {:repository => :project}, |
|
|
33 | 33 | :project_key => "#{Repository.table_name}.project_id", |
|
|
34 | 34 | :date_column => 'committed_on' |
|
|
35 | 35 | |
|
|
36 | 36 | acts_as_activity_provider :timestamp => "#{table_name}.committed_on", |
|
|
37 | 37 | :find_options => {:include => {:repository => :project}} |
|
|
38 | 38 | |
|
|
39 | 39 | validates_presence_of :repository_id, :revision, :committed_on, :commit_date |
|
|
40 | 40 | validates_uniqueness_of :revision, :scope => :repository_id |
|
|
41 | 41 | validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true |
|
|
42 | 42 | |
|
|
43 | 43 | def revision=(r) |
|
|
44 | 44 | write_attribute :revision, (r.nil? ? nil : r.to_s) |
|
|
45 | 45 | end |
|
|
46 | 46 | |
|
|
47 | 47 | def comments=(comment) |
|
|
48 |
write_attribute(:comments, |
|
|
|
48 | write_attribute(:comments, Changeset.normalize_comments(comment)) | |
|
|
49 | 49 | end |
|
|
50 | 50 | |
|
|
51 | 51 | def committed_on=(date) |
|
|
52 | 52 | self.commit_date = date |
|
|
53 | 53 | super |
|
|
54 | 54 | end |
|
|
55 | 55 | |
|
|
56 | 56 | def project |
|
|
57 | 57 | repository.project |
|
|
58 | 58 | end |
|
|
59 | 59 | |
|
|
60 | 60 | def after_create |
|
|
61 | 61 | scan_comment_for_issue_ids |
|
|
62 | 62 | end |
|
|
63 | 63 | require 'pp' |
|
|
64 | 64 | |
|
|
65 | 65 | def scan_comment_for_issue_ids |
|
|
66 | 66 | return if comments.blank? |
|
|
67 | 67 | # keywords used to reference issues |
|
|
68 | 68 | ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip) |
|
|
69 | 69 | # keywords used to fix issues |
|
|
70 | 70 | fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip) |
|
|
71 | 71 | # status and optional done ratio applied |
|
|
72 | 72 | fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id) |
|
|
73 | 73 | done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i |
|
|
74 | 74 | |
|
|
75 | 75 | kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|") |
|
|
76 | 76 | return if kw_regexp.blank? |
|
|
77 | 77 | |
|
|
78 | 78 | referenced_issues = [] |
|
|
79 | 79 | |
|
|
80 | 80 | if ref_keywords.delete('*') |
|
|
81 | 81 | # find any issue ID in the comments |
|
|
82 | 82 | target_issue_ids = [] |
|
|
83 | 83 | comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] } |
|
|
84 | 84 | referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids) |
|
|
85 | 85 | end |
|
|
86 | 86 | |
|
|
87 | 87 | comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match| |
|
|
88 | 88 | action = match[0] |
|
|
89 | 89 | target_issue_ids = match[1].scan(/\d+/) |
|
|
90 | 90 | target_issues = repository.project.issues.find_all_by_id(target_issue_ids) |
|
|
91 | 91 | if fix_status && fix_keywords.include?(action.downcase) |
|
|
92 | 92 | # update status of issues |
|
|
93 | 93 | logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug? |
|
|
94 | 94 | target_issues.each do |issue| |
|
|
95 | 95 | # the issue may have been updated by the closure of another one (eg. duplicate) |
|
|
96 | 96 | issue.reload |
|
|
97 | 97 | # don't change the status is the issue is closed |
|
|
98 | 98 | next if issue.status.is_closed? |
|
|
99 | 99 | user = committer_user || User.anonymous |
|
|
100 | 100 | csettext = "r#{self.revision}" |
|
|
101 | 101 | if self.scmid && (! (csettext =~ /^r[0-9]+$/)) |
|
|
102 | 102 | csettext = "commit:\"#{self.scmid}\"" |
|
|
103 | 103 | end |
|
|
104 | 104 | journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext)) |
|
|
105 | 105 | issue.status = fix_status |
|
|
106 | 106 | issue.done_ratio = done_ratio if done_ratio |
|
|
107 | 107 | issue.save |
|
|
108 | 108 | Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated') |
|
|
109 | 109 | end |
|
|
110 | 110 | end |
|
|
111 | 111 | referenced_issues += target_issues |
|
|
112 | 112 | end |
|
|
113 | 113 | |
|
|
114 | 114 | self.issues = referenced_issues.uniq |
|
|
115 | 115 | end |
|
|
116 | 116 | |
|
|
117 | 117 | # Returns the Redmine User corresponding to the committer |
|
|
118 | 118 | def committer_user |
|
|
119 | 119 | if committer && committer.strip =~ /^([^<]+)(<(.*)>)?$/ |
|
|
120 | 120 | username, email = $1.strip, $3 |
|
|
121 | 121 | u = User.find_by_login(username) |
|
|
122 | 122 | u ||= User.find_by_mail(email) unless email.blank? |
|
|
123 | 123 | u |
|
|
124 | 124 | end |
|
|
125 | 125 | end |
|
|
126 | 126 | |
|
|
127 | 127 | # Returns the previous changeset |
|
|
128 | 128 | def previous |
|
|
129 | 129 | @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC') |
|
|
130 | 130 | end |
|
|
131 | 131 | |
|
|
132 | 132 | # Returns the next changeset |
|
|
133 | 133 | def next |
|
|
134 | 134 | @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC') |
|
|
135 | 135 | end |
|
|
136 | 136 | |
|
|
137 | # Strips and reencodes a commit log before insertion into the database | |
|
|
138 | def self.normalize_comments(str) | |
|
|
139 | to_utf8(str.to_s.strip) | |
|
|
140 | end | |
|
|
141 | ||
|
|
137 | 142 | private |
|
|
138 | 143 | |
|
|
139 | def to_utf8(str) | |
|
|
144 | def self.to_utf8(str) | |
|
|
140 | 145 | return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii |
|
|
141 | 146 | encoding = Setting.commit_logs_encoding.to_s.strip |
|
|
142 | 147 | unless encoding.blank? || encoding == 'UTF-8' |
|
|
143 | 148 | begin |
|
|
144 | 149 | return Iconv.conv('UTF-8', encoding, str) |
|
|
145 | 150 | rescue Iconv::Failure |
|
|
146 | 151 | # do nothing here |
|
|
147 | 152 | end |
|
|
148 | 153 | end |
|
|
149 | 154 | str |
|
|
150 | 155 | end |
|
|
151 | 156 | end |
| @@ -1,161 +1,161 | |||
|
|
1 | 1 | # redMine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2007 Jean-Philippe Lang |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 | 8 | # |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 | 13 | # |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | require 'redmine/scm/adapters/cvs_adapter' |
|
|
19 | 19 | require 'digest/sha1' |
|
|
20 | 20 | |
|
|
21 | 21 | class Repository::Cvs < Repository |
|
|
22 | 22 | validates_presence_of :url, :root_url |
|
|
23 | 23 | |
|
|
24 | 24 | def scm_adapter |
|
|
25 | 25 | Redmine::Scm::Adapters::CvsAdapter |
|
|
26 | 26 | end |
|
|
27 | 27 | |
|
|
28 | 28 | def self.scm_name |
|
|
29 | 29 | 'CVS' |
|
|
30 | 30 | end |
|
|
31 | 31 | |
|
|
32 | 32 | def entry(path=nil, identifier=nil) |
|
|
33 | 33 | rev = identifier.nil? ? nil : changesets.find_by_revision(identifier) |
|
|
34 | 34 | scm.entry(path, rev.nil? ? nil : rev.committed_on) |
|
|
35 | 35 | end |
|
|
36 | 36 | |
|
|
37 | 37 | def entries(path=nil, identifier=nil) |
|
|
38 | 38 | rev = identifier.nil? ? nil : changesets.find_by_revision(identifier) |
|
|
39 | 39 | entries = scm.entries(path, rev.nil? ? nil : rev.committed_on) |
|
|
40 | 40 | if entries |
|
|
41 | 41 | entries.each() do |entry| |
|
|
42 | 42 | unless entry.lastrev.nil? || entry.lastrev.identifier |
|
|
43 | 43 | change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) ) |
|
|
44 | 44 | if change |
|
|
45 | 45 | entry.lastrev.identifier=change.changeset.revision |
|
|
46 | 46 | entry.lastrev.author=change.changeset.committer |
|
|
47 | 47 | entry.lastrev.revision=change.revision |
|
|
48 | 48 | entry.lastrev.branch=change.branch |
|
|
49 | 49 | end |
|
|
50 | 50 | end |
|
|
51 | 51 | end |
|
|
52 | 52 | end |
|
|
53 | 53 | entries |
|
|
54 | 54 | end |
|
|
55 | 55 | |
|
|
56 | 56 | def cat(path, identifier=nil) |
|
|
57 | 57 | rev = identifier.nil? ? nil : changesets.find_by_revision(identifier) |
|
|
58 | 58 | scm.cat(path, rev.nil? ? nil : rev.committed_on) |
|
|
59 | 59 | end |
|
|
60 | 60 | |
|
|
61 | 61 | def diff(path, rev, rev_to) |
|
|
62 | 62 | #convert rev to revision. CVS can't handle changesets here |
|
|
63 | 63 | diff=[] |
|
|
64 | 64 | changeset_from=changesets.find_by_revision(rev) |
|
|
65 | 65 | if rev_to.to_i > 0 |
|
|
66 | 66 | changeset_to=changesets.find_by_revision(rev_to) |
|
|
67 | 67 | end |
|
|
68 | 68 | changeset_from.changes.each() do |change_from| |
|
|
69 | 69 | |
|
|
70 | 70 | revision_from=nil |
|
|
71 | 71 | revision_to=nil |
|
|
72 | 72 | |
|
|
73 | 73 | revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path)) |
|
|
74 | 74 | |
|
|
75 | 75 | if revision_from |
|
|
76 | 76 | if changeset_to |
|
|
77 | 77 | changeset_to.changes.each() do |change_to| |
|
|
78 | 78 | revision_to=change_to.revision if change_to.path==change_from.path |
|
|
79 | 79 | end |
|
|
80 | 80 | end |
|
|
81 | 81 | unless revision_to |
|
|
82 | 82 | revision_to=scm.get_previous_revision(revision_from) |
|
|
83 | 83 | end |
|
|
84 | 84 | file_diff = scm.diff(change_from.path, revision_from, revision_to) |
|
|
85 | 85 | diff = diff + file_diff unless file_diff.nil? |
|
|
86 | 86 | end |
|
|
87 | 87 | end |
|
|
88 | 88 | return diff |
|
|
89 | 89 | end |
|
|
90 | 90 | |
|
|
91 | 91 | def fetch_changesets |
|
|
92 | 92 | # some nifty bits to introduce a commit-id with cvs |
|
|
93 | 93 | # natively cvs doesn't provide any kind of changesets, there is only a revision per file. |
|
|
94 | 94 | # we now take a guess using the author, the commitlog and the commit-date. |
|
|
95 | 95 | |
|
|
96 | 96 | # last one is the next step to take. the commit-date is not equal for all |
|
|
97 | 97 | # commits in one changeset. cvs update the commit-date when the *,v file was touched. so |
|
|
98 | 98 | # we use a small delta here, to merge all changes belonging to _one_ changeset |
|
|
99 | 99 | time_delta=10.seconds |
|
|
100 | 100 | |
|
|
101 | 101 | fetch_since = latest_changeset ? latest_changeset.committed_on : nil |
|
|
102 | 102 | transaction do |
|
|
103 | 103 | tmp_rev_num = 1 |
|
|
104 | 104 | scm.revisions('', fetch_since, nil, :with_paths => true) do |revision| |
|
|
105 | 105 | # only add the change to the database, if it doen't exists. the cvs log |
|
|
106 | 106 | # is not exclusive at all. |
|
|
107 | 107 | unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision]) |
|
|
108 | 108 | revision |
|
|
109 | 109 | cs = changesets.find(:first, :conditions=>{ |
|
|
110 | 110 | :committed_on=>revision.time-time_delta..revision.time+time_delta, |
|
|
111 | 111 | :committer=>revision.author, |
|
|
112 | :comments=>revision.message | |
|
|
112 | :comments=>Changeset.normalize_comments(revision.message) | |
|
|
113 | 113 | }) |
|
|
114 | 114 | |
|
|
115 | 115 | # create a new changeset.... |
|
|
116 | 116 | unless cs |
|
|
117 | 117 | # we use a temporaray revision number here (just for inserting) |
|
|
118 | 118 | # later on, we calculate a continous positive number |
|
|
119 | 119 | latest = changesets.find(:first, :order => 'id DESC') |
|
|
120 | 120 | cs = Changeset.create(:repository => self, |
|
|
121 | 121 | :revision => "_#{tmp_rev_num}", |
|
|
122 | 122 | :committer => revision.author, |
|
|
123 | 123 | :committed_on => revision.time, |
|
|
124 | 124 | :comments => revision.message) |
|
|
125 | 125 | tmp_rev_num += 1 |
|
|
126 | 126 | end |
|
|
127 | 127 | |
|
|
128 | 128 | #convert CVS-File-States to internal Action-abbrevations |
|
|
129 | 129 | #default action is (M)odified |
|
|
130 | 130 | action="M" |
|
|
131 | 131 | if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1" |
|
|
132 | 132 | action="A" #add-action always at first revision (= 1.1) |
|
|
133 | 133 | elsif revision.paths[0][:action]=="dead" |
|
|
134 | 134 | action="D" #dead-state is similar to Delete |
|
|
135 | 135 | end |
|
|
136 | 136 | |
|
|
137 | 137 | Change.create(:changeset => cs, |
|
|
138 | 138 | :action => action, |
|
|
139 | 139 | :path => scm.with_leading_slash(revision.paths[0][:path]), |
|
|
140 | 140 | :revision => revision.paths[0][:revision], |
|
|
141 | 141 | :branch => revision.paths[0][:branch] |
|
|
142 | 142 | ) |
|
|
143 | 143 | end |
|
|
144 | 144 | end |
|
|
145 | 145 | |
|
|
146 | 146 | # Renumber new changesets in chronological order |
|
|
147 | 147 | changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset| |
|
|
148 | 148 | changeset.update_attribute :revision, next_revision_number |
|
|
149 | 149 | end |
|
|
150 | 150 | end # transaction |
|
|
151 | 151 | end |
|
|
152 | 152 | |
|
|
153 | 153 | private |
|
|
154 | 154 | |
|
|
155 | 155 | # Returns the next revision number to assign to a CVS changeset |
|
|
156 | 156 | def next_revision_number |
|
|
157 | 157 | # Need to retrieve existing revision numbers to sort them as integers |
|
|
158 | 158 | @current_revision_number ||= (connection.select_values("SELECT revision FROM #{Changeset.table_name} WHERE repository_id = #{id} AND revision NOT LIKE '_%'").collect(&:to_i).max || 0) |
|
|
159 | 159 | @current_revision_number += 1 |
|
|
160 | 160 | end |
|
|
161 | 161 | end |
General Comments 0
You need to be logged in to leave comments.
Login now