meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 23:11:12 +00:00
Code Issues Releases Wiki Activity

scm: git: add new two latin1 branches to test repository (#16881)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18039 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-04-05 05:30:18 +00:00
parent 97f6a40981
commit 5d2c03a196
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -84,7 +84,7 @@ module Redmine
git_cmd(cmd_args) do |io| git_cmd(cmd_args) do |io|
io.each_line do |line| io.each_line do |line|
branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$') branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$')
bran = GitBranch.new(branch_rev[2]) bran = GitBranch.new(scm_iconv('UTF-8', @path_encoding, branch_rev[2]))
bran.revision = branch_rev[3] bran.revision = branch_rev[3]
bran.scmid = branch_rev[3] bran.scmid = branch_rev[3]
bran.is_default = ( branch_rev[1] == '*' ) bran.is_default = ( branch_rev[1] == '*' )

BIN
test/fixtures/repositories/git_repository.tar.gz vendored
View File

Binary file not shown.

18
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
View File

@ -75,23 +75,33 @@ class GitAdapterTest < ActiveSupport::TestCase
@adapter.branches.each do |b| @adapter.branches.each do |b|
brs << b brs << b
end end
assert_equal 6, brs.length assert_equal 8, brs.length
br_issue_8857 = brs[0] br_issue_8857 = brs[0]
assert_equal 'issue-8857', br_issue_8857.to_s assert_equal 'issue-8857', br_issue_8857.to_s
assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision
assert_equal br_issue_8857.scmid, br_issue_8857.revision assert_equal br_issue_8857.scmid, br_issue_8857.revision
assert_equal false, br_issue_8857.is_default assert_equal false, br_issue_8857.is_default
br_latin_1_path = brs[1] br_latin_1_branch1 = brs[1]
assert_equal "latin-1-branch-#{@char_1}-01", br_latin_1_branch1.to_s
assert_equal '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', br_latin_1_branch1.revision
assert_equal br_latin_1_branch1.scmid, br_latin_1_branch1.revision
assert_equal false, br_latin_1_branch1.is_default
br_latin_1_branch2 = brs[2]
assert_equal "latin-1-branch-#{@char_1}-02", br_latin_1_branch2.to_s
assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_branch2.revision
assert_equal br_latin_1_branch2.scmid, br_latin_1_branch2.revision
assert_equal false, br_latin_1_branch2.is_default
br_latin_1_path = brs[3]
assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s
assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision
assert_equal br_latin_1_path.scmid, br_latin_1_path.revision assert_equal br_latin_1_path.scmid, br_latin_1_path.revision
assert_equal false, br_latin_1_path.is_default assert_equal false, br_latin_1_path.is_default
br_master = brs[2] br_master = brs[4]
assert_equal 'master', br_master.to_s assert_equal 'master', br_master.to_s
assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision
assert_equal br_master.scmid, br_master.revision assert_equal br_master.scmid, br_master.revision
assert_equal false, br_master.is_default assert_equal false, br_master.is_default
br_master_20120212 = brs[3] br_master_20120212 = brs[5]
assert_equal 'master-20120212', br_master_20120212.to_s assert_equal 'master-20120212', br_master_20120212.to_s
assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision
assert_equal br_master_20120212.scmid, br_master_20120212.revision assert_equal br_master_20120212.scmid, br_master_20120212.revision

2
test/unit/repository_git_test.rb
View File

@ -28,7 +28,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin? REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
NUM_REV = 28 NUM_REV = 28
NUM_HEAD = 6 NUM_HEAD = 8
## Git, Mercurial and CVS path encodings are binary. ## Git, Mercurial and CVS path encodings are binary.
## Subversion supports URL encoding for path. ## Subversion supports URL encoding for path.