jro_apps/redmine Commit - r9152:27dca22c917f

1

# Redmine - project management software

1

# Redmine - project management software

2

3

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

19

require 'redmine/scm/adapters/git_adapter'

19

require 'redmine/scm/adapters/git_adapter'

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

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.to_s

26

attr_name = attribute_key_name.to_s

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

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

37

def self.scm_name

37

def self.scm_name

38

'Git'

38

'Git'

39

end

39

end

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

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

52

def supports_directory_revisions?

52

def supports_directory_revisions?

53

true

53

true

54

end

54

end

55

56

def supports_revision_graph?

56

def supports_revision_graph?

57

true

57

true

58

end

58

end

59

60

def repo_log_encoding

60

def repo_log_encoding

61

'UTF-8'

61

'UTF-8'

62

end

62

end

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

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

74

def branches

74

def branches

75

scm.branches

75

scm.branches

76

end

76

end

77

78

def tags

78

def tags

79

scm.tags

79

scm.tags

80

end

80

end

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

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

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

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 save "heads".

110

# Redmine needs to save "heads".

111

#

111

#

112

# In Git and Mercurial, revisions are not in date order.

112

# In Git and Mercurial, revisions are not in date order.

113

# Redmine Mercurial fixed issues.

113

# Redmine Mercurial fixed issues.

114

# * Redmine Takes Too Long On Large Mercurial Repository

114

# * Redmine Takes Too Long On Large Mercurial Repository

115

# http://www.redmine.org/issues/3449

115

# http://www.redmine.org/issues/3449

116

# * Sorting for changesets might go wrong on Mercurial repos

116

# * Sorting for changesets might go wrong on Mercurial repos

117

# http://www.redmine.org/issues/3567

117

# http://www.redmine.org/issues/3567

118

#

118

#

119

# Database revision column is text, so Redmine can not sort by revision.

119

# Database revision column is text, so Redmine can not sort by revision.

120

# Mercurial has revision number, and revision number guarantees revision order.

120

# Mercurial has revision number, and revision number guarantees revision order.

121

# Redmine Mercurial model stored revisions ordered by database id to database.

121

# Redmine Mercurial model stored revisions ordered by database id to database.

122

# So, Redmine Mercurial model can use correct ordering revisions.

122

# So, Redmine Mercurial model can use correct ordering revisions.

123

#

123

#

124

# Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"

124

# Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"

125

# to get limited revisions from old to new.

125

# to get limited revisions from old to new.

126

# But, Git 1.7.3.4 does not support --reverse with -n or --skip.

126

# But, Git 1.7.3.4 does not support --reverse with -n or --skip.

127

#

127

#

128

# The repository can still be fully reloaded by calling #clear_changesets

128

# The repository can still be fully reloaded by calling #clear_changesets

129

# before fetching changesets (eg. for offline resync)

129

# before fetching changesets (eg. for offline resync)

130

def fetch_changesets

130

def fetch_changesets

131

scm_brs = branches

131

scm_brs = branches

132

return if scm_brs.nil? || scm_brs.empty?

132

return if scm_brs.nil? || scm_brs.empty?

133

134

h1 = extra_info || {}

134

h1 = extra_info || {}

135

h = h1.dup

135

h = h1.dup

136

repo_heads = scm_brs.map{ |br| br.scmid }

136

repo_heads = scm_brs.map{ |br| br.scmid }

137

h["heads"] ||= []

137

h["heads"] ||= []

138

prev_db_heads = h["heads"].dup

138

prev_db_heads = h["heads"].dup

139

if prev_db_heads.empty?

139

if prev_db_heads.empty?

140

prev_db_heads += heads_from_branches_hash

140

prev_db_heads += heads_from_branches_hash

141

end

141

end

142

return if prev_db_heads.sort == repo_heads.sort

142

return if prev_db_heads.sort == repo_heads.sort

143

144

h["db_consistent"] ||= {}

144

h["db_consistent"] ||= {}

145

if changesets.count == 0

145

if changesets.count == 0

146

h["db_consistent"]["ordering"] = 1

146

h["db_consistent"]["ordering"] = 1

147

merge_extra_info(h)

147

merge_extra_info(h)

148

self.save

148

self.save

149

elsif ! h["db_consistent"].has_key?("ordering")

149

elsif ! h["db_consistent"].has_key?("ordering")

150

h["db_consistent"]["ordering"] = 0

150

h["db_consistent"]["ordering"] = 0

151

merge_extra_info(h)

151

merge_extra_info(h)

152

self.save

152

self.save

153

end

153

end

154

save_revisions(prev_db_heads, repo_heads)

154

save_revisions(prev_db_heads, repo_heads)

155

end

155

end

156

157

def save_revisions(prev_db_heads, repo_heads)

157

def save_revisions(prev_db_heads, repo_heads)

158

h = {}

158

h = {}

159

opts = {}

159

opts = {}

160

opts[:reverse] = true

160

opts[:reverse] = true

161

opts[:excludes] = prev_db_heads

161

opts[:excludes] = prev_db_heads

162

opts[:includes] = repo_heads

162

opts[:includes] = repo_heads

163

164

revisions = scm.revisions('', nil, nil, opts)

164

revisions = scm.revisions('', nil, nil, opts)

165

return if revisions.blank?

165

return if revisions.blank?

166

167

# Make the search for existing revisions in the database in a more sufficient manner

167

# Make the search for existing revisions in the database in a more sufficient manner

168

# This is replacing the one-after-one queries.

168

# This is replacing the one-after-one queries.

169

# Find all revisions, that are in the database, and then remove them from the revision array.

169

# Find all revisions, that are in the database, and then remove them from the revision array.

170

# Then later we won't need any conditions for db existence.

170

# Then later we won't need any conditions for db existence.

171

# Query for several revisions at once, and remove them from the revisions array, if they are there.

171

# Query for several revisions at once, and remove them from the revisions array, if they are there.

172

# Do this in chunks, to avoid eventual memory problems (in case of tens of thousands of commits).

172

# Do this in chunks, to avoid eventual memory problems (in case of tens of thousands of commits).

173

# If there are no revisions (because the original code's algoritm filtered them),

173

# If there are no revisions (because the original code's algorithm filtered them),

174

# then this part will be stepped over.

174

# then this part will be stepped over.

175

# We make queries, just if there is any revision.

175

# We make queries, just if there is any revision.

176

limit = 100

176

limit = 100

177

offset = 0

177

offset = 0

178

revisions_copy = revisions.clone # revisions will change

178

revisions_copy = revisions.clone # revisions will change

179

while offset < revisions_copy.size

179

while offset < revisions_copy.size

180

recent_changesets_slice = changesets.find(

180

recent_changesets_slice = changesets.find(

181

:all,

181

:all,

182

:conditions => [

182

:conditions => [

183

'scmid IN (?)',

183

'scmid IN (?)',

184

revisions_copy.slice(offset, limit).map{|x| x.scmid}

184

revisions_copy.slice(offset, limit).map{|x| x.scmid}

185

]

185

]

186

)

186

)

187

# Subtract revisions that redmine already knows about

187

# Subtract revisions that redmine already knows about

188

recent_revisions = recent_changesets_slice.map{|c| c.scmid}

188

recent_revisions = recent_changesets_slice.map{|c| c.scmid}

189

revisions.reject!{|r| recent_revisions.include?(r.scmid)}

189

revisions.reject!{|r| recent_revisions.include?(r.scmid)}

190

offset += limit

190

offset += limit

191

end

191

end

192

193

revisions.each do |rev|

193

revisions.each do |rev|

194

transaction do

194

transaction do

195

# There is no search in the db for this revision, because above we ensured,

195

# There is no search in the db for this revision, because above we ensured,

196

# that it's not in the db.

196

# that it's not in the db.

197

db_saved_rev = save_revision(rev)

197

db_saved_rev = save_revision(rev)

198

parents = {}

198

parents = {}

199

parents[db_saved_rev] = rev.parents unless rev.parents.nil?

199

parents[db_saved_rev] = rev.parents unless rev.parents.nil?

200

parents.each do |ch, chparents|

200

parents.each do |ch, chparents|

201

ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact

201

ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact

202

end

202

end

203

end

203

end

204

end

204

end

205

h["heads"] = repo_heads.dup

205

h["heads"] = repo_heads.dup

206

merge_extra_info(h)

206

merge_extra_info(h)

207

self.save

207

self.save

208

end

208

end

209

private :save_revisions

209

private :save_revisions

210

211

def save_revision(rev)

211

def save_revision(rev)

212

changeset = Changeset.new(

212

changeset = Changeset.new(

213

:repository => self,

213

:repository => self,

214

:revision => rev.identifier,

214

:revision => rev.identifier,

215

:scmid => rev.scmid,

215

:scmid => rev.scmid,

216

:committer => rev.author,

216

:committer => rev.author,

217

:committed_on => rev.time,

217

:committed_on => rev.time,

218

:comments => rev.message

218

:comments => rev.message

219

)

219

)

220

if changeset.save

220

if changeset.save

221

rev.paths.each do |file|

221

rev.paths.each do |file|

222

Change.create(

222

Change.create(

223

:changeset => changeset,

223

:changeset => changeset,

224

:action => file[:action],

224

:action => file[:action],

225

:path => file[:path])

225

:path => file[:path])

226

end

226

end

227

end

227

end

228

changeset

228

changeset

229

end

229

end

230

private :save_revision

230

private :save_revision

231

232

def heads_from_branches_hash

232

def heads_from_branches_hash

233

h1 = extra_info || {}

233

h1 = extra_info || {}

234

h = h1.dup

234

h = h1.dup

235

h["branches"] ||= {}

235

h["branches"] ||= {}

236

h['branches'].map{|br, hs| hs['last_scmid']}

236

h['branches'].map{|br, hs| hs['last_scmid']}

237

end

237

end

238

239

def latest_changesets(path,rev,limit=10)

239

def latest_changesets(path,rev,limit=10)

240

revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)

240

revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)

241

return [] if revisions.nil? || revisions.empty?

241

return [] if revisions.nil? || revisions.empty?

242

243

changesets.find(

243

changesets.find(

244

:all,

244

:all,

245

:conditions => [

245

:conditions => [

246

"scmid IN (?)",

246

"scmid IN (?)",

247

revisions.map!{|c| c.scmid}

247

revisions.map!{|c| c.scmid}

248

],

248

],

249

:order => 'committed_on DESC'

249

:order => 'committed_on DESC'

250

)

250

)

251

end

251

end

252

end

252

end

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             # Copyright (C) 2007  Patrick Aljord patcito@ŋmail.com
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/git_adapter'
             class Repository::Git < Repository
               attr_protected :root_url
               validates_presence_of :url
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "url"
                   attr_name = "path_to_repository"
                 end
                 super(attr_name, *args)
               end
               def self.scm_adapter_class
                 Redmine::Scm::Adapters::GitAdapter
               end
               def self.scm_name
                 'Git'
               end
               def report_last_commit
                 extra_report_last_commit
               end
               def extra_report_last_commit
                 return false if extra_info.nil?
                 v = extra_info["extra_report_last_commit"]
                 return false if v.nil?
                 v.to_s != '0'
               end
               def supports_directory_revisions?
                 true
               end
               def supports_revision_graph?
                 true
               end
               def repo_log_encoding
                 'UTF-8'
               end
               # Returns the identifier for the given git changeset
               def self.changeset_identifier(changeset)
                 changeset.scmid
               end
               # Returns the readable identifier for the given git changeset
               def self.format_changeset_identifier(changeset)
                 changeset.revision[0, 8]
               end
               def branches
                 scm.branches
               end
               def tags
                 scm.tags
               end
               def default_branch
                 scm.default_branch
               rescue Exception => e
                 logger.error "git: error during get default branch: #{e.message}"
                 nil
               end
               def find_changeset_by_name(name)
                 return nil if name.nil? || name.empty?
                 e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])
                 return e if e
                 changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path,
                             identifier,
                             options = {:report_last_commit => extra_report_last_commit})
               end
               # With SCMs that have a sequential commit numbering,
               # such as Subversion and Mercurial,
               # Redmine is able to be clever and only fetch changesets
               # going forward from the most recent one it knows about.
               #
               # However, Git does not have a sequential commit numbering.
               #
               # In order to fetch only new adding revisions,
               # Redmine needs to save "heads".
               #
               # In Git and Mercurial, revisions are not in date order.
               # Redmine Mercurial fixed issues.
               #    * Redmine Takes Too Long On Large Mercurial Repository
               #      http://www.redmine.org/issues/3449
               #    * Sorting for changesets might go wrong on Mercurial repos
               #      http://www.redmine.org/issues/3567
               #
               # Database revision column is text, so Redmine can not sort by revision.
               # Mercurial has revision number, and revision number guarantees revision order.
               # Redmine Mercurial model stored revisions ordered by database id to database.
               # So, Redmine Mercurial model can use correct ordering revisions.
               #
               # Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"
               # to get limited revisions from old to new.
               # But, Git 1.7.3.4 does not support --reverse with -n or --skip.
               #
               # The repository can still be fully reloaded by calling #clear_changesets
               # before fetching changesets (eg. for offline resync)
               def fetch_changesets
                 scm_brs = branches
                 return if scm_brs.nil? || scm_brs.empty?
                 h1 = extra_info || {}
                 h  = h1.dup
                 repo_heads = scm_brs.map{ |br| br.scmid }
                 h["heads"] ||= []
                 prev_db_heads = h["heads"].dup
                 if prev_db_heads.empty?
                   prev_db_heads += heads_from_branches_hash
                 end
                 return if prev_db_heads.sort == repo_heads.sort
                 h["db_consistent"]  ||= {}
                 if changesets.count == 0
                   h["db_consistent"]["ordering"] = 1
                   merge_extra_info(h)
                   self.save
                 elsif ! h["db_consistent"].has_key?("ordering")
                   h["db_consistent"]["ordering"] = 0
                   merge_extra_info(h)
                   self.save
                 end
                 save_revisions(prev_db_heads, repo_heads)
               end
               def save_revisions(prev_db_heads, repo_heads)
                 h = {}
                 opts = {}
                 opts[:reverse]  = true
                 opts[:excludes] = prev_db_heads
                 opts[:includes] = repo_heads
                 revisions = scm.revisions('', nil, nil, opts)
                 return if revisions.blank?
                 # Make the search for existing revisions in the database in a more sufficient manner
                 # This is replacing the one-after-one queries.
                 # Find all revisions, that are in the database, and then remove them from the revision array.
                 # Then later we won't need any conditions for db existence.
                 # Query for several revisions at once, and remove them from the revisions array, if they are there.
                 # Do this in chunks, to avoid eventual memory problems (in case of tens of thousands of commits).
-                # If there are no revisions (because the original code's algoritm filtered them),
+                # If there are no revisions (because the original code's algorithm filtered them),
                 # then this part will be stepped over.
                 # We make queries, just if there is any revision.
                 limit = 100
                 offset = 0
                 revisions_copy = revisions.clone # revisions will change
                 while offset < revisions_copy.size
                   recent_changesets_slice = changesets.find(
                                                  :all,
                                                  :conditions => [
                                                     'scmid IN (?)',
                                                     revisions_copy.slice(offset, limit).map{|x| x.scmid}
                                                   ]
                                                 )
                   # Subtract revisions that redmine already knows about
                   recent_revisions = recent_changesets_slice.map{|c| c.scmid}
                   revisions.reject!{|r| recent_revisions.include?(r.scmid)}
                   offset += limit
                 end
                 revisions.each do |rev|
                   transaction do
                     # There is no search in the db for this revision, because above we ensured,
                     # that it's not in the db.
                     db_saved_rev = save_revision(rev)
                     parents = {}
                     parents[db_saved_rev] = rev.parents unless rev.parents.nil?
                     parents.each do |ch, chparents|
                       ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
                     end
                   end
                 end
                 h["heads"] = repo_heads.dup
                 merge_extra_info(h)
                 self.save
               end
               private :save_revisions
               def save_revision(rev)
                 changeset = Changeset.new(
                           :repository   => self,
                           :revision     => rev.identifier,
                           :scmid        => rev.scmid,
                           :committer    => rev.author,
                           :committed_on => rev.time,
                           :comments     => rev.message
                           )
                 if changeset.save
                   rev.paths.each do |file|
                     Change.create(
                               :changeset => changeset,
                               :action    => file[:action],
                               :path      => file[:path])
                   end
                 end
                 changeset
               end
               private :save_revision
               def heads_from_branches_hash
                 h1 = extra_info || {}
                 h  = h1.dup
                 h["branches"] ||= {}
                 h['branches'].map{|br, hs| hs['last_scmid']}
               end
               def latest_changesets(path,rev,limit=10)
                 revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
                 return [] if revisions.nil? || revisions.empty?
                 changesets.find(
                   :all,
                   :conditions => [
                     "scmid IN (?)",
                     revisions.map!{|c| c.scmid}
                   ],
                   :order => 'committed_on DESC'
                 )
               end
             end