##// END OF EJS Templates
jro_apps » redmine
RSS
scm: cvs: code clean up model....
Toshi MARUYAMA -
r4964:bf032661f757
parent child
Show More
Side by Side Unified
Context file:
r4964:bf032661f757 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,180 +1,182
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, :log_encoding
23 23
24 24 ATTRIBUTE_KEY_NAMES = {
25 25 "url" => "CVSROOT",
26 26 "root_url" => "Module",
27 27 "log_encoding" => "Commit messages encoding",
28 28 }
29 29 def self.human_attribute_name(attribute_key_name)
30 30 ATTRIBUTE_KEY_NAMES[attribute_key_name] || super
31 31 end
32 32
33 33 def self.scm_adapter_class
34 34 Redmine::Scm::Adapters::CvsAdapter
35 35 end
36 36
37 37 def self.scm_name
38 38 'CVS'
39 39 end
40 40
41 41 def entry(path=nil, identifier=nil)
42 42 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
43 43 scm.entry(path, rev.nil? ? nil : rev.committed_on)
44 44 end
45 45
46 46 def entries(path=nil, identifier=nil)
47 47 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
48 48 entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
49 49 if entries
50 50 entries.each() do |entry|
51 51 unless entry.lastrev.nil? || entry.lastrev.identifier
52 change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
52 change=changes.find_by_revision_and_path(
53 entry.lastrev.revision,
54 scm.with_leading_slash(entry.path) )
53 55 if change
54 entry.lastrev.identifier=change.changeset.revision
55 entry.lastrev.author=change.changeset.committer
56 entry.lastrev.revision=change.revision
57 entry.lastrev.branch=change.branch
56 entry.lastrev.identifier = change.changeset.revision
57 entry.lastrev.author = change.changeset.committer
58 entry.lastrev.revision = change.revision
59 entry.lastrev.branch = change.branch
58 60 end
59 61 end
60 62 end
61 63 end
62 64 entries
63 65 end
64 66
65 67 def cat(path, identifier=nil)
66 68 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
67 69 scm.cat(path, rev.nil? ? nil : rev.committed_on)
68 70 end
69 71
70 72 def diff(path, rev, rev_to)
71 73 #convert rev to revision. CVS can't handle changesets here
72 74 diff=[]
73 75 changeset_from=changesets.find_by_revision(rev)
74 76 if rev_to.to_i > 0
75 77 changeset_to=changesets.find_by_revision(rev_to)
76 78 end
77 79 changeset_from.changes.each() do |change_from|
78 80
79 81 revision_from=nil
80 82 revision_to=nil
81 83
82 84 revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
83 85
84 86 if revision_from
85 87 if changeset_to
86 88 changeset_to.changes.each() do |change_to|
87 89 revision_to=change_to.revision if change_to.path==change_from.path
88 90 end
89 91 end
90 92 unless revision_to
91 93 revision_to=scm.get_previous_revision(revision_from)
92 94 end
93 95 file_diff = scm.diff(change_from.path, revision_from, revision_to)
94 96 diff = diff + file_diff unless file_diff.nil?
95 97 end
96 98 end
97 99 return diff
98 100 end
99 101
100 102 def fetch_changesets
101 103 # some nifty bits to introduce a commit-id with cvs
102 104 # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
103 105 # we now take a guess using the author, the commitlog and the commit-date.
104 106
105 107 # last one is the next step to take. the commit-date is not equal for all
106 108 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
107 109 # we use a small delta here, to merge all changes belonging to _one_ changeset
108 110 time_delta=10.seconds
109 111
110 112 fetch_since = latest_changeset ? latest_changeset.committed_on : nil
111 113 transaction do
112 114 tmp_rev_num = 1
113 115 scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
114 116 # only add the change to the database, if it doen't exists. the cvs log
115 117 # is not exclusive at all.
116 118 tmp_time = revision.time.clone
117 119 unless changes.find_by_path_and_revision(
118 120 scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
119 121 cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
120 122 cs = changesets.find(:first, :conditions=>{
121 123 :committed_on=>tmp_time - time_delta .. tmp_time + time_delta,
122 124 :committer=>revision.author,
123 125 :comments=>cmt
124 126 })
125 127
126 128 # create a new changeset....
127 129 unless cs
128 130 # we use a temporaray revision number here (just for inserting)
129 131 # later on, we calculate a continous positive number
130 132 tmp_time2 = tmp_time.clone.gmtime
131 133 branch = revision.paths[0][:branch]
132 134 scmid = branch + "-" + tmp_time2.strftime("%Y%m%d-%H%M%S")
133 135 cs = Changeset.create(:repository => self,
134 136 :revision => "tmp#{tmp_rev_num}",
135 137 :scmid => scmid,
136 138 :committer => revision.author,
137 139 :committed_on => tmp_time,
138 140 :comments => revision.message)
139 141 tmp_rev_num += 1
140 142 end
141 143
142 144 #convert CVS-File-States to internal Action-abbrevations
143 145 #default action is (M)odified
144 146 action="M"
145 147 if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
146 148 action="A" #add-action always at first revision (= 1.1)
147 149 elsif revision.paths[0][:action]=="dead"
148 150 action="D" #dead-state is similar to Delete
149 151 end
150 152
151 153 Change.create(:changeset => cs,
152 154 :action => action,
153 155 :path => scm.with_leading_slash(revision.paths[0][:path]),
154 156 :revision => revision.paths[0][:revision],
155 157 :branch => revision.paths[0][:branch]
156 158 )
157 159 end
158 160 end
159 161
160 162 # Renumber new changesets in chronological order
161 163 changesets.find(
162 164 :all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE 'tmp%'"
163 165 ).each do |changeset|
164 166 changeset.update_attribute :revision, next_revision_number
165 167 end
166 168 end # transaction
167 169 @current_revision_number = nil
168 170 end
169 171
170 172 private
171 173
172 174 # Returns the next revision number to assign to a CVS changeset
173 175 def next_revision_number
174 176 # Need to retrieve existing revision numbers to sort them as integers
175 177 sql = "SELECT revision FROM #{Changeset.table_name} "
176 178 sql << "WHERE repository_id = #{id} AND revision NOT LIKE 'tmp%'"
177 179 @current_revision_number ||= (connection.select_values(sql).collect(&:to_i).max || 0)
178 180 @current_revision_number += 1
179 181 end
180 182 end
General Comments 0
You need to be logged in to leave comments. Login now