Toshi MARUYAMA
0d5dd6fc19
Merged r12935 from trunk to 2.5-stable ( #16177 )
...
use Python getattr instead of hasattr.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 16:53:51 +00:00
Toshi MARUYAMA
fcc1f198e7
Merged r12930 from trunk to 2.5-stable ( #16177 )
...
Mercurial 2.9 compatibility.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12932 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 13:02:03 +00:00
Toshi MARUYAMA
5872d079e6
scm: mercurial: use long id in adapter level ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-02 04:44:38 +00:00
Toshi MARUYAMA
f2ec6f8d77
back out r12752 ( #14361 )
...
Revision, Author and Comment of repository browser are broken.
git-svn-id: http://svn.redmine.org/redmine/trunk@12753 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 08:46:47 +00:00
Toshi MARUYAMA
ae68ff1100
scm: mercurial: use long id in adapter level ( #14361 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-01 07:47:04 +00:00
Toshi MARUYAMA
7c56ed6004
fix source indent of Redmine::Scm::Adapters::AbstractAdapter#without_trailling_slash
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-31 09:38:43 +00:00
Toshi MARUYAMA
35cc911192
update copyright year ( #15977 )
...
Contributed by Daniel Felix.
git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA
e10aa2529d
change requirement in bazaar lib as same with other scm libs ( #15756 )
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12456 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-24 05:06:36 +00:00
Jean-Philippe Lang
a657a12450
Don't load redcarpet with JRuby.
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 17:07:51 +00:00
Toshi MARUYAMA
3782836e73
fix disable to run test environment
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12387 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-09 04:30:51 +00:00
Jean-Philippe Lang
a22242ed20
Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-11 22:02:21 +00:00
Toshi MARUYAMA
9002477006
scm: git: use "--encoding=UTF-8" for blame ( #14931 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 06:16:55 +00:00
Jean-Philippe Lang
01a9e17c49
CVS root_url not recognized when connection string does not include port ( #14422 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12027 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-15 21:06:54 +00:00
Jean-Philippe Lang
633e4a00e6
Check that the SCM log file is writable before using it ( #13541 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-03 20:01:41 +00:00
Jean-Philippe Lang
d8769cb27c
Log SCM stderr when log level is set to debug only ( #13541 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-22 07:50:28 +00:00
Jean-Philippe Lang
7643281510
undefined method `strip' for nil:NilClass error with JRuby 1.7.2 ( #12228 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-27 10:50:19 +00:00
Jean-Philippe Lang
30801ca968
Always log scm stderr and makes the log file path configurable.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 12:04:23 +00:00
Jean-Philippe Lang
ff53a9cfe1
Don't use Iconv with ruby1.9 ( #12787 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11177 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 21:27:36 +00:00
Jean-Philippe Lang
e396a0eebe
Copyright for 2013 ( #12788 ).
...
Patch by Daniel Felix.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Jean-Philippe Lang
3e4b4ffd9a
Redmine::Scm::Base.all should return an empty array instead of nil when no SCM was added.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-05 22:00:02 +00:00
Toshi MARUYAMA
625eebb720
code cleanup scm_iconv ( #12228 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10742 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 11:39:43 +00:00
Toshi MARUYAMA
123d2b318f
fix scm_iconv local variable name ( #12228 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 07:12:23 +00:00
Toshi MARUYAMA
5a2c80cb48
use String#encode at scm_iconv on Ruby 1.9 ( #12228 )
...
Unit git adapter test fails on JRuby 1.7.
<pre>
Failure:
<"test-Ü-2.txt">("UTF-8") expected but was
<"test-\xC3\x9C-2.txt">("ASCII-8BIT").
diff:
- test-Ü-2.txt
? ^
+ test-Ü-2.txt
? ^^
test_entries_latin_1_files(GitAdapterTest)
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb:468:in `test_entries_latin_1_files'
465: assert entries1
466: assert_equal 3, entries1.size
467: f1 = entries1[1]
=> 468: assert_equal "test-#{@char_1}-2.txt", f1.name
469: assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path
470: assert_equal 'file', f1.kind
471: end
</pre>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 06:19:29 +00:00
Toshi MARUYAMA
1f58b94bd8
scm: bazaar: do not call super initialize method at adapter ( #11834 )
...
On Bazaar 2.0.5, in case of using non ASCII *repository* path,
following trace raise on all operation.
<pre>
Traceback (most recent call last):
File "/usr/bin/bzr", line 142, in <module>
exit_val = bzrlib.commands.main()
File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 1102, in main
argv = osutils.get_unicode_argv()
File "/usr/lib/python2.6/site-packages/bzrlib/osutils.py", line 90, in get_unicode_argv
"encoding." % a))
bzrlib.errors.BzrError:
Parameter ''/somewhere/\xe3\x83\x90\xe3\x82\xb6\xe3\x83\xbc/non_ascii/''
is unsupported by the current encoding.
</pre>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10422 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 10:10:29 +00:00
Toshi MARUYAMA
f9208d7c5c
scm: bazaar: use log encoding as path encoding ( #11834 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10420 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 09:30:11 +00:00
Toshi MARUYAMA
a701bd5fbd
scm: bazaar: convert path encoding from @path_encoding to UTF-8 at adapter entries method ( #11834 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10418 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 23:46:53 +00:00
Toshi MARUYAMA
a3ae06921d
scm: bazaar: convert path encoding from @path_encoding to UTF-8 at adapter revisions method ( #11834 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10417 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 23:46:27 +00:00
Toshi MARUYAMA
a6368733ad
scm: bazaar: convert command line character encoding to @path_encoding ( #11834 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10416 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 23:45:59 +00:00
Toshi MARUYAMA
f230ffbd54
scm: bazaar: add @path_encoding instance value and set it UTF-8 at adapter initialize method ( #11834 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10415 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 23:45:31 +00:00
Toshi MARUYAMA
dd89ce4594
scm: bazaar: code layout cleanup adapter revisions method
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10409 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 07:58:31 +00:00
Jean-Philippe Lang
65524cc1cc
Don't repeat revision on annotate view.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-28 18:11:03 +00:00
Jean-Philippe Lang
9b63117856
Extract code from view.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9809 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 19:19:22 +00:00
Jean-Philippe Lang
7c105ec9e9
Adds a method to load changesets for repository entries.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 18:32:09 +00:00
Jean-Philippe Lang
9b60214b3a
Fixed that Repository#entries returns an Array.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 17:01:33 +00:00
Toshi MARUYAMA
69b46ab1be
scm: mercurial: remove comment about Mercurial 0.9.5 compatibility from redminehelper.py
...
Redmine supports Mercurial 1.2 or higher from r7650.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-02 10:39:27 +00:00
Jean-Philippe Lang
e876d1bfc0
Changes RedMine to Redmine in copyright notices.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9637 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 13:02:45 +00:00
Jean-Philippe Lang
ba5a052c8c
Copyright update.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Jean-Philippe Lang
cb16661d36
Removes the XML declaration that breaks the parser with JRuby.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9534 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-26 17:57:49 +00:00
Jean-Philippe Lang
5e57a1a9d9
Merged rails-3.2 branch.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
Toshi MARUYAMA
3e11f9abfe
scm: git: use stdin instead of command line in "git log" ( #10470 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-28 15:40:37 +00:00
Toshi MARUYAMA
fbe959b2a8
scm: git: rename "scm_cmd" to "git_cmd" and not use variable argument ( #10470 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9281 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-28 11:21:26 +00:00
Toshi MARUYAMA
2145b650a6
Ruby1.9: scm: use :set_encoding instead of "RUBY_VERSION < '1.9'" for IO.popen ( #10470 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9280 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-28 10:54:38 +00:00
Jean-Philippe Lang
4eb7ac1107
Fixed DarcsAdapter for ruby 1.9.3.
...
Unlike 1.8 and 1.9.2, Entries#compact returns an Array with 1.9.3, instead of an Entries object, resulting in a "undefined method `sort_by_name'" error.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9051 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-02 08:40:41 +00:00
Toshi MARUYAMA
58996e891e
scm: git: explicitly return string as default branch ( #10207 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8857 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 08:26:31 +00:00
Toshi MARUYAMA
2fa19441a7
scm: git: use default branch from HEAD ( #10207 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 06:22:59 +00:00
Jean-Philippe Lang
004968caf3
Removed extra argument from SubversionAdapter#diff.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 11:33:17 +00:00
Toshi MARUYAMA
d90cdb1b10
scm: git: raise exception if "git log" is error and block is given in lib revision method ( #8857 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 22:56:54 +00:00
Toshi MARUYAMA
34b3a9851f
scm: git: add includes and excludes options to lib revisions method ( #8857 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 23:38:35 +00:00
Toshi MARUYAMA
f319409abc
scm: git: remove unused "--all" option of "git log" in lib revisions method
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:18:20 +00:00
Etienne Massip
5a33d7292f
Backout 8239.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8241 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-15 22:15:47 +00:00