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