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