@@ -5,8 +5,8 @@ module TinyGit arguments.unshift(sha) command_lines(:ls_tree, *arguments).map do |line| (info, path) = line.split("\t") - (mode, type, sha) = info.split - {:sha => sha, :path => path, :type => type, :mode => mode} + (mode, type, sha) = info.split + {:sha => sha, :path => unescape(path), :type => type, :mode => mode} end end @@ -36,9 +36,9 @@ module TinyGit def command(cmd, *args) opt_args = transform_options(args.extract_options!) - ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : "'#{escape(a)}'" } + ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : escape(a) } - call = "#{TinyGit.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}" + call = "#{TinyGit.git_binary} --git-dir=#{escape(self.git_dir)} #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}" run_command(call) end @@ -75,7 +75,14 @@ module TinyGit end def escape(s) - "'" + s.to_s.gsub('\'', '\'\\\'\'') + "'" + s.to_s.inspect + end + + UNESCAPE_MAP = { '\\\\' => '\\', '\\"' => '"' } + + def unescape(s) + return s unless s =~ /["]/ + s.gsub(/^["]/, '').gsub(/["]$/, '').gsub(/(\\\\|\\["])/) { UNESCAPE_MAP[$1] } end def raise_execution_error(status, output, call) vendor/plugins/tiny-git/lib/tiny_git/commands.rb @@ -13,7 +13,7 @@ describe 'TinyGit - Caching' do TinyGit.result_cache.should == {} TinyGit.cache do 3.times { TEST_REP.rev_parse 'HEAD' } - TinyGit.result_cache.should == { "/usr/bin/env git --git-dir='#{TEST_REP.git_dir}' rev-parse ''HEAD''"=>"[RESULT]" } + TinyGit.result_cache.should == { "/usr/bin/env git --git-dir=\"#{TEST_REP.git_dir}\" rev-parse \"HEAD\""=>"[RESULT]" } end TinyGit.result_cache.should == {} end vendor/plugins/tiny-git/spec/caching_spec.rb @@ -19,6 +19,13 @@ describe TinyGit::Object::Tree do tree.trees.should have(1).items end + it 'should correctly parse sub-nodes' do + tree('e01e2d50919b243e68d463bbeea14be7adf5a5b1').blobs.keys.sort.should == [ + 'another \ one.txt', + 'this file\'s name is (a "little") strange.txt' + ] + end + it 'should have a full sha' do tree('b090a05').to_s.should == 'b090a05' tree('b090a05').sha.should == 'b090a05f9f70e6af595610118a817c2e51760c65' vendor/plugins/tiny-git/spec/object/tree_spec.rb @@ -53,9 +53,17 @@ describe TinyGit::Repo do end it 'should catch and re-raise GIT errors' do - msg = "[128] fatal: Not a valid object name 9999999 (/usr/bin/env git --git-dir='./spec/test_rep/.git' cat-file -s ''9999999'')" + msg = "[128] fatal: Not a valid object name 9999999 (/usr/bin/env git --git-dir=\"./spec/test_rep/.git\" cat-file -s \"9999999\")" lambda { new_repo.cat_file('9999999', :s => true) }.should raise_error(TinyGit::GitExecuteError, msg) end + + it 'should handle unusual file name variations' do + tree = new_repo.ls_tree 'HEAD', '--', 'res/this file\'s name is (a "little") strange.txt' + tree.should == [{:type=>"blob", :mode=>"100644", :path=>'res/this file\'s name is (a "little") strange.txt', :sha=>"bb590f885cfa35e3a4bdb3396da8b14b4904d045"}] + + tree = new_repo.ls_tree 'HEAD', '--', 'res/another \ one.txt' + tree.should == [{:type=>"blob", :mode=>"100644", :path=> 'res/another \ one.txt', :sha=>"bb590f885cfa35e3a4bdb3396da8b14b4904d045"}] + end end vendor/plugins/tiny-git/spec/repo_spec.rb vendor/plugins/tiny-git/spec/test_rep.tgz e58c0b93d790b4ed1a9e906d60b36e6e8ce320e7 Dimitrij Denissenko contact@dvisionfactory.com http://github.com/dim/retrospectiva/commit/a4e0130b8bee0c8654ce5c61eb82885de6d631da a4e0130b8bee0c8654ce5c61eb82885de6d631da 2009-10-30T01:41:15-07:00 2009-10-30T01:41:15-07:00 Fixed Tiny-GIT path escaping [#703] 22e94462f7e1d2f5b3834a0baf6da40d3b2da3fe Dimitrij Denissenko contact@dvisionfactory.com