annotate .svn/pristine/a5/a50c8a4fc61822f00307fa81cf3630d9ac86b4c0.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 # Redmine - project management software
Chris@1295 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
Chris@1295 3 #
Chris@1295 4 # This program is free software; you can redistribute it and/or
Chris@1295 5 # modify it under the terms of the GNU General Public License
Chris@1295 6 # as published by the Free Software Foundation; either version 2
Chris@1295 7 # of the License, or (at your option) any later version.
Chris@1295 8 #
Chris@1295 9 # This program is distributed in the hope that it will be useful,
Chris@1295 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1295 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1295 12 # GNU General Public License for more details.
Chris@1295 13 #
Chris@1295 14 # You should have received a copy of the GNU General Public License
Chris@1295 15 # along with this program; if not, write to the Free Software
Chris@1295 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1295 17
Chris@1295 18 require 'redmine/scm/adapters/cvs_adapter'
Chris@1295 19 require 'digest/sha1'
Chris@1295 20
Chris@1295 21 class Repository::Cvs < Repository
Chris@1295 22 validates_presence_of :url, :root_url, :log_encoding
Chris@1295 23
Chris@1295 24 safe_attributes 'root_url',
Chris@1295 25 :if => lambda {|repository, user| repository.new_record?}
Chris@1295 26
Chris@1295 27 def self.human_attribute_name(attribute_key_name, *args)
Chris@1295 28 attr_name = attribute_key_name.to_s
Chris@1295 29 if attr_name == "root_url"
Chris@1295 30 attr_name = "cvsroot"
Chris@1295 31 elsif attr_name == "url"
Chris@1295 32 attr_name = "cvs_module"
Chris@1295 33 end
Chris@1295 34 super(attr_name, *args)
Chris@1295 35 end
Chris@1295 36
Chris@1295 37 def self.scm_adapter_class
Chris@1295 38 Redmine::Scm::Adapters::CvsAdapter
Chris@1295 39 end
Chris@1295 40
Chris@1295 41 def self.scm_name
Chris@1295 42 'CVS'
Chris@1295 43 end
Chris@1295 44
Chris@1295 45 def entry(path=nil, identifier=nil)
Chris@1295 46 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
Chris@1295 47 scm.entry(path, rev.nil? ? nil : rev.committed_on)
Chris@1295 48 end
Chris@1295 49
Chris@1295 50 def entries(path=nil, identifier=nil)
Chris@1295 51 rev = nil
Chris@1295 52 if ! identifier.nil?
Chris@1295 53 rev = changesets.find_by_revision(identifier)
Chris@1295 54 return nil if rev.nil?
Chris@1295 55 end
Chris@1295 56 entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
Chris@1295 57 if entries
Chris@1295 58 entries.each() do |entry|
Chris@1295 59 if ( ! entry.lastrev.nil? ) && ( ! entry.lastrev.revision.nil? )
Chris@1295 60 change = filechanges.find_by_revision_and_path(
Chris@1295 61 entry.lastrev.revision,
Chris@1295 62 scm.with_leading_slash(entry.path) )
Chris@1295 63 if change
Chris@1295 64 entry.lastrev.identifier = change.changeset.revision
Chris@1295 65 entry.lastrev.revision = change.changeset.revision
Chris@1295 66 entry.lastrev.author = change.changeset.committer
Chris@1295 67 # entry.lastrev.branch = change.branch
Chris@1295 68 end
Chris@1295 69 end
Chris@1295 70 end
Chris@1295 71 end
Chris@1295 72 load_entries_changesets(entries)
Chris@1295 73 entries
Chris@1295 74 end
Chris@1295 75
Chris@1295 76 def cat(path, identifier=nil)
Chris@1295 77 rev = nil
Chris@1295 78 if ! identifier.nil?
Chris@1295 79 rev = changesets.find_by_revision(identifier)
Chris@1295 80 return nil if rev.nil?
Chris@1295 81 end
Chris@1295 82 scm.cat(path, rev.nil? ? nil : rev.committed_on)
Chris@1295 83 end
Chris@1295 84
Chris@1295 85 def annotate(path, identifier=nil)
Chris@1295 86 rev = nil
Chris@1295 87 if ! identifier.nil?
Chris@1295 88 rev = changesets.find_by_revision(identifier)
Chris@1295 89 return nil if rev.nil?
Chris@1295 90 end
Chris@1295 91 scm.annotate(path, rev.nil? ? nil : rev.committed_on)
Chris@1295 92 end
Chris@1295 93
Chris@1295 94 def diff(path, rev, rev_to)
Chris@1295 95 # convert rev to revision. CVS can't handle changesets here
Chris@1295 96 diff=[]
Chris@1295 97 changeset_from = changesets.find_by_revision(rev)
Chris@1295 98 if rev_to.to_i > 0
Chris@1295 99 changeset_to = changesets.find_by_revision(rev_to)
Chris@1295 100 end
Chris@1295 101 changeset_from.filechanges.each() do |change_from|
Chris@1295 102 revision_from = nil
Chris@1295 103 revision_to = nil
Chris@1295 104 if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
Chris@1295 105 revision_from = change_from.revision
Chris@1295 106 end
Chris@1295 107 if revision_from
Chris@1295 108 if changeset_to
Chris@1295 109 changeset_to.filechanges.each() do |change_to|
Chris@1295 110 revision_to = change_to.revision if change_to.path == change_from.path
Chris@1295 111 end
Chris@1295 112 end
Chris@1295 113 unless revision_to
Chris@1295 114 revision_to = scm.get_previous_revision(revision_from)
Chris@1295 115 end
Chris@1295 116 file_diff = scm.diff(change_from.path, revision_from, revision_to)
Chris@1295 117 diff = diff + file_diff unless file_diff.nil?
Chris@1295 118 end
Chris@1295 119 end
Chris@1295 120 return diff
Chris@1295 121 end
Chris@1295 122
Chris@1295 123 def fetch_changesets
Chris@1295 124 # some nifty bits to introduce a commit-id with cvs
Chris@1295 125 # natively cvs doesn't provide any kind of changesets,
Chris@1295 126 # there is only a revision per file.
Chris@1295 127 # we now take a guess using the author, the commitlog and the commit-date.
Chris@1295 128
Chris@1295 129 # last one is the next step to take. the commit-date is not equal for all
Chris@1295 130 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
Chris@1295 131 # we use a small delta here, to merge all changes belonging to _one_ changeset
Chris@1295 132 time_delta = 10.seconds
Chris@1295 133 fetch_since = latest_changeset ? latest_changeset.committed_on : nil
Chris@1295 134 transaction do
Chris@1295 135 tmp_rev_num = 1
Chris@1295 136 scm.revisions('', fetch_since, nil, :log_encoding => repo_log_encoding) do |revision|
Chris@1295 137 # only add the change to the database, if it doen't exists. the cvs log
Chris@1295 138 # is not exclusive at all.
Chris@1295 139 tmp_time = revision.time.clone
Chris@1295 140 unless filechanges.find_by_path_and_revision(
Chris@1295 141 scm.with_leading_slash(revision.paths[0][:path]),
Chris@1295 142 revision.paths[0][:revision]
Chris@1295 143 )
Chris@1295 144 cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
Chris@1295 145 author_utf8 = Changeset.to_utf8(revision.author, repo_log_encoding)
Chris@1295 146 cs = changesets.find(
Chris@1295 147 :first,
Chris@1295 148 :conditions => {
Chris@1295 149 :committed_on => tmp_time - time_delta .. tmp_time + time_delta,
Chris@1295 150 :committer => author_utf8,
Chris@1295 151 :comments => cmt
Chris@1295 152 }
Chris@1295 153 )
Chris@1295 154 # create a new changeset....
Chris@1295 155 unless cs
Chris@1295 156 # we use a temporaray revision number here (just for inserting)
Chris@1295 157 # later on, we calculate a continous positive number
Chris@1295 158 tmp_time2 = tmp_time.clone.gmtime
Chris@1295 159 branch = revision.paths[0][:branch]
Chris@1295 160 scmid = branch + "-" + tmp_time2.strftime("%Y%m%d-%H%M%S")
Chris@1295 161 cs = Changeset.create(:repository => self,
Chris@1295 162 :revision => "tmp#{tmp_rev_num}",
Chris@1295 163 :scmid => scmid,
Chris@1295 164 :committer => revision.author,
Chris@1295 165 :committed_on => tmp_time,
Chris@1295 166 :comments => revision.message)
Chris@1295 167 tmp_rev_num += 1
Chris@1295 168 end
Chris@1295 169 # convert CVS-File-States to internal Action-abbrevations
Chris@1295 170 # default action is (M)odified
Chris@1295 171 action = "M"
Chris@1295 172 if revision.paths[0][:action] == "Exp" && revision.paths[0][:revision] == "1.1"
Chris@1295 173 action = "A" # add-action always at first revision (= 1.1)
Chris@1295 174 elsif revision.paths[0][:action] == "dead"
Chris@1295 175 action = "D" # dead-state is similar to Delete
Chris@1295 176 end
Chris@1295 177 Change.create(
Chris@1295 178 :changeset => cs,
Chris@1295 179 :action => action,
Chris@1295 180 :path => scm.with_leading_slash(revision.paths[0][:path]),
Chris@1295 181 :revision => revision.paths[0][:revision],
Chris@1295 182 :branch => revision.paths[0][:branch]
Chris@1295 183 )
Chris@1295 184 end
Chris@1295 185 end
Chris@1295 186
Chris@1295 187 # Renumber new changesets in chronological order
Chris@1295 188 Changeset.all(
Chris@1295 189 :order => 'committed_on ASC, id ASC',
Chris@1295 190 :conditions => ["repository_id = ? AND revision LIKE 'tmp%'", id]
Chris@1295 191 ).each do |changeset|
Chris@1295 192 changeset.update_attribute :revision, next_revision_number
Chris@1295 193 end
Chris@1295 194 end # transaction
Chris@1295 195 @current_revision_number = nil
Chris@1295 196 end
Chris@1295 197
Chris@1295 198 private
Chris@1295 199
Chris@1295 200 # Returns the next revision number to assign to a CVS changeset
Chris@1295 201 def next_revision_number
Chris@1295 202 # Need to retrieve existing revision numbers to sort them as integers
Chris@1295 203 sql = "SELECT revision FROM #{Changeset.table_name} "
Chris@1295 204 sql << "WHERE repository_id = #{id} AND revision NOT LIKE 'tmp%'"
Chris@1295 205 @current_revision_number ||= (connection.select_values(sql).collect(&:to_i).max || 0)
Chris@1295 206 @current_revision_number += 1
Chris@1295 207 end
Chris@1295 208 end