##// END OF EJS Templates
jro_apps » redmine
RSS
scm: mercurial: diff '-c' option supports above Mercurial 1.2 (#3724, #7253)....
Toshi MARUYAMA -
r4566:a6f05b5e56fd
parent child
Show More
Side by Side Unified
Context file:
r4566:a6f05b5e56fd Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,221 +1,225
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require 'redmine/scm/adapters/abstract_adapter'
19 19 require 'cgi'
20 20
21 21 module Redmine
22 22 module Scm
23 23 module Adapters
24 24 class MercurialAdapter < AbstractAdapter
25 25
26 26 # Mercurial executable name
27 27 HG_BIN = "hg"
28 28 TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
29 29 TEMPLATE_NAME = "hg-template"
30 30 TEMPLATE_EXTENSION = "tmpl"
31 31
32 32 class << self
33 33 def client_version
34 34 @@client_version ||= (hgversion || [])
35 35 end
36 36
37 37 def hgversion
38 38 # The hg version is expressed either as a
39 39 # release number (eg 0.9.5 or 1.0) or as a revision
40 40 # id composed of 12 hexa characters.
41 41 theversion = hgversion_from_command_line
42 42 if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
43 43 m[2].scan(%r{\d+}).collect(&:to_i)
44 44 end
45 45 end
46 46
47 47 def hgversion_from_command_line
48 48 shellout("#{HG_BIN} --version") { |io| io.read }.to_s
49 49 end
50 50
51 51 def template_path
52 52 @@template_path ||= template_path_for(client_version)
53 53 end
54 54
55 55 def template_path_for(version)
56 56 if ((version <=> [0,9,5]) > 0) || version.empty?
57 57 ver = "1.0"
58 58 else
59 59 ver = "0.9.5"
60 60 end
61 61 "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
62 62 end
63 63 end
64 64
65 65 def info
66 66 cmd = "#{HG_BIN} -R #{target('')} root"
67 67 root_url = nil
68 68 shellout(cmd) do |io|
69 69 root_url = io.read
70 70 end
71 71 return nil if $? && $?.exitstatus != 0
72 72 info = Info.new({:root_url => root_url.chomp,
73 73 :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
74 74 })
75 75 info
76 76 rescue CommandFailed
77 77 return nil
78 78 end
79 79
80 80 def entries(path=nil, identifier=nil)
81 81 path ||= ''
82 82 entries = Entries.new
83 83 cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
84 84 cmd << " -r #{hgrev(identifier)}"
85 85 cmd << " " + shell_quote("path:#{path}") unless path.empty?
86 86 shellout(cmd) do |io|
87 87 io.each_line do |line|
88 88 # HG uses antislashs as separator on Windows
89 89 line = line.gsub(/\\/, "/")
90 90 if path.empty? or e = line.gsub!(%r{^#{with_trailling_slash(path)}},'')
91 91 e ||= line
92 92 e = e.chomp.split(%r{[\/\\]})
93 93 entries << Entry.new({:name => e.first,
94 94 :path => (path.nil? or path.empty? ? e.first : "#{with_trailling_slash(path)}#{e.first}"),
95 95 :kind => (e.size > 1 ? 'dir' : 'file'),
96 96 :lastrev => Revision.new
97 97 }) unless e.empty? || entries.detect{|entry| entry.name == e.first}
98 98 end
99 99 end
100 100 end
101 101 return nil if $? && $?.exitstatus != 0
102 102 entries.sort_by_name
103 103 end
104 104
105 105 # Fetch the revisions by using a template file that
106 106 # makes Mercurial produce a xml output.
107 107 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
108 108 revisions = Revisions.new
109 109 cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
110 110 if identifier_from && identifier_to
111 111 cmd << " -r #{hgrev(identifier_from)}:#{hgrev(identifier_to)}"
112 112 elsif identifier_from
113 113 cmd << " -r #{hgrev(identifier_from)}:"
114 114 end
115 115 cmd << " --limit #{options[:limit].to_i}" if options[:limit]
116 116 cmd << " #{shell_quote path}" unless path.blank?
117 117 shellout(cmd) do |io|
118 118 begin
119 119 # HG doesn't close the XML Document...
120 120 doc = REXML::Document.new(io.read << "</log>")
121 121 doc.elements.each("log/logentry") do |logentry|
122 122 paths = []
123 123 copies = logentry.get_elements('paths/path-copied')
124 124 logentry.elements.each("paths/path") do |path|
125 125 # Detect if the added file is a copy
126 126 if path.attributes['action'] == 'A' and c = copies.find{ |e| e.text == path.text }
127 127 from_path = c.attributes['copyfrom-path']
128 128 from_rev = logentry.attributes['revision']
129 129 end
130 130 paths << {:action => path.attributes['action'],
131 131 :path => "/#{CGI.unescape(path.text)}",
132 132 :from_path => from_path ? "/#{CGI.unescape(from_path)}" : nil,
133 133 :from_revision => from_rev ? from_rev : nil
134 134 }
135 135 end
136 136 paths.sort! { |x,y| x[:path] <=> y[:path] }
137 137
138 138 revisions << Revision.new({:identifier => logentry.attributes['revision'],
139 139 :scmid => logentry.attributes['node'],
140 140 :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
141 141 :time => Time.parse(logentry.elements['date'].text).localtime,
142 142 :message => logentry.elements['msg'].text,
143 143 :paths => paths
144 144 })
145 145 end
146 146 rescue
147 147 logger.debug($!)
148 148 end
149 149 end
150 150 return nil if $? && $?.exitstatus != 0
151 151 revisions
152 152 end
153 153
154 154 def diff(path, identifier_from, identifier_to=nil)
155 155 path ||= ''
156 156 diff_args = ''
157 diff = []
157 158 if identifier_to
158 159 diff_args = "-r #{hgrev(identifier_to)} -r #{hgrev(identifier_from)}"
159 160 else
160 diff_args = "-c #{hgrev(identifier_from)}"
161 if self.class.client_version_above?([1, 2])
162 diff_args = "-c #{hgrev(identifier_from)}"
163 else
164 return []
165 end
161 166 end
162 167 cmd = "#{HG_BIN} -R #{target('')} diff --nodates --git #{diff_args}"
163 168 cmd << " -I #{target(path)}" unless path.empty?
164 diff = []
165 169 shellout(cmd) do |io|
166 170 io.each_line do |line|
167 171 diff << line
168 172 end
169 173 end
170 174 return nil if $? && $?.exitstatus != 0
171 175 diff
172 176 end
173 177
174 178 def cat(path, identifier=nil)
175 179 cmd = "#{HG_BIN} -R #{target('')} cat"
176 180 cmd << " -r #{hgrev(identifier)}"
177 181 cmd << " #{target(path)}"
178 182 cat = nil
179 183 shellout(cmd) do |io|
180 184 io.binmode
181 185 cat = io.read
182 186 end
183 187 return nil if $? && $?.exitstatus != 0
184 188 cat
185 189 end
186 190
187 191 def annotate(path, identifier=nil)
188 192 path ||= ''
189 193 cmd = "#{HG_BIN} -R #{target('')}"
190 194 cmd << " annotate -ncu"
191 195 cmd << " -r #{hgrev(identifier)}"
192 196 cmd << " #{target(path)}"
193 197 blame = Annotate.new
194 198 shellout(cmd) do |io|
195 199 io.each_line do |line|
196 200 next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
197 201 r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
198 202 :identifier => $3)
199 203 blame.add_line($4.rstrip, r)
200 204 end
201 205 end
202 206 return nil if $? && $?.exitstatus != 0
203 207 blame
204 208 end
205 209
206 210 class Revision < Redmine::Scm::Adapters::Revision
207 211 # Returns the readable identifier
208 212 def format_identifier
209 213 "#{revision}:#{scmid}"
210 214 end
211 215 end
212 216
213 217 # Returns correct revision identifier
214 218 def hgrev(identifier)
215 219 shell_quote(identifier.blank? ? 'tip' : identifier.to_s)
216 220 end
217 221 private :hgrev
218 222 end
219 223 end
220 224 end
221 225 end
Show file before | Show file after | Hide comments
@@ -1,176 +1,180
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2008 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19 require 'repositories_controller'
20 20
21 21 # Re-raise errors caught by the controller.
22 22 class RepositoriesController; def rescue_action(e) raise e end; end
23 23
24 24 class RepositoriesMercurialControllerTest < ActionController::TestCase
25 25 fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
26 26
27 27 # No '..' in the repository path
28 28 REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
29 29
30 30 def setup
31 31 @controller = RepositoriesController.new
32 32 @request = ActionController::TestRequest.new
33 33 @response = ActionController::TestResponse.new
34 34 User.current = nil
35 Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
35 @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
36 assert @repository
36 37 end
37
38
38 39 if File.directory?(REPOSITORY_PATH)
39 40 def test_show
40 41 get :show, :id => 3
41 42 assert_response :success
42 43 assert_template 'show'
43 44 assert_not_nil assigns(:entries)
44 45 assert_not_nil assigns(:changesets)
45 46 end
46 47
47 48 def test_show_root
48 49 get :show, :id => 3
49 50 assert_response :success
50 51 assert_template 'show'
51 52 assert_not_nil assigns(:entries)
52 53 assert_equal 4, assigns(:entries).size
53 54 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
54 55 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
55 56 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
56 57 end
57 58
58 59 def test_show_directory
59 60 get :show, :id => 3, :path => ['images']
60 61 assert_response :success
61 62 assert_template 'show'
62 63 assert_not_nil assigns(:entries)
63 64 assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
64 65 entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
65 66 assert_not_nil entry
66 67 assert_equal 'file', entry.kind
67 68 assert_equal 'images/edit.png', entry.path
68 69 end
69 70
70 71 def test_show_at_given_revision
71 72 [0, '0', '0885933ad4f6'].each do |r1|
72 73 get :show, :id => 3, :path => ['images'], :rev => r1
73 74 assert_response :success
74 75 assert_template 'show'
75 76 assert_not_nil assigns(:entries)
76 77 assert_equal ['delete.png'], assigns(:entries).collect(&:name)
77 78 end
78 79 end
79 80
80 81 def test_show_directory_sql_escape_percent
81 82 [13, '13', '3a330eb32958'].each do |r1|
82 83 get :show, :id => 3, :path => ['sql_escape', 'percent%dir'], :rev => r1
83 84 assert_response :success
84 85 assert_template 'show'
85 86
86 87 assert_not_nil assigns(:entries)
87 88 assert_equal ['percent%file1.txt', 'percentfile1.txt'], assigns(:entries).collect(&:name)
88 89 changesets = assigns(:changesets)
89 90
90 91 ## This is not yet implemented.
91 92 # assert_not_nil changesets
92 93 # assert_equal %w(13 11 10 9), changesets.collect(&:revision)
93 94 end
94 95 end
95 96
96 97 def test_changes
97 98 get :changes, :id => 3, :path => ['images', 'edit.png']
98 99 assert_response :success
99 100 assert_template 'changes'
100 101 assert_tag :tag => 'h2', :content => 'edit.png'
101 102 end
102 103
103 104 def test_entry_show
104 105 get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
105 106 assert_response :success
106 107 assert_template 'entry'
107 108 # Line 10
108 109 assert_tag :tag => 'th',
109 110 :content => '10',
110 111 :attributes => { :class => 'line-num' },
111 112 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
112 113 end
113 114
114 115 def test_entry_download
115 116 get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
116 117 assert_response :success
117 118 # File content
118 119 assert @response.body.include?('WITHOUT ANY WARRANTY')
119 120 end
120 121
121 122 def test_directory_entry
122 123 get :entry, :id => 3, :path => ['sources']
123 124 assert_response :success
124 125 assert_template 'show'
125 126 assert_not_nil assigns(:entry)
126 127 assert_equal 'sources', assigns(:entry).name
127 128 end
128 129
129 130 def test_diff
130 131 [4, '4', 'def6d2f1254a'].each do |r1|
131 132 # Full diff of changeset 4
132 133 get :diff, :id => 3, :rev => 4
133 134 assert_response :success
134 135 assert_template 'diff'
135 # Line 22 removed
136 assert_tag :tag => 'th',
137 :content => '22',
138 :sibling => { :tag => 'td',
139 :attributes => { :class => /diff_out/ },
140 :content => /def remove/ }
136
137 if @repository.scm.class.client_version_above?([1, 2])
138 # Line 22 removed
139 assert_tag :tag => 'th',
140 :content => '22',
141 :sibling => { :tag => 'td',
142 :attributes => { :class => /diff_out/ },
143 :content => /def remove/ }
144 end
141 145 end
142 146 end
143 147
144 148 def test_annotate
145 149 get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
146 150 assert_response :success
147 151 assert_template 'annotate'
148 152 # Line 23, revision 4:def6d2f1254a
149 153 assert_tag :tag => 'th',
150 154 :content => '23',
151 155 :attributes => { :class => 'line-num' },
152 156 :sibling =>
153 157 {
154 158 :tag => 'td',
155 159 :attributes => { :class => 'revision' },
156 160 :child => { :tag => 'a', :content => '4:def6d2f1254a' }
157 161 }
158 162 assert_tag :tag => 'th',
159 163 :content => '23',
160 164 :attributes => { :class => 'line-num' },
161 165 :sibling =>
162 166 {
163 167 :tag => 'td' ,
164 168 :content => 'jsmith' ,
165 169 :attributes => { :class => 'author' },
166 170 }
167 171 assert_tag :tag => 'th',
168 172 :content => '23',
169 173 :attributes => { :class => 'line-num' },
170 174 :sibling => { :tag => 'td', :content => /watcher =/ }
171 175 end
172 176 else
173 177 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
174 178 def test_fake; assert true end
175 179 end
176 180 end
Show file before | Show file after | Hide comments
@@ -1,124 +1,130
1 1 require File.expand_path('../../../../../../test_helper', __FILE__)
2 2 begin
3 3 require 'mocha'
4 4
5 5 class MercurialAdapterTest < ActiveSupport::TestCase
6 6
7 7 TEMPLATES_DIR = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATES_DIR
8 8 TEMPLATE_NAME = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME
9 9 TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION
10 10
11 11 REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
12 12
13 13 if File.directory?(REPOSITORY_PATH)
14 14 def setup
15 15 @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
16 16 end
17 17
18 18 def test_hgversion
19 19 to_test = { "Mercurial Distributed SCM (version 0.9.5)\n" => [0,9,5],
20 20 "Mercurial Distributed SCM (1.0)\n" => [1,0],
21 21 "Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil,
22 22 "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1],
23 23 "Mercurial Distributed SCM (1916e629a29d)\n" => nil,
24 24 "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5],
25 25 "(1.6)\n(1.7)\n(1.8)" => [1,6],
26 26 "(1.7.1)\r\n(1.8.1)\r\n(1.9.1)" => [1,7,1]}
27 27
28 28 to_test.each do |s, v|
29 29 test_hgversion_for(s, v)
30 30 end
31 31 end
32 32
33 33 def test_template_path
34 34 to_test = { [0,9,5] => "0.9.5",
35 35 [1,0] => "1.0",
36 36 [] => "1.0",
37 37 [1,0,1] => "1.0",
38 38 [1,7] => "1.0",
39 39 [1,7,1] => "1.0" }
40 40 to_test.each do |v, template|
41 41 test_template_path_for(v, template)
42 42 end
43 43 end
44 44
45 45 def test_diff
46 assert_nil @adapter.diff(nil, '100000')
46 if @adapter.class.client_version_above?([1, 2])
47 assert_nil @adapter.diff(nil, '100000')
48 end
47 49 assert_nil @adapter.diff(nil, '100000', '200000')
48 50 [2, '400bb8672109', '400', 400].each do |r1|
49 51 diff1 = @adapter.diff(nil, r1)
50 assert_equal 28, diff1.size
51 buf = diff1[24].gsub(/\r\n|\r|\n/, "")
52 assert_equal "+ return true unless klass.respond_to?('watched_by')", buf
52 if @adapter.class.client_version_above?([1, 2])
53 assert_equal 28, diff1.size
54 buf = diff1[24].gsub(/\r\n|\r|\n/, "")
55 assert_equal "+ return true unless klass.respond_to?('watched_by')", buf
56 else
57 assert_equal 0, diff1.size
58 end
53 59 [4, 'def6d2f1254a'].each do |r2|
54 60 diff2 = @adapter.diff(nil,r1,r2)
55 61 assert_equal 50, diff2.size
56 62 buf = diff2[42].gsub(/\r\n|\r|\n/, "")
57 63 assert_equal "+class WelcomeController < ApplicationController", buf
58 64 diff3 = @adapter.diff('sources/watchers_controller.rb', r1, r2)
59 65 assert_equal 20, diff3.size
60 66 buf = diff3[12].gsub(/\r\n|\r|\n/, "")
61 67 assert_equal "+ @watched.remove_watcher(user)", buf
62 68 end
63 69 end
64 70 end
65 71
66 72 def test_cat
67 73 [2, '400bb8672109', '400', 400].each do |r|
68 74 buf = @adapter.cat('sources/welcome_controller.rb', r)
69 75 assert buf
70 76 lines = buf.split("\r\n")
71 77 assert_equal 25, lines.length
72 78 assert_equal 'class WelcomeController < ApplicationController', lines[17]
73 79 end
74 80 assert_nil @adapter.cat('sources/welcome_controller.rb')
75 81 end
76 82
77 83 def test_annotate
78 84 assert_equal [], @adapter.annotate("sources/welcome_controller.rb").lines
79 85 [2, '400bb8672109', '400', 400].each do |r|
80 86 ann = @adapter.annotate('sources/welcome_controller.rb', r)
81 87 assert ann
82 88 assert_equal '1', ann.revisions[17].revision
83 89 assert_equal '9d5b5b004199', ann.revisions[17].identifier
84 90 assert_equal 'jsmith', ann.revisions[0].author
85 91 assert_equal 25, ann.lines.length
86 92 assert_equal 'class WelcomeController < ApplicationController', ann.lines[17]
87 93 end
88 94 end
89 95
90 96 def test_access_by_nodeid
91 97 path = 'sources/welcome_controller.rb'
92 98 assert_equal @adapter.cat(path, 2), @adapter.cat(path, '400bb8672109')
93 99 end
94 100
95 101 def test_access_by_fuzzy_nodeid
96 102 path = 'sources/welcome_controller.rb'
97 103 # falls back to nodeid
98 104 assert_equal @adapter.cat(path, 2), @adapter.cat(path, '400')
99 105 end
100 106
101 107 private
102 108
103 109 def test_hgversion_for(hgversion, version)
104 110 @adapter.class.expects(:hgversion_from_command_line).returns(hgversion)
105 111 assert_equal version, @adapter.class.hgversion
106 112 end
107 113
108 114 def test_template_path_for(version, template)
109 115 assert_equal "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{template}.#{TEMPLATE_EXTENSION}",
110 116 @adapter.class.template_path_for(version)
111 117 assert File.exist?(@adapter.class.template_path_for(version))
112 118 end
113 119 else
114 120 puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
115 121 def test_fake; assert true end
116 122 end
117 123 end
118 124
119 125 rescue LoadError
120 126 class MercurialMochaFake < ActiveSupport::TestCase
121 127 def test_fake; assert(false, "Requires mocha to run those tests") end
122 128 end
123 129 end
124 130
General Comments 0
You need to be logged in to leave comments. Login now