jro_apps/redmine Commit - r7534:8dc7f1d1eef6

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)

25

def self.human_attribute_name(attribute_key_name)

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)

30

super(attr_name)

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 repo_log_encoding

56

def repo_log_encoding

57

'UTF-8'

57

'UTF-8'

58

end

58

end

59

60

# Returns the identifier for the given git changeset

60

# Returns the identifier for the given git changeset

61

def self.changeset_identifier(changeset)

61

def self.changeset_identifier(changeset)

62

changeset.scmid

62

changeset.scmid

63

end

63

end

64

65

# Returns the readable identifier for the given git changeset

65

# Returns the readable identifier for the given git changeset

66

def self.format_changeset_identifier(changeset)

66

def self.format_changeset_identifier(changeset)

67

changeset.revision[0, 8]

67

changeset.revision[0, 8]

68

end

68

end

69

70

def branches

70

def branches

71

scm.branches

71

scm.branches

72

end

72

end

73

74

def tags

74

def tags

75

scm.tags

75

scm.tags

76

end

76

end

77

78

def default_branch

78

def default_branch

79

scm.default_branch

79

scm.default_branch

80

rescue Exception => e

80

rescue Exception => e

81

logger.error "git: error during get default branch: #{e.message}"

81

logger.error "git: error during get default branch: #{e.message}"

82

nil

82

nil

83

end

83

end

84

85

def find_changeset_by_name(name)

85

def find_changeset_by_name(name)

86

return nil if name.nil? || name.empty?

86

return nil if name.nil? || name.empty?

87

e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])

87

e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])

88

return e if e

88

return e if e

89

changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])

89

changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])

90

end

90

end

91

92

def entries(path=nil, identifier=nil)

92

def entries(path=nil, identifier=nil)

93

scm.entries(path,

93

scm.entries(path,

94

identifier,

94

identifier,

95

options = {:report_last_commit => extra_report_last_commit})

95

options = {:report_last_commit => extra_report_last_commit})

96

end

96

end

97

98

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

98

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

99

# Redmine Mercurial fixed issues.

99

# Redmine Mercurial fixed issues.

100

# * Redmine Takes Too Long On Large Mercurial Repository

100

# * Redmine Takes Too Long On Large Mercurial Repository

101

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

101

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

102

# * Sorting for changesets might go wrong on Mercurial repos

102

# * Sorting for changesets might go wrong on Mercurial repos

103

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

103

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

104

#

104

#

105

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

105

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

106

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

106

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

107

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

107

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

108

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

108

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

109

#

109

#

110

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

110

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

111

# to get limited revisions from old to new.

111

# to get limited revisions from old to new.

112

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

112

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

113

#

113

#

114

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

114

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

115

# before fetching changesets (eg. for offline resync)

115

# before fetching changesets (eg. for offline resync)

116

def fetch_changesets

116

def fetch_changesets

117

scm_brs = branches

117

scm_brs = branches

118

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

118

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

119

h1 = extra_info || {}

119

h1 = extra_info || {}

120

h = h1.dup

120

h = h1.dup

121

h["branches"] ||= {}

121

h["branches"] ||= {}

122

h["db_consistent"] ||= {}

122

h["db_consistent"] ||= {}

123

if changesets.count == 0

123

if changesets.count == 0

124

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

124

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

125

merge_extra_info(h)

125

merge_extra_info(h)

126

self.save

126

self.save

127

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

127

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

128

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

128

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

129

merge_extra_info(h)

129

merge_extra_info(h)

130

self.save

130

self.save

131

end

131

end

132

scm_brs.each do |br1|

132

scm_brs.each do |br1|

133

br = br1.to_s

133

br = br1.to_s

134

from_scmid = nil

134

from_scmid = nil

135

from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]

135

from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]

136

h["branches"][br] ||= {}

136

h["branches"][br] ||= {}

137

scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|

137

scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|

138

db_rev = find_changeset_by_name(rev.revision)

138

db_rev = find_changeset_by_name(rev.revision)

139

transaction do

139

transaction do

140

if db_rev.nil?

140

if db_rev.nil?

141

save_revision(rev)

141

save_revision(rev)

142

end

142

end

143

h["branches"][br]["last_scmid"] = rev.scmid

143

h["branches"][br]["last_scmid"] = rev.scmid

144

merge_extra_info(h)

144

merge_extra_info(h)

145

self.save

145

self.save

146

end

146

end

147

end

147

end

148

end

148

end

149

end

149

end

150

151

def save_revision(rev)

151

def save_revision(rev)

152

changeset = Changeset.new(

152

changeset = Changeset.new(

153

:repository => self,

153

:repository => self,

154

:revision => rev.identifier,

154

:revision => rev.identifier,

155

:scmid => rev.scmid,

155

:scmid => rev.scmid,

156

:committer => rev.author,

156

:committer => rev.author,

157

:committed_on => rev.time,

157

:committed_on => rev.time,

158

:comments => rev.message

158

:comments => rev.message

159

)

159

)

160

if changeset.save

160

if changeset.save

161

rev.paths.each do |file|

161

rev.paths.each do |file|

162

Change.create(

162

Change.create(

163

:changeset => changeset,

163

:changeset => changeset,

164

:action => file[:action],

164

:action => file[:action],

165

:path => file[:path])

165

:path => file[:path])

166

end

166

end

167

end

167

end

168

changeset

168

end

169

end

169

private :save_revision

170

private :save_revision

170

171

def latest_changesets(path,rev,limit=10)

172

def latest_changesets(path,rev,limit=10)

172

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

173

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

173

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

174

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

174

175

changesets.find(

176

changesets.find(

176

:all,

177

:all,

177

:conditions => [

178

:conditions => [

178

"scmid IN (?)",

179

"scmid IN (?)",

179

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

180

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

180

],

181

],

181

:order => 'committed_on DESC'

182

:order => 'committed_on DESC'

182

)

183

)

183

end

184

end

184

end

185

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-2011  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)
                 attr_name = attribute_key_name
                 if attr_name == "url"
                   attr_name = "path_to_repository"
                 end
                 super(attr_name)
               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 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
               # 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
                 h["branches"]       ||= {}
                 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
                 scm_brs.each do |br1|
                   br = br1.to_s
                   from_scmid = nil
                   from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
                   h["branches"][br] ||= {}
                   scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
                     db_rev = find_changeset_by_name(rev.revision)
                     transaction do
                       if db_rev.nil?
                         save_revision(rev)
                       end
                       h["branches"][br]["last_scmid"] = rev.scmid
                       merge_extra_info(h)
                       self.save
                     end
                   end
                 end
               end
               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 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