Commit Graph

361 Commits

Author SHA1 Message Date
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
Etienne Massip b49f83a22a Log return code if error.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-15 21:59:49 +00:00
Toshi MARUYAMA eb789b147a scm: git: remove unused --since option (#4547, #4716, #7146, #6013)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8156 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 11:55:02 +00:00
Etienne Massip f385a3e3da Handle spaces in development scm stderr log file path.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8129 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-08 19:22:00 +00:00
Toshi MARUYAMA c71208d18d scm: mercurial: lib: return array of Branch class instead of array of strings at branches method (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:19:13 +00:00
Toshi MARUYAMA cec6f5c3b0 scm: git: lib: return array of Branch class instead of array of strings at branches method (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7671 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:17:46 +00:00
Toshi MARUYAMA 033214578f scm: lib: add Branch class to abstract adapter (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7670 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:17:13 +00:00
Toshi MARUYAMA 36f51878a3 scm: git: lib: add parents to Revision class (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:58:26 +00:00
Toshi MARUYAMA 031b5bf4eb scm: mercurial: lib: add parents to Revision class (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7666 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:56:41 +00:00
Toshi MARUYAMA 0ff17efb4d scm: lib: add parents attribute to Revision class of abstract adapter (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:55:54 +00:00
Toshi MARUYAMA 887893601e scm: mercurial: remove unused "tags" from xml log templete
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 03:38:02 +00:00
Toshi MARUYAMA 918eac2cbd scm: mercurial: add parents to xml log template (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 02:46:38 +00:00
Toshi MARUYAMA 81ef038587 scm: mercurial: drop supporting below Mercurial 1.1 (#9465)
On November 1st 2011, Mercurial 2.0 will be released.

On Mercurial 1.1.2, unit lib test fails with following error.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand
    return checkargs()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs
    return cmdfunc()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check
    return func(*args, **kwargs)
  File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog
    if hg.util.version() >= '1.6':
AttributeError: 'module' object has no attribute 'version'

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 06:10:12 +00:00
Toshi MARUYAMA ed87fc4e66 scm: mercurial: switch rev parameter of extension rhlog() if above Mercurial 1.6 or not (#9465)
On Mercurial 1.5, following error raises.

<pre>
hg --config extensions.redminehelper=lib/redmine/scm/adapters/mercurial/redminehelper.py \
  --rhbranch default --from default --to 0

abort: unknown revision '"default"'!
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7641 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:32:06 +00:00
Toshi MARUYAMA a6d3409a5a scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465)
Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be ,
following error raises.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch
    cmd, func, args, options, cmdoptions = _parse(lui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse
    args = fancyopts.fancyopts(args, c, cmdoptions, True)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts
    for short, name, default, comment in options:
ValueError: too many values to unpack

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7640 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:31:36 +00:00
Toshi MARUYAMA e10198f0d5 scm: bazaar: use self.class.sq_bin for command name at adpter scm_cmd_no_raise() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-15 16:33:24 +00:00
Toshi MARUYAMA 4dea2870b7 scm: bazaar: use self.class.sq_bin for command name at adpter scm_cmd() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-15 16:33:02 +00:00
Toshi MARUYAMA 9b66e09e7f scm: bazaar: use "shell_quote_command" method at adapter for JRuby + Windows command name (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-15 16:32:38 +00:00
Toshi MARUYAMA 30476c90ee scm: git: use self.class.sq_bin for command name at adpter scm_cmd() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6281 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-15 16:32:15 +00:00
Toshi MARUYAMA b8f96f6134 scm: git: use "shell_quote_command" method at adapter for JRuby + Windows command name (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6280 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-15 16:31:51 +00:00