##// END OF EJS Templates
jro_apps » redmine
RSS
Reject empty Mercurial entries (#4098)....
Jean-Philippe Lang -
r2915:22d12032e75d
parent child
Show More
Side by Side Unified
Context file:
r2915:22d12032e75d Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,205 +1,205
1 # redMine - project management software
1 # redMine - project management software
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
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
17
18 require 'redmine/scm/adapters/abstract_adapter'
18 require 'redmine/scm/adapters/abstract_adapter'
19
19
20 module Redmine
20 module Redmine
21 module Scm
21 module Scm
22 module Adapters
22 module Adapters
23 class MercurialAdapter < AbstractAdapter
23 class MercurialAdapter < AbstractAdapter
24
24
25 # Mercurial executable name
25 # Mercurial executable name
26 HG_BIN = "hg"
26 HG_BIN = "hg"
27 TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
27 TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
28 TEMPLATE_NAME = "hg-template"
28 TEMPLATE_NAME = "hg-template"
29 TEMPLATE_EXTENSION = "tmpl"
29 TEMPLATE_EXTENSION = "tmpl"
30
30
31 class << self
31 class << self
32 def client_version
32 def client_version
33 @@client_version ||= (hgversion || [])
33 @@client_version ||= (hgversion || [])
34 end
34 end
35
35
36 def hgversion
36 def hgversion
37 # The hg version is expressed either as a
37 # The hg version is expressed either as a
38 # release number (eg 0.9.5 or 1.0) or as a revision
38 # release number (eg 0.9.5 or 1.0) or as a revision
39 # id composed of 12 hexa characters.
39 # id composed of 12 hexa characters.
40 theversion = hgversion_from_command_line
40 theversion = hgversion_from_command_line
41 if theversion.match(/^\d+(\.\d+)+/)
41 if theversion.match(/^\d+(\.\d+)+/)
42 theversion.split(".").collect(&:to_i)
42 theversion.split(".").collect(&:to_i)
43 end
43 end
44 end
44 end
45
45
46 def hgversion_from_command_line
46 def hgversion_from_command_line
47 %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
47 %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
48 end
48 end
49
49
50 def template_path
50 def template_path
51 @@template_path ||= template_path_for(client_version)
51 @@template_path ||= template_path_for(client_version)
52 end
52 end
53
53
54 def template_path_for(version)
54 def template_path_for(version)
55 if ((version <=> [0,9,5]) > 0) || version.empty?
55 if ((version <=> [0,9,5]) > 0) || version.empty?
56 ver = "1.0"
56 ver = "1.0"
57 else
57 else
58 ver = "0.9.5"
58 ver = "0.9.5"
59 end
59 end
60 "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
60 "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
61 end
61 end
62 end
62 end
63
63
64 def info
64 def info
65 cmd = "#{HG_BIN} -R #{target('')} root"
65 cmd = "#{HG_BIN} -R #{target('')} root"
66 root_url = nil
66 root_url = nil
67 shellout(cmd) do |io|
67 shellout(cmd) do |io|
68 root_url = io.gets
68 root_url = io.gets
69 end
69 end
70 return nil if $? && $?.exitstatus != 0
70 return nil if $? && $?.exitstatus != 0
71 info = Info.new({:root_url => root_url.chomp,
71 info = Info.new({:root_url => root_url.chomp,
72 :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
72 :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
73 })
73 })
74 info
74 info
75 rescue CommandFailed
75 rescue CommandFailed
76 return nil
76 return nil
77 end
77 end
78
78
79 def entries(path=nil, identifier=nil)
79 def entries(path=nil, identifier=nil)
80 path ||= ''
80 path ||= ''
81 entries = Entries.new
81 entries = Entries.new
82 cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
82 cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
83 cmd << " -r " + (identifier ? identifier.to_s : "tip")
83 cmd << " -r " + (identifier ? identifier.to_s : "tip")
84 cmd << " " + shell_quote("path:#{path}") unless path.empty?
84 cmd << " " + shell_quote("path:#{path}") unless path.empty?
85 shellout(cmd) do |io|
85 shellout(cmd) do |io|
86 io.each_line do |line|
86 io.each_line do |line|
87 # HG uses antislashs as separator on Windows
87 # HG uses antislashs as separator on Windows
88 line = line.gsub(/\\/, "/")
88 line = line.gsub(/\\/, "/")
89 if path.empty? or e = line.gsub!(%r{^#{with_trailling_slash(path)}},'')
89 if path.empty? or e = line.gsub!(%r{^#{with_trailling_slash(path)}},'')
90 e ||= line
90 e ||= line
91 e = e.chomp.split(%r{[\/\\]})
91 e = e.chomp.split(%r{[\/\\]})
92 entries << Entry.new({:name => e.first,
92 entries << Entry.new({:name => e.first,
93 :path => (path.nil? or path.empty? ? e.first : "#{with_trailling_slash(path)}#{e.first}"),
93 :path => (path.nil? or path.empty? ? e.first : "#{with_trailling_slash(path)}#{e.first}"),
94 :kind => (e.size > 1 ? 'dir' : 'file'),
94 :kind => (e.size > 1 ? 'dir' : 'file'),
95 :lastrev => Revision.new
95 :lastrev => Revision.new
96 }) unless entries.detect{|entry| entry.name == e.first}
96 }) unless e.empty? || entries.detect{|entry| entry.name == e.first}
97 end
97 end
98 end
98 end
99 end
99 end
100 return nil if $? && $?.exitstatus != 0
100 return nil if $? && $?.exitstatus != 0
101 entries.sort_by_name
101 entries.sort_by_name
102 end
102 end
103
103
104 # Fetch the revisions by using a template file that
104 # Fetch the revisions by using a template file that
105 # makes Mercurial produce a xml output.
105 # makes Mercurial produce a xml output.
106 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
106 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
107 revisions = Revisions.new
107 revisions = Revisions.new
108 cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
108 cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
109 if identifier_from && identifier_to
109 if identifier_from && identifier_to
110 cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
110 cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
111 elsif identifier_from
111 elsif identifier_from
112 cmd << " -r #{identifier_from.to_i}:"
112 cmd << " -r #{identifier_from.to_i}:"
113 end
113 end
114 cmd << " --limit #{options[:limit].to_i}" if options[:limit]
114 cmd << " --limit #{options[:limit].to_i}" if options[:limit]
115 cmd << " #{path}" if path
115 cmd << " #{path}" if path
116 shellout(cmd) do |io|
116 shellout(cmd) do |io|
117 begin
117 begin
118 # HG doesn't close the XML Document...
118 # HG doesn't close the XML Document...
119 doc = REXML::Document.new(io.read << "</log>")
119 doc = REXML::Document.new(io.read << "</log>")
120 doc.elements.each("log/logentry") do |logentry|
120 doc.elements.each("log/logentry") do |logentry|
121 paths = []
121 paths = []
122 copies = logentry.get_elements('paths/path-copied')
122 copies = logentry.get_elements('paths/path-copied')
123 logentry.elements.each("paths/path") do |path|
123 logentry.elements.each("paths/path") do |path|
124 # Detect if the added file is a copy
124 # Detect if the added file is a copy
125 if path.attributes['action'] == 'A' and c = copies.find{ |e| e.text == path.text }
125 if path.attributes['action'] == 'A' and c = copies.find{ |e| e.text == path.text }
126 from_path = c.attributes['copyfrom-path']
126 from_path = c.attributes['copyfrom-path']
127 from_rev = logentry.attributes['revision']
127 from_rev = logentry.attributes['revision']
128 end
128 end
129 paths << {:action => path.attributes['action'],
129 paths << {:action => path.attributes['action'],
130 :path => "/#{path.text}",
130 :path => "/#{path.text}",
131 :from_path => from_path ? "/#{from_path}" : nil,
131 :from_path => from_path ? "/#{from_path}" : nil,
132 :from_revision => from_rev ? from_rev : nil
132 :from_revision => from_rev ? from_rev : nil
133 }
133 }
134 end
134 end
135 paths.sort! { |x,y| x[:path] <=> y[:path] }
135 paths.sort! { |x,y| x[:path] <=> y[:path] }
136
136
137 revisions << Revision.new({:identifier => logentry.attributes['revision'],
137 revisions << Revision.new({:identifier => logentry.attributes['revision'],
138 :scmid => logentry.attributes['node'],
138 :scmid => logentry.attributes['node'],
139 :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
139 :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
140 :time => Time.parse(logentry.elements['date'].text).localtime,
140 :time => Time.parse(logentry.elements['date'].text).localtime,
141 :message => logentry.elements['msg'].text,
141 :message => logentry.elements['msg'].text,
142 :paths => paths
142 :paths => paths
143 })
143 })
144 end
144 end
145 rescue
145 rescue
146 logger.debug($!)
146 logger.debug($!)
147 end
147 end
148 end
148 end
149 return nil if $? && $?.exitstatus != 0
149 return nil if $? && $?.exitstatus != 0
150 revisions
150 revisions
151 end
151 end
152
152
153 def diff(path, identifier_from, identifier_to=nil)
153 def diff(path, identifier_from, identifier_to=nil)
154 path ||= ''
154 path ||= ''
155 if identifier_to
155 if identifier_to
156 identifier_to = identifier_to.to_i
156 identifier_to = identifier_to.to_i
157 else
157 else
158 identifier_to = identifier_from.to_i - 1
158 identifier_to = identifier_from.to_i - 1
159 end
159 end
160 cmd = "#{HG_BIN} -R #{target('')} diff -r #{identifier_to} -r #{identifier_from} --nodates"
160 cmd = "#{HG_BIN} -R #{target('')} diff -r #{identifier_to} -r #{identifier_from} --nodates"
161 cmd << " -I #{target(path)}" unless path.empty?
161 cmd << " -I #{target(path)}" unless path.empty?
162 diff = []
162 diff = []
163 shellout(cmd) do |io|
163 shellout(cmd) do |io|
164 io.each_line do |line|
164 io.each_line do |line|
165 diff << line
165 diff << line
166 end
166 end
167 end
167 end
168 return nil if $? && $?.exitstatus != 0
168 return nil if $? && $?.exitstatus != 0
169 diff
169 diff
170 end
170 end
171
171
172 def cat(path, identifier=nil)
172 def cat(path, identifier=nil)
173 cmd = "#{HG_BIN} -R #{target('')} cat"
173 cmd = "#{HG_BIN} -R #{target('')} cat"
174 cmd << " -r " + (identifier ? identifier.to_s : "tip")
174 cmd << " -r " + (identifier ? identifier.to_s : "tip")
175 cmd << " #{target(path)}"
175 cmd << " #{target(path)}"
176 cat = nil
176 cat = nil
177 shellout(cmd) do |io|
177 shellout(cmd) do |io|
178 io.binmode
178 io.binmode
179 cat = io.read
179 cat = io.read
180 end
180 end
181 return nil if $? && $?.exitstatus != 0
181 return nil if $? && $?.exitstatus != 0
182 cat
182 cat
183 end
183 end
184
184
185 def annotate(path, identifier=nil)
185 def annotate(path, identifier=nil)
186 path ||= ''
186 path ||= ''
187 cmd = "#{HG_BIN} -R #{target('')}"
187 cmd = "#{HG_BIN} -R #{target('')}"
188 cmd << " annotate -n -u"
188 cmd << " annotate -n -u"
189 cmd << " -r " + (identifier ? identifier.to_s : "tip")
189 cmd << " -r " + (identifier ? identifier.to_s : "tip")
190 cmd << " -r #{identifier.to_i}" if identifier
190 cmd << " -r #{identifier.to_i}" if identifier
191 cmd << " #{target(path)}"
191 cmd << " #{target(path)}"
192 blame = Annotate.new
192 blame = Annotate.new
193 shellout(cmd) do |io|
193 shellout(cmd) do |io|
194 io.each_line do |line|
194 io.each_line do |line|
195 next unless line =~ %r{^([^:]+)\s(\d+):(.*)$}
195 next unless line =~ %r{^([^:]+)\s(\d+):(.*)$}
196 blame.add_line($3.rstrip, Revision.new(:identifier => $2.to_i, :author => $1.strip))
196 blame.add_line($3.rstrip, Revision.new(:identifier => $2.to_i, :author => $1.strip))
197 end
197 end
198 end
198 end
199 return nil if $? && $?.exitstatus != 0
199 return nil if $? && $?.exitstatus != 0
200 blame
200 blame
201 end
201 end
202 end
202 end
203 end
203 end
204 end
204 end
205 end
205 end
General Comments 0
You need to be logged in to leave comments. Login now