##// END OF EJS Templates
scm: git: backout r8840 (#8857, #9472)...
Toshi MARUYAMA -
r9021:374c2aa70500
parent child
Show More
@@ -1,237 +1,232
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 # Copyright (C) 2007 Patrick Aljord patcito@ŋmail.com
4 4 #
5 5 # This program is free software; you can redistribute it and/or
6 6 # modify it under the terms of the GNU General Public License
7 7 # as published by the Free Software Foundation; either version 2
8 8 # of the License, or (at your option) any later version.
9 9 #
10 10 # This program is distributed in the hope that it will be useful,
11 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 # GNU General Public License for more details.
14 14 #
15 15 # You should have received a copy of the GNU General Public License
16 16 # along with this program; if not, write to the Free Software
17 17 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18 18
19 19 require 'redmine/scm/adapters/git_adapter'
20 20
21 21 class Repository::Git < Repository
22 22 attr_protected :root_url
23 23 validates_presence_of :url
24 24
25 25 def self.human_attribute_name(attribute_key_name, *args)
26 26 attr_name = attribute_key_name.to_s
27 27 if attr_name == "url"
28 28 attr_name = "path_to_repository"
29 29 end
30 30 super(attr_name, *args)
31 31 end
32 32
33 33 def self.scm_adapter_class
34 34 Redmine::Scm::Adapters::GitAdapter
35 35 end
36 36
37 37 def self.scm_name
38 38 'Git'
39 39 end
40 40
41 41 def report_last_commit
42 42 extra_report_last_commit
43 43 end
44 44
45 45 def extra_report_last_commit
46 46 return false if extra_info.nil?
47 47 v = extra_info["extra_report_last_commit"]
48 48 return false if v.nil?
49 49 v.to_s != '0'
50 50 end
51 51
52 52 def supports_directory_revisions?
53 53 true
54 54 end
55 55
56 56 def supports_revision_graph?
57 57 true
58 58 end
59 59
60 60 def repo_log_encoding
61 61 'UTF-8'
62 62 end
63 63
64 64 # Returns the identifier for the given git changeset
65 65 def self.changeset_identifier(changeset)
66 66 changeset.scmid
67 67 end
68 68
69 69 # Returns the readable identifier for the given git changeset
70 70 def self.format_changeset_identifier(changeset)
71 71 changeset.revision[0, 8]
72 72 end
73 73
74 74 def branches
75 75 scm.branches
76 76 end
77 77
78 78 def tags
79 79 scm.tags
80 80 end
81 81
82 82 def default_branch
83 83 scm.default_branch
84 84 rescue Exception => e
85 85 logger.error "git: error during get default branch: #{e.message}"
86 86 nil
87 87 end
88 88
89 89 def find_changeset_by_name(name)
90 90 return nil if name.nil? || name.empty?
91 91 e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])
92 92 return e if e
93 93 changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])
94 94 end
95 95
96 96 def entries(path=nil, identifier=nil)
97 97 scm.entries(path,
98 98 identifier,
99 99 options = {:report_last_commit => extra_report_last_commit})
100 100 end
101 101
102 102 # With SCMs that have a sequential commit numbering,
103 103 # such as Subversion and Mercurial,
104 104 # Redmine is able to be clever and only fetch changesets
105 105 # going forward from the most recent one it knows about.
106 106 #
107 107 # However, Git does not have a sequential commit numbering.
108 108 #
109 109 # In order to fetch only new adding revisions,
110 110 # Redmine needs to save "heads".
111 111 #
112 112 # In Git and Mercurial, revisions are not in date order.
113 113 # Redmine Mercurial fixed issues.
114 114 # * Redmine Takes Too Long On Large Mercurial Repository
115 115 # http://www.redmine.org/issues/3449
116 116 # * Sorting for changesets might go wrong on Mercurial repos
117 117 # http://www.redmine.org/issues/3567
118 118 #
119 119 # Database revision column is text, so Redmine can not sort by revision.
120 120 # Mercurial has revision number, and revision number guarantees revision order.
121 121 # Redmine Mercurial model stored revisions ordered by database id to database.
122 122 # So, Redmine Mercurial model can use correct ordering revisions.
123 123 #
124 124 # Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"
125 125 # to get limited revisions from old to new.
126 126 # But, Git 1.7.3.4 does not support --reverse with -n or --skip.
127 127 #
128 128 # The repository can still be fully reloaded by calling #clear_changesets
129 129 # before fetching changesets (eg. for offline resync)
130 130 def fetch_changesets
131 131 scm_brs = branches
132 132 return if scm_brs.nil? || scm_brs.empty?
133 133
134 134 h1 = extra_info || {}
135 135 h = h1.dup
136 136 repo_heads = scm_brs.map{ |br| br.scmid }
137 137 h["heads"] ||= []
138 138 prev_db_heads = h["heads"].dup
139 139 if prev_db_heads.empty?
140 140 prev_db_heads += heads_from_branches_hash
141 141 end
142 142 return if prev_db_heads.sort == repo_heads.sort
143 143
144 144 h["db_consistent"] ||= {}
145 145 if changesets.count == 0
146 146 h["db_consistent"]["ordering"] = 1
147 147 merge_extra_info(h)
148 148 self.save
149 149 elsif ! h["db_consistent"].has_key?("ordering")
150 150 h["db_consistent"]["ordering"] = 0
151 151 merge_extra_info(h)
152 152 self.save
153 153 end
154 154
155 155 save_revisions(prev_db_heads, repo_heads)
156 156 end
157 157
158 158 def save_revisions(prev_db_heads, repo_heads)
159 159 h = {}
160 160 opts = {}
161 161 opts[:reverse] = true
162 162 opts[:excludes] = prev_db_heads
163 163 opts[:includes] = repo_heads
164 164 begin
165 cnt = 0
166 165 scm.revisions('', nil, nil, opts) do |rev|
167 cnt += 1
168 166 db_rev = find_changeset_by_name(rev.scmid)
169 if db_rev.nil?
170 transaction do
167 transaction do
168 if db_rev.nil?
171 169 db_saved_rev = save_revision(rev)
172 170 parents = {}
173 171 parents[db_saved_rev] = rev.parents unless rev.parents.nil?
174 172 parents.each do |ch, chparents|
175 173 ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
176 174 end
177 175 end
178 end
179 if cnt > 100
180 cnt = 0
181 176 h["heads"] = prev_db_heads.dup
182 177 h["heads"] << rev.scmid
183 178 merge_extra_info(h)
184 179 self.save
185 180 end
186 181 end
187 182 h["heads"] = repo_heads.dup
188 183 merge_extra_info(h)
189 184 self.save
190 185 rescue Redmine::Scm::Adapters::CommandFailed => e
191 186 logger.error("save revisions error: #{e.message}")
192 187 end
193 188 end
194 189 private :save_revisions
195 190
196 191 def save_revision(rev)
197 192 changeset = Changeset.new(
198 193 :repository => self,
199 194 :revision => rev.identifier,
200 195 :scmid => rev.scmid,
201 196 :committer => rev.author,
202 197 :committed_on => rev.time,
203 198 :comments => rev.message
204 199 )
205 200 if changeset.save
206 201 rev.paths.each do |file|
207 202 Change.create(
208 203 :changeset => changeset,
209 204 :action => file[:action],
210 205 :path => file[:path])
211 206 end
212 207 end
213 208 changeset
214 209 end
215 210 private :save_revision
216 211
217 212 def heads_from_branches_hash
218 213 h1 = extra_info || {}
219 214 h = h1.dup
220 215 h["branches"] ||= {}
221 216 h['branches'].map{|br, hs| hs['last_scmid']}
222 217 end
223 218
224 219 def latest_changesets(path,rev,limit=10)
225 220 revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
226 221 return [] if revisions.nil? || revisions.empty?
227 222
228 223 changesets.find(
229 224 :all,
230 225 :conditions => [
231 226 "scmid IN (?)",
232 227 revisions.map!{|c| c.scmid}
233 228 ],
234 229 :order => 'committed_on DESC'
235 230 )
236 231 end
237 232 end
General Comments 0
You need to be logged in to leave comments. Login now