jro_apps/redmine Commit - r2673:ea7ff8dd76c4

1

# Redmine - project management software

1

# Redmine - project management software

2

3

#

3

#

4

# This program is free software; you can redistribute it and/or

4

# This program is free software; you can redistribute it and/or

5

# modify it under the terms of the GNU General Public License

5

# modify it under the terms of the GNU General Public License

6

# as published by the Free Software Foundation; either version 2

6

# as published by the Free Software Foundation; either version 2

7

# of the License, or (at your option) any later version.

7

# of the License, or (at your option) any later version.

8

#

8

#

9

# This program is distributed in the hope that it will be useful,

9

# This program is distributed in the hope that it will be useful,

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12

# GNU General Public License for more details.

12

# GNU General Public License for more details.

13

#

13

#

14

# You should have received a copy of the GNU General Public License

14

# You should have received a copy of the GNU General Public License

15

# along with this program; if not, write to the Free Software

15

# along with this program; if not, write to the Free Software

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

17

18

require 'iconv'

18

require 'iconv'

19

20

class Changeset < ActiveRecord::Base

20

class Changeset < ActiveRecord::Base

21

belongs_to :repository

21

belongs_to :repository

22

belongs_to :user

22

belongs_to :user

23

has_many :changes, :dependent => :delete_all

23

has_many :changes, :dependent => :delete_all

24

has_and_belongs_to_many :issues

24

has_and_belongs_to_many :issues

25

26

acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},

26

acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},

27

:description => :long_comments,

27

:description => :long_comments,

28

:datetime => :committed_on,

28

:datetime => :committed_on,

29

:url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}

29

:url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}

30

31

acts_as_searchable :columns => 'comments',

31

acts_as_searchable :columns => 'comments',

32

:include => {:repository => :project},

32

:include => {:repository => :project},

33

:project_key => "#{Repository.table_name}.project_id",

33

:project_key => "#{Repository.table_name}.project_id",

34

:date_column => 'committed_on'

34

:date_column => 'committed_on'

35

36

acts_as_activity_provider :timestamp => "#{table_name}.committed_on",

36

acts_as_activity_provider :timestamp => "#{table_name}.committed_on",

37

:author_key => :user_id,

37

:author_key => :user_id,

38

:find_options => {:include => [:user, {:repository => :project}]}

38

:find_options => {:include => [:user, {:repository => :project}]}

39

40

validates_presence_of :repository_id, :revision, :committed_on, :commit_date

40

validates_presence_of :repository_id, :revision, :committed_on, :commit_date

41

validates_uniqueness_of :revision, :scope => :repository_id

41

validates_uniqueness_of :revision, :scope => :repository_id

42

validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true

42

validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true

43

44

def revision=(r)

44

def revision=(r)

45

write_attribute :revision, (r.nil? ? nil : r.to_s)

45

write_attribute :revision, (r.nil? ? nil : r.to_s)

46

end

46

end

47

48

def comments=(comment)

48

def comments=(comment)

49

write_attribute(:comments, Changeset.normalize_comments(comment))

49

write_attribute(:comments, Changeset.normalize_comments(comment))

50

end

50

end

51

52

def committed_on=(date)

52

def committed_on=(date)

53

self.commit_date = date

53

self.commit_date = date

54

super

54

super

55

end

55

end

56

57

def project

57

def project

58

repository.project

58

repository.project

59

end

59

end

60

61

def author

61

def author

62

user || committer.to_s.split('<').first

62

user || committer.to_s.split('<').first

63

end

63

end

64

65

def before_create

65

def before_create

66

self.user = repository.find_committer_user(committer)

66

self.user = repository.find_committer_user(committer)

67

end

67

end

68

69

def after_create

69

def after_create

70

scan_comment_for_issue_ids

70

scan_comment_for_issue_ids

71

end

71

end

72

require 'pp'

72

require 'pp'

73

74

def scan_comment_for_issue_ids

74

def scan_comment_for_issue_ids

75

return if comments.blank?

75

return if comments.blank?

76

# keywords used to reference issues

76

# keywords used to reference issues

77

ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)

77

ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)

78

# keywords used to fix issues

78

# keywords used to fix issues

79

fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)

79

fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)

80

# status and optional done ratio applied

80

# status and optional done ratio applied

81

fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)

81

fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)

82

done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i

82

done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i

83

84

kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")

84

kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")

85

return if kw_regexp.blank?

85

return if kw_regexp.blank?

86

87

referenced_issues = []

87

referenced_issues = []

88

89

if ref_keywords.delete('*')

89

if ref_keywords.delete('*')

90

# find any issue ID in the comments

90

# find any issue ID in the comments

91

target_issue_ids = []

91

target_issue_ids = []

92

comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }

92

comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }

93

referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)

93

referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)

94

end

94

end

95

96

comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|

96

comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|

97

action = match[0]

97

action = match[0]

98

target_issue_ids = match[1].scan(/\d+/)

98

target_issue_ids = match[1].scan(/\d+/)

99

target_issues = repository.project.issues.find_all_by_id(target_issue_ids)

99

target_issues = repository.project.issues.find_all_by_id(target_issue_ids)

100

if fix_status && fix_keywords.include?(action.downcase)

100

if fix_status && fix_keywords.include?(action.downcase)

101

# update status of issues

101

# update status of issues

102

logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?

102

logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?

103

target_issues.each do |issue|

103

target_issues.each do |issue|

104

# the issue may have been updated by the closure of another one (eg. duplicate)

104

# the issue may have been updated by the closure of another one (eg. duplicate)

105

issue.reload

105

issue.reload

106

# don't change the status is the issue is closed

106

# don't change the status is the issue is closed

107

next if issue.status.is_closed?

107

next if issue.status.is_closed?

108

csettext = "r#{self.revision}"

108

csettext = "r#{self.revision}"

109

if self.scmid && (! (csettext =~ /^r[0-9]+$/))

109

if self.scmid && (! (csettext =~ /^r[0-9]+$/))

110

csettext = "commit:\"#{self.scmid}\""

110

csettext = "commit:\"#{self.scmid}\""

111

end

111

end

112

journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))

112

journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))

113

issue.status = fix_status

113

issue.status = fix_status

114

issue.done_ratio = done_ratio if done_ratio

114

issue.done_ratio = done_ratio if done_ratio

115

Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,

116

{ :changeset => self, :issue => issue })

115

issue.save

117

issue.save

116

end

118

end

117

end

119

end

118

referenced_issues += target_issues

120

referenced_issues += target_issues

119

end

121

end

120

122

121

self.issues = referenced_issues.uniq

123

self.issues = referenced_issues.uniq

122

end

124

end

123

125

124

def short_comments

126

def short_comments

125

@short_comments || split_comments.first

127

@short_comments || split_comments.first

126

end

128

end

127

129

128

def long_comments

130

def long_comments

129

@long_comments || split_comments.last

131

@long_comments || split_comments.last

130

end

132

end

131

133

132

# Returns the previous changeset

134

# Returns the previous changeset

133

def previous

135

def previous

134

@previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')

136

@previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')

135

end

137

end

136

138

137

# Returns the next changeset

139

# Returns the next changeset

138

def next

140

def next

139

@next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')

141

@next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')

140

end

142

end

141

143

142

# Strips and reencodes a commit log before insertion into the database

144

# Strips and reencodes a commit log before insertion into the database

143

def self.normalize_comments(str)

145

def self.normalize_comments(str)

144

to_utf8(str.to_s.strip)

146

to_utf8(str.to_s.strip)

145

end

147

end

146

148

147

private

149

private

148

150

149

def split_comments

151

def split_comments

150

comments =~ /\A(.+?)\r?\n(.*)$/m

152

comments =~ /\A(.+?)\r?\n(.*)$/m

151

@short_comments = $1 || comments

153

@short_comments = $1 || comments

152

@long_comments = $2.to_s.strip

154

@long_comments = $2.to_s.strip

153

return @short_comments, @long_comments

155

return @short_comments, @long_comments

154

end

156

end

155

157

156

def self.to_utf8(str)

158

def self.to_utf8(str)

157

return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii

159

return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii

158

encoding = Setting.commit_logs_encoding.to_s.strip

160

encoding = Setting.commit_logs_encoding.to_s.strip

159

unless encoding.blank? || encoding == 'UTF-8'

161

unless encoding.blank? || encoding == 'UTF-8'

160

begin

162

begin

161

return Iconv.conv('UTF-8', encoding, str)

163

return Iconv.conv('UTF-8', encoding, str)

162

rescue Iconv::Failure

164

rescue Iconv::Failure

163

# do nothing here

165

# do nothing here

164

end

166

end

165

end

167

end

166

str

168

str

167

end

169

end

168

end

170

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-2008  Jean-Philippe Lang
             #
             # 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 'iconv'
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               belongs_to :user
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
                             :description => :long_comments,
                             :datetime => :committed_on,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :rev => o.revision}}
               acts_as_searchable :columns => 'comments',
                                  :include => {:repository => :project},
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => [:user, {:repository => :project}]}
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
               def comments=(comment)
                 write_attribute(:comments, Changeset.normalize_comments(comment))
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def project
                 repository.project
               end
               def author
                 user || committer.to_s.split('<').first
               end
               def before_create
                 self.user = repository.find_committer_user(committer)
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               require 'pp'
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                 # status and optional done ratio applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                 done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 return if kw_regexp.blank?
                 referenced_issues = []
                 if ref_keywords.delete('*')
                   # find any issue ID in the comments
                   target_issue_ids = []
                   comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
                   referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
                 end
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # the issue may have been updated by the closure of another one (eg. duplicate)
                       issue.reload
                       # don't change the status is the issue is closed
                       next if issue.status.is_closed?
                       csettext = "r#{self.revision}"
                       if self.scmid && (! (csettext =~ /^r[0-9]+$/))
                         csettext = "commit:\"#{self.scmid}\""
                       end
                       journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
                       issue.status = fix_status
                       issue.done_ratio = done_ratio if done_ratio
+                      Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
+                                              { :changeset => self, :issue => issue })
                       issue.save
                     end
                   end
                   referenced_issues += target_issues
                 end
                 self.issues = referenced_issues.uniq
               end
               def short_comments
                 @short_comments || split_comments.first
               end
               def long_comments
                 @long_comments || split_comments.last
               end
               # Returns the previous changeset
               def previous
                 @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
               end
               # Returns the next changeset
               def next
                 @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
               end
               # Strips and reencodes a commit log before insertion into the database
               def self.normalize_comments(str)
                 to_utf8(str.to_s.strip)
               end
               private
               def split_comments
                 comments =~ /\A(.+?)\r?\n(.*)$/m
                 @short_comments = $1 || comments
                 @long_comments = $2.to_s.strip
                 return @short_comments, @long_comments
               end
               def self.to_utf8(str)
                 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
                 encoding = Setting.commit_logs_encoding.to_s.strip
                 unless encoding.blank? || encoding == 'UTF-8'
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here
                   end
                 end
                 str
               end
             end