##// END OF EJS Templates
CVS duplicate key violation fix (#996, #1098)....
Jean-Philippe Lang -
r1340:76b8d3eff26b
parent child
Show More
@@ -1,149 +1,155
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, identifier)
33 33 e = entries(path, identifier)
34 34 e ? e.first : nil
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 diff(path, rev, rev_to, type)
57 57 #convert rev to revision. CVS can't handle changesets here
58 58 diff=[]
59 59 changeset_from=changesets.find_by_revision(rev)
60 60 if rev_to.to_i > 0
61 61 changeset_to=changesets.find_by_revision(rev_to)
62 62 end
63 63 changeset_from.changes.each() do |change_from|
64 64
65 65 revision_from=nil
66 66 revision_to=nil
67 67
68 68 revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
69 69
70 70 if revision_from
71 71 if changeset_to
72 72 changeset_to.changes.each() do |change_to|
73 73 revision_to=change_to.revision if change_to.path==change_from.path
74 74 end
75 75 end
76 76 unless revision_to
77 77 revision_to=scm.get_previous_revision(revision_from)
78 78 end
79 79 diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
80 80 end
81 81 end
82 82 return diff
83 83 end
84 84
85 85 def fetch_changesets
86 86 # some nifty bits to introduce a commit-id with cvs
87 87 # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
88 88 # we now take a guess using the author, the commitlog and the commit-date.
89 89
90 90 # last one is the next step to take. the commit-date is not equal for all
91 91 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
92 92 # we use a small delta here, to merge all changes belonging to _one_ changeset
93 93 time_delta=10.seconds
94 94
95 95 fetch_since = latest_changeset ? latest_changeset.committed_on : nil
96 96 transaction do
97 97 tmp_rev_num = 1
98 98 scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
99 99 # only add the change to the database, if it doen't exists. the cvs log
100 100 # is not exclusive at all.
101 101 unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
102 102 revision
103 103 cs = changesets.find(:first, :conditions=>{
104 104 :committed_on=>revision.time-time_delta..revision.time+time_delta,
105 105 :committer=>revision.author,
106 106 :comments=>revision.message
107 107 })
108 108
109 109 # create a new changeset....
110 110 unless cs
111 111 # we use a temporaray revision number here (just for inserting)
112 112 # later on, we calculate a continous positive number
113 113 latest = changesets.find(:first, :order => 'id DESC')
114 114 cs = Changeset.create(:repository => self,
115 115 :revision => "_#{tmp_rev_num}",
116 116 :committer => revision.author,
117 117 :committed_on => revision.time,
118 118 :comments => revision.message)
119 119 tmp_rev_num += 1
120 120 end
121 121
122 122 #convert CVS-File-States to internal Action-abbrevations
123 123 #default action is (M)odified
124 124 action="M"
125 125 if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
126 126 action="A" #add-action always at first revision (= 1.1)
127 127 elsif revision.paths[0][:action]=="dead"
128 128 action="D" #dead-state is similar to Delete
129 129 end
130 130
131 131 Change.create(:changeset => cs,
132 132 :action => action,
133 133 :path => scm.with_leading_slash(revision.paths[0][:path]),
134 134 :revision => revision.paths[0][:revision],
135 135 :branch => revision.paths[0][:branch]
136 136 )
137 137 end
138 138 end
139 139
140 140 # Renumber new changesets in chronological order
141 c = changesets.find(:first, :order => 'committed_on DESC, id DESC', :conditions => "revision NOT LIKE '_%'")
142 next_rev = c.nil? ? 1 : (c.revision.to_i + 1)
143 141 changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
144 changeset.update_attribute :revision, next_rev
145 next_rev += 1
142 changeset.update_attribute :revision, next_revision_number
146 143 end
147 144 end # transaction
148 145 end
146
147 private
148
149 # Returns the next revision number to assign to a CVS changeset
150 def next_revision_number
151 # Need to retrieve existing revision numbers to sort them as integers
152 @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)
153 @current_revision_number += 1
154 end
149 155 end
General Comments 0
You need to be logged in to leave comments. Login now