| @@ -1,220 +1,213 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2015 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, :log_encoding |
|
|
23 | 23 | |
|
|
24 | 24 | safe_attributes 'root_url', |
|
|
25 | 25 | :if => lambda {|repository, user| repository.new_record?} |
|
|
26 | 26 | |
|
|
27 | 27 | def self.human_attribute_name(attribute_key_name, *args) |
|
|
28 | 28 | attr_name = attribute_key_name.to_s |
|
|
29 | 29 | if attr_name == "root_url" |
|
|
30 | 30 | attr_name = "cvsroot" |
|
|
31 | 31 | elsif attr_name == "url" |
|
|
32 | 32 | attr_name = "cvs_module" |
|
|
33 | 33 | end |
|
|
34 | 34 | super(attr_name, *args) |
|
|
35 | 35 | end |
|
|
36 | 36 | |
|
|
37 | 37 | def self.scm_adapter_class |
|
|
38 | 38 | Redmine::Scm::Adapters::CvsAdapter |
|
|
39 | 39 | end |
|
|
40 | 40 | |
|
|
41 | 41 | def self.scm_name |
|
|
42 | 42 | 'CVS' |
|
|
43 | 43 | end |
|
|
44 | 44 | |
|
|
45 | 45 | def entry(path=nil, identifier=nil) |
|
|
46 | 46 | rev = identifier.nil? ? nil : changesets.find_by_revision(identifier) |
|
|
47 | 47 | scm.entry(path, rev.nil? ? nil : rev.committed_on) |
|
|
48 | 48 | end |
|
|
49 | 49 | |
|
|
50 | 50 | def scm_entries(path=nil, identifier=nil) |
|
|
51 | 51 | rev = nil |
|
|
52 | 52 | if ! identifier.nil? |
|
|
53 | 53 | rev = changesets.find_by_revision(identifier) |
|
|
54 | 54 | return nil if rev.nil? |
|
|
55 | 55 | end |
|
|
56 | 56 | entries = scm.entries(path, rev.nil? ? nil : rev.committed_on) |
|
|
57 | 57 | if entries |
|
|
58 | 58 | entries.each() do |entry| |
|
|
59 | 59 | if ( ! entry.lastrev.nil? ) && ( ! entry.lastrev.revision.nil? ) |
|
|
60 | if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i && | |
|
|
61 | Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 2 && | |
|
|
62 | Rails::VERSION::TINY == 0 | |
|
|
63 | change_rev = filechanges.where(:revision => entry.lastrev.revision) | |
|
|
64 | change = change_rev.find { |c| c.path == scm.with_leading_slash(entry.path) } | |
|
|
65 | else | |
|
|
66 | change = filechanges.where( | |
|
|
67 | :revision => entry.lastrev.revision, | |
|
|
68 | :path => scm.with_leading_slash(entry.path)).first | |
|
|
69 | end | |
|
|
60 | change = filechanges.find_by_revision_and_path( | |
|
|
61 | entry.lastrev.revision, | |
|
|
62 | scm.with_leading_slash(entry.path) ) | |
|
|
70 | 63 | if change |
|
|
71 | 64 | entry.lastrev.identifier = change.changeset.revision |
|
|
72 | 65 | entry.lastrev.revision = change.changeset.revision |
|
|
73 | 66 | entry.lastrev.author = change.changeset.committer |
|
|
74 | 67 | # entry.lastrev.branch = change.branch |
|
|
75 | 68 | end |
|
|
76 | 69 | end |
|
|
77 | 70 | end |
|
|
78 | 71 | end |
|
|
79 | 72 | entries |
|
|
80 | 73 | end |
|
|
81 | 74 | protected :scm_entries |
|
|
82 | 75 | |
|
|
83 | 76 | def cat(path, identifier=nil) |
|
|
84 | 77 | rev = nil |
|
|
85 | 78 | if ! identifier.nil? |
|
|
86 | 79 | rev = changesets.find_by_revision(identifier) |
|
|
87 | 80 | return nil if rev.nil? |
|
|
88 | 81 | end |
|
|
89 | 82 | scm.cat(path, rev.nil? ? nil : rev.committed_on) |
|
|
90 | 83 | end |
|
|
91 | 84 | |
|
|
92 | 85 | def annotate(path, identifier=nil) |
|
|
93 | 86 | rev = nil |
|
|
94 | 87 | if ! identifier.nil? |
|
|
95 | 88 | rev = changesets.find_by_revision(identifier) |
|
|
96 | 89 | return nil if rev.nil? |
|
|
97 | 90 | end |
|
|
98 | 91 | scm.annotate(path, rev.nil? ? nil : rev.committed_on) |
|
|
99 | 92 | end |
|
|
100 | 93 | |
|
|
101 | 94 | def diff(path, rev, rev_to) |
|
|
102 | 95 | # convert rev to revision. CVS can't handle changesets here |
|
|
103 | 96 | diff=[] |
|
|
104 | 97 | changeset_from = changesets.find_by_revision(rev) |
|
|
105 | 98 | if rev_to.to_i > 0 |
|
|
106 | 99 | changeset_to = changesets.find_by_revision(rev_to) |
|
|
107 | 100 | end |
|
|
108 | 101 | changeset_from.filechanges.each() do |change_from| |
|
|
109 | 102 | revision_from = nil |
|
|
110 | 103 | revision_to = nil |
|
|
111 | 104 | if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path)) |
|
|
112 | 105 | revision_from = change_from.revision |
|
|
113 | 106 | end |
|
|
114 | 107 | if revision_from |
|
|
115 | 108 | if changeset_to |
|
|
116 | 109 | changeset_to.filechanges.each() do |change_to| |
|
|
117 | 110 | revision_to = change_to.revision if change_to.path == change_from.path |
|
|
118 | 111 | end |
|
|
119 | 112 | end |
|
|
120 | 113 | unless revision_to |
|
|
121 | 114 | revision_to = scm.get_previous_revision(revision_from) |
|
|
122 | 115 | end |
|
|
123 | 116 | file_diff = scm.diff(change_from.path, revision_from, revision_to) |
|
|
124 | 117 | diff = diff + file_diff unless file_diff.nil? |
|
|
125 | 118 | end |
|
|
126 | 119 | end |
|
|
127 | 120 | return diff |
|
|
128 | 121 | end |
|
|
129 | 122 | |
|
|
130 | 123 | def fetch_changesets |
|
|
131 | 124 | # some nifty bits to introduce a commit-id with cvs |
|
|
132 | 125 | # natively cvs doesn't provide any kind of changesets, |
|
|
133 | 126 | # there is only a revision per file. |
|
|
134 | 127 | # we now take a guess using the author, the commitlog and the commit-date. |
|
|
135 | 128 | |
|
|
136 | 129 | # last one is the next step to take. the commit-date is not equal for all |
|
|
137 | 130 | # commits in one changeset. cvs update the commit-date when the *,v file was touched. so |
|
|
138 | 131 | # we use a small delta here, to merge all changes belonging to _one_ changeset |
|
|
139 | 132 | time_delta = 10.seconds |
|
|
140 | 133 | fetch_since = latest_changeset ? latest_changeset.committed_on : nil |
|
|
141 | 134 | transaction do |
|
|
142 | 135 | tmp_rev_num = 1 |
|
|
143 | 136 | scm.revisions('', fetch_since, nil, :log_encoding => repo_log_encoding) do |revision| |
|
|
144 | 137 | # only add the change to the database, if it doen't exists. the cvs log |
|
|
145 | 138 | # is not exclusive at all. |
|
|
146 | 139 | tmp_time = revision.time.clone |
|
|
147 | 140 | unless filechanges.find_by_path_and_revision( |
|
|
148 | 141 | scm.with_leading_slash(revision.paths[0][:path]), |
|
|
149 | 142 | revision.paths[0][:revision] |
|
|
150 | 143 | ) |
|
|
151 | 144 | cmt = Changeset.normalize_comments(revision.message, repo_log_encoding) |
|
|
152 | 145 | author_utf8 = Changeset.to_utf8(revision.author, repo_log_encoding) |
|
|
153 | 146 | cs = changesets.where( |
|
|
154 | 147 | :committed_on => tmp_time - time_delta .. tmp_time + time_delta, |
|
|
155 | 148 | :committer => author_utf8, |
|
|
156 | 149 | :comments => cmt |
|
|
157 | 150 | ).first |
|
|
158 | 151 | # create a new changeset.... |
|
|
159 | 152 | unless cs |
|
|
160 | 153 | # we use a temporary revision number here (just for inserting) |
|
|
161 | 154 | # later on, we calculate a continous positive number |
|
|
162 | 155 | tmp_time2 = tmp_time.clone.gmtime |
|
|
163 | 156 | branch = revision.paths[0][:branch] |
|
|
164 | 157 | scmid = branch + "-" + tmp_time2.strftime("%Y%m%d-%H%M%S") |
|
|
165 | 158 | cs = Changeset.create(:repository => self, |
|
|
166 | 159 | :revision => "tmp#{tmp_rev_num}", |
|
|
167 | 160 | :scmid => scmid, |
|
|
168 | 161 | :committer => revision.author, |
|
|
169 | 162 | :committed_on => tmp_time, |
|
|
170 | 163 | :comments => revision.message) |
|
|
171 | 164 | tmp_rev_num += 1 |
|
|
172 | 165 | end |
|
|
173 | 166 | # convert CVS-File-States to internal Action-abbrevations |
|
|
174 | 167 | # default action is (M)odified |
|
|
175 | 168 | action = "M" |
|
|
176 | 169 | if revision.paths[0][:action] == "Exp" && revision.paths[0][:revision] == "1.1" |
|
|
177 | 170 | action = "A" # add-action always at first revision (= 1.1) |
|
|
178 | 171 | elsif revision.paths[0][:action] == "dead" |
|
|
179 | 172 | action = "D" # dead-state is similar to Delete |
|
|
180 | 173 | end |
|
|
181 | 174 | Change.create( |
|
|
182 | 175 | :changeset => cs, |
|
|
183 | 176 | :action => action, |
|
|
184 | 177 | :path => scm.with_leading_slash(revision.paths[0][:path]), |
|
|
185 | 178 | :revision => revision.paths[0][:revision], |
|
|
186 | 179 | :branch => revision.paths[0][:branch] |
|
|
187 | 180 | ) |
|
|
188 | 181 | end |
|
|
189 | 182 | end |
|
|
190 | 183 | |
|
|
191 | 184 | # Renumber new changesets in chronological order |
|
|
192 | 185 | Changeset. |
|
|
193 | 186 | order('committed_on ASC, id ASC'). |
|
|
194 | 187 | where("repository_id = ? AND revision LIKE 'tmp%'", id). |
|
|
195 | 188 | each do |changeset| |
|
|
196 | 189 | changeset.update_attribute :revision, next_revision_number |
|
|
197 | 190 | end |
|
|
198 | 191 | end # transaction |
|
|
199 | 192 | @current_revision_number = nil |
|
|
200 | 193 | end |
|
|
201 | 194 | |
|
|
202 | 195 | protected |
|
|
203 | 196 | |
|
|
204 | 197 | # Overrides Repository#validate_repository_path to validate |
|
|
205 | 198 | # against root_url attribute. |
|
|
206 | 199 | def validate_repository_path(attribute=:root_url) |
|
|
207 | 200 | super(attribute) |
|
|
208 | 201 | end |
|
|
209 | 202 | |
|
|
210 | 203 | private |
|
|
211 | 204 | |
|
|
212 | 205 | # Returns the next revision number to assign to a CVS changeset |
|
|
213 | 206 | def next_revision_number |
|
|
214 | 207 | # Need to retrieve existing revision numbers to sort them as integers |
|
|
215 | 208 | sql = "SELECT revision FROM #{Changeset.table_name} " |
|
|
216 | 209 | sql << "WHERE repository_id = #{id} AND revision NOT LIKE 'tmp%'" |
|
|
217 | 210 | @current_revision_number ||= (self.class.connection.select_values(sql).collect(&:to_i).max || 0) |
|
|
218 | 211 | @current_revision_number += 1 |
|
|
219 | 212 | end |
|
|
220 | 213 | end |
General Comments 0
You need to be logged in to leave comments.
Login now