##// END OF EJS Templates
scm: git: catch exception in model default_branch() (#8458, #6713)....
Toshi MARUYAMA -
r6100:ed37d8ed91c9
parent child
Show More
@@ -1,180 +1,183
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)
26 26 attr_name = attribute_key_name
27 27 if attr_name == "url"
28 28 attr_name = "path_to_repository"
29 29 end
30 30 super(attr_name)
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 repo_log_encoding
57 57 'UTF-8'
58 58 end
59 59
60 60 # Returns the identifier for the given git changeset
61 61 def self.changeset_identifier(changeset)
62 62 changeset.scmid
63 63 end
64 64
65 65 # Returns the readable identifier for the given git changeset
66 66 def self.format_changeset_identifier(changeset)
67 67 changeset.revision[0, 8]
68 68 end
69 69
70 70 def branches
71 71 scm.branches
72 72 end
73 73
74 74 def tags
75 75 scm.tags
76 76 end
77 77
78 78 def default_branch
79 79 scm.default_branch
80 rescue Exception => e
81 logger.error "git: error during get default branch: #{e.message}"
82 nil
80 83 end
81 84
82 85 def find_changeset_by_name(name)
83 86 return nil if name.nil? || name.empty?
84 87 e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])
85 88 return e if e
86 89 changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])
87 90 end
88 91
89 92 def entries(path=nil, identifier=nil)
90 93 scm.entries(path,
91 94 identifier,
92 95 options = {:report_last_commit => extra_report_last_commit})
93 96 end
94 97
95 98 # In Git and Mercurial, revisions are not in date order.
96 99 # Redmine Mercurial fixed issues.
97 100 # * Redmine Takes Too Long On Large Mercurial Repository
98 101 # http://www.redmine.org/issues/3449
99 102 # * Sorting for changesets might go wrong on Mercurial repos
100 103 # http://www.redmine.org/issues/3567
101 104 #
102 105 # Database revision column is text, so Redmine can not sort by revision.
103 106 # Mercurial has revision number, and revision number guarantees revision order.
104 107 # Redmine Mercurial model stored revisions ordered by database id to database.
105 108 # So, Redmine Mercurial model can use correct ordering revisions.
106 109 #
107 110 # Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"
108 111 # to get limited revisions from old to new.
109 112 # But, Git 1.7.3.4 does not support --reverse with -n or --skip.
110 113 #
111 114 # The repository can still be fully reloaded by calling #clear_changesets
112 115 # before fetching changesets (eg. for offline resync)
113 116 def fetch_changesets
114 117 scm_brs = branches
115 118 return if scm_brs.nil? || scm_brs.empty?
116 119 h1 = extra_info || {}
117 120 h = h1.dup
118 121 h["branches"] ||= {}
119 122 h["db_consistent"] ||= {}
120 123 if changesets.count == 0
121 124 h["db_consistent"]["ordering"] = 1
122 125 merge_extra_info(h)
123 126 self.save
124 127 elsif ! h["db_consistent"].has_key?("ordering")
125 128 h["db_consistent"]["ordering"] = 0
126 129 merge_extra_info(h)
127 130 self.save
128 131 end
129 132 scm_brs.each do |br|
130 133 from_scmid = nil
131 134 from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
132 135 h["branches"][br] ||= {}
133 136 scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
134 137 db_rev = find_changeset_by_name(rev.revision)
135 138 transaction do
136 139 if db_rev.nil?
137 140 save_revision(rev)
138 141 end
139 142 h["branches"][br]["last_scmid"] = rev.scmid
140 143 merge_extra_info(h)
141 144 self.save
142 145 end
143 146 end
144 147 end
145 148 end
146 149
147 150 def save_revision(rev)
148 151 changeset = Changeset.new(
149 152 :repository => self,
150 153 :revision => rev.identifier,
151 154 :scmid => rev.scmid,
152 155 :committer => rev.author,
153 156 :committed_on => rev.time,
154 157 :comments => rev.message
155 158 )
156 159 if changeset.save
157 160 rev.paths.each do |file|
158 161 Change.create(
159 162 :changeset => changeset,
160 163 :action => file[:action],
161 164 :path => file[:path])
162 165 end
163 166 end
164 167 end
165 168 private :save_revision
166 169
167 170 def latest_changesets(path,rev,limit=10)
168 171 revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
169 172 return [] if revisions.nil? || revisions.empty?
170 173
171 174 changesets.find(
172 175 :all,
173 176 :conditions => [
174 177 "scmid IN (?)",
175 178 revisions.map!{|c| c.scmid}
176 179 ],
177 180 :order => 'committed_on DESC'
178 181 )
179 182 end
180 183 end
General Comments 0
You need to be logged in to leave comments. Login now