Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-10-31 18:36:07 +01:00
Code Issues Packages Projects Releases Activity
15,127 Commits 35 Branches 222 Tags
5d7bddd65c0591a1abaa78d54b0241670aca90c3
Commit Graph

112 Commits

Author SHA1 Message Date
Toshi MARUYAMA
5d7bddd65c cleanup: rubocop: fix Layout/SpaceInsideParens in lib/redmine/scm/adapters/mercurial_adapter.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18956 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-08 12:34:21 +00:00
Toshi MARUYAMA
7f59b33e39 cleanup: rubocop: fix Style/RescueModifier in lib/redmine/scm/adapters/mercurial_adapter.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-08 02:09:51 +00:00
Toshi MARUYAMA
c22ba96c92 code cleanup: rubocop: fix Lint/HandleExceptions in lib/redmine/scm/adapters/mercurial_adapter.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18458 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-09-12 16:23:42 +00:00
Toshi MARUYAMA
2edbd2a597 code cleanup: rubocop: fix Lint/AmbiguousOperator in lib/redmine/scm/adapters/mercurial_adapter.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@18456 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-09-12 15:08:21 +00:00
Go MAEDA
4082069c75 Update copyright year. 
git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-25 07:36:06 +00:00
Go MAEDA
b0e17e8199 Don't rescue Exception class (#31387). 
Patch by Go MAEDA and Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@18197 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-25 06:50:25 +00:00
Go MAEDA
72e1451159 Use Regexp#match? to reduce allocations of MatchData object (#28940). 
Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@18011 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-27 02:15:24 +00:00
Go MAEDA
606e75d12d Use #b shortcut instead of #force_encoding (#31059). 
Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@17992 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-20 01:36:44 +00:00
Go MAEDA
30e341db69 Support frozen_string_literal in lib/**/*.rb (#26561). 
Contributed by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@17988 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-17 16:36:34 +00:00
Go MAEDA
5861160ffc Add "frozen_string_literal: false" for all files (#26561). 
This will be changed to true in the future.


git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 01:32:57 +00:00
Go MAEDA
eee1c36b4b Replace Enumerable#sort with faster Enumerable#sort_by (#29299). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17462 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-08-02 21:54:21 +00:00
Toshi MARUYAMA
9d797400ea mercurial: work around faulty parsing of early command options (#27516) 
Use -sVALUE and --long=VALUE instead of "-s VALUE" and "--long VALUE"
respectively.

Contributed by Yuya Nishihara.

git-svn-id: http://svn.redmine.org/redmine/trunk@17062 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 11:38:47 +00:00
Toshi MARUYAMA
58ed865513 mercurial: separate command options and positional arguments with "--" (#27516) 
We don't have much problems here thanks to hgtarget(path) and CGI.escape(),
which prepends a repository path and encodes "=" character respectively, but
it's better to not rely on the side effect of these functions.

Contributed by Yuya Nishihara.

git-svn-id: http://svn.redmine.org/redmine/trunk@17061 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 11:38:35 +00:00
Toshi MARUYAMA
ca87bf766c mercurial: reject malicious command argument (#27516) 
We've got a security report from the Phabricator team, which basically says
--config and --debugger arguments can be injected anywhere to lead to an
arbitrary command execution.

https://secure.phabricator.com/rPa7921a4448093d00defa8bd18f35b8c8f8bf3314

This is a fundamental issue of the argument parsing rules in Mercurial, which
allows extensions to populate their parsing rules and such extensions can be
loaded by "--config extensions.<name>=". There's a chicken and egg problem.
We're working on hardening the parsing rules, but which won't come in by
default as it would be a behavior change.

This patch adds a verification to reject malicious command arguments as a
last ditch. The subsequent patches will fix the problem in more appropriate
way.

Contributed by Yuya Nishihara.

git-svn-id: http://svn.redmine.org/redmine/trunk@17060 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 11:38:23 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:40:31 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:30:10 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +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
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
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
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
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
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
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
eacffe0361 scm: mercurial: use self.class.sq_bin for command name at adpter scm_cmd() (#8825). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6279 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-07-15 16:31:27 +00:00
Toshi MARUYAMA
50f4087aa7 scm: mercurial: use "shell_quote_command" method at adapter for JRuby + Windows command name (#8825). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6278 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-07-15 16:31:03 +00:00
Toshi MARUYAMA
48f6472e0f scm: mercurial: catch exception and return nil during getting info (#8777). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6245 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-07-11 00:55:19 +00:00
Toshi MARUYAMA
3b5db24269 scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6042 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-10 07:06:11 +00:00
Toshi MARUYAMA
a1e3cf8218 scm: mercurial: override "path_encoding" method in adapter (#2664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5868 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-05-21 02:38:04 +00:00
Toshi MARUYAMA
19098302ea scm: mercurial: remove trailing white-spaces from adapter source. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5667 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-05-06 12:57:10 +00:00
Toshi MARUYAMA
905a809774 scm: add "options" parameter in adapter entries(). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5638 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-05-04 14:11:25 +00:00
Toshi MARUYAMA
ee7fe09b1e scm: mercurial: fix loss non ASCII paths if path_encoding is '' (#2664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-05-04 05:00:57 +00:00
Toshi MARUYAMA
79b7e89cf9 scm: mercurial: change copied file from_revision from revision number to node id. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5480 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-17 09:33:07 +00:00
Toshi MARUYAMA
a8e7936337 scm: mercurial: code clean up adapter. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5479 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-17 09:32:35 +00:00
Toshi MARUYAMA
fd316c99fa scm: mercurial: set client available if cvs version above 0.9.5. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5358 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-08 04:39:55 +00:00
Toshi MARUYAMA
bf6ec48bea scm: mercurial: wrap revision of cat and annotate with URL encoding (#1981, #7246). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5112 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-14 02:23:54 +00:00
Toshi MARUYAMA
d48a7e148e scm: mercurial: remove unused parameters from "nodes_in_branch()" method in adapter (#7246, #4455). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5108 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-13 15:03:05 +00:00
Toshi MARUYAMA
b914a3648a scm: mercurial: add new "nodes_in_branch()" method in adapter (#7246, #4455). 
For latest changesets supporting named branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5102 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-13 00:48:07 +00:00
Toshi MARUYAMA
32e69dcaca scm: mercurial: convert copied file path encoding (#2664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4995 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-03 12:44:14 +00:00
Toshi MARUYAMA
5c3caf2e6b scm: mercurial: remove localtime from adapter (#4455). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4994 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-03 12:11:23 +00:00
Toshi MARUYAMA
923558e45c scm: Ruby 1.9 compatibility for XML UTF-8 parsing. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4993 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-03 05:51:46 +00:00
Toshi MARUYAMA
71aac2e3fe scm: fix unit tests fails in Ruby 1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4992 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-03 05:32:33 +00:00
Toshi MARUYAMA
c3e8fc5f1a scm: mercurial: wrap revison, tag and branch with URL encoding for entries (#4455, #1981, #7246). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4989 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-02 10:17:36 +00:00
Toshi MARUYAMA
9937ac677f scm: update adapter initialize() to use path encoding (#2664, #2274). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4941 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-24 05:58:59 +00:00
Toshi MARUYAMA
f8da0127f7 scm: mercurial: annotate path encoding support in adapter (#2664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4931 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-23 07:04:32 +00:00
Toshi MARUYAMA
7dfd0bf679 scm: mercurial: path encoding support for "cat" in adapter (#2664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4928 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-23 00:34:27 +00:00