comparison app/models/repository/cvs.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children a1bdbf8a87d5
comparison
equal deleted inserted replaced
1516:b450a9d58aed 1517:dffacf8a6908
45 def entry(path=nil, identifier=nil) 45 def entry(path=nil, identifier=nil)
46 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier) 46 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
47 scm.entry(path, rev.nil? ? nil : rev.committed_on) 47 scm.entry(path, rev.nil? ? nil : rev.committed_on)
48 end 48 end
49 49
50 def entries(path=nil, identifier=nil) 50 def scm_entries(path=nil, identifier=nil)
51 rev = nil 51 rev = nil
52 if ! identifier.nil? 52 if ! identifier.nil?
53 rev = changesets.find_by_revision(identifier) 53 rev = changesets.find_by_revision(identifier)
54 return nil if rev.nil? 54 return nil if rev.nil?
55 end 55 end
67 # entry.lastrev.branch = change.branch 67 # entry.lastrev.branch = change.branch
68 end 68 end
69 end 69 end
70 end 70 end
71 end 71 end
72 load_entries_changesets(entries)
73 entries 72 entries
74 end 73 end
74 protected :scm_entries
75 75
76 def cat(path, identifier=nil) 76 def cat(path, identifier=nil)
77 rev = nil 77 rev = nil
78 if ! identifier.nil? 78 if ! identifier.nil?
79 rev = changesets.find_by_revision(identifier) 79 rev = changesets.find_by_revision(identifier)
184 # Renumber new changesets in chronological order 184 # Renumber new changesets in chronological order
185 Changeset. 185 Changeset.
186 order('committed_on ASC, id ASC'). 186 order('committed_on ASC, id ASC').
187 where("repository_id = ? AND revision LIKE 'tmp%'", id). 187 where("repository_id = ? AND revision LIKE 'tmp%'", id).
188 each do |changeset| 188 each do |changeset|
189 changeset.update_attribute :revision, next_revision_number 189 changeset.update_attribute :revision, next_revision_number
190 end 190 end
191 end # transaction 191 end # transaction
192 @current_revision_number = nil 192 @current_revision_number = nil
193 end 193 end
194 194