aboutsummaryrefslogtreecommitdiffstats
path: root/tool/merger.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add github repo to remove_tagNARUSE, Yui2019-11-221-0/+2
|
* Always use git.ruby-lang.org as originNARUSE, Yui2019-11-121-3/+4
| | | | | naruse sets remote.origin.pushUrl = nonexistent as fail-safe configuration to avoid accidentally push a new branch to origin.
* tool/merger.rb: fix tag existence check with subversion.nagachika2019-08-281-1/+4
|
* Omit version.h when mergingNAKAMURA Usaku2019-08-191-2/+2
|
* tool/merger.rb: execute 'svn update' after 'svn ci' to update revision info ↵nagachika2019-07-271-0/+1
| | | | on working copy.
* Nil cannot and should not convert to a stringNAKAMURA Usaku2019-05-031-1/+1
|
* Use redirect keyword arguments instead of ">"NAKAMURA Usaku2019-04-301-1/+1
|
* Use array mode of `system` instead of `shellescape`Nobuyoshi Nakada2019-04-301-2/+3
| | | | `&.` is not available in ruby 2.0.
* String#[] with index to extract matched substring safelyNobuyoshi Nakada2019-04-301-1/+1
|
* **Must** use IO::NULL for null deviceNAKAMURA Usaku2019-04-301-1/+1
|
* Fully support Git in tool/merger.rbTakashi Kokubun2019-04-291-21/+46
| | | | as both backport source repository and backport destination repository.
* * remove trailing spaces.git2019-04-291-2/+2
|
* tool/merger.rb: Avoid making too-deep indentationTakashi Kokubun2019-04-291-156/+156
| | | | | | | | because it's hard to understand what's going on when indentation depth is too deep. Sorry for polluting git blame, but most of the Merger's lines are updated recently anyway.
* Support `tool/merger.rb removetag` under GitTakashi Kokubun2019-04-291-25/+24
| | | | repository.
* Support `tool/merger.rb tag` under Git repositoryTakashi Kokubun2019-04-291-44/+56
|
* Support `tool/merger.rb up` under Git repositoryTakashi Kokubun2019-04-281-53/+69
| | | | | updating indentation (and slightly changing styles) for areas already supporting Git.
* Fix wrong svn optionsTakashi Kokubun2019-04-281-2/+2
| | | | | | for SVN as a backport source. This was a mistake in de5378233b2ff5434f024ac66285e699794a321d...
* Stop using global variable for reposTakashi Kokubun2019-04-281-5/+6
| | | | to avoid having impact from other places.
* Now tool/merger.rb may use Git [ci skip]Takashi Kokubun2019-04-281-1/+1
|
* Drop SVN-specific method from Merger moduleTakashi Kokubun2019-04-281-7/+4
| | | | to clarify it's not needed for Git support.
* Make Merger.version private to the moduleTakashi Kokubun2019-04-281-30/+32
| | | | because it's not used outside the Module.
* Define merger.rb's methods under Merger namespaceTakashi Kokubun2019-04-281-15/+18
| | | | | | | so that we do not monkey-patch all classes by defining methods on top-level (Object class). Not arranging indentation in it to keep `git blame` for now.
* tool/merger.rb: Guard match failure properlyk0kubun2019-04-211-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool/merger.rb: Support fetching patch from cgitk0kubun2019-04-211-11/+29
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool/merger.rb: Drop ChangeLog handlingk0kubun2019-04-211-27/+3
| | | | | | We're not writing ChangeLog since ruby_2_4. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Drop obsoleted feature from helpk0kubun2019-04-211-3/+0
| | | | | | I understand this is dropped in r67569 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool/merger.rb: Drop some revision notations.k0kubun2019-04-211-5/+0
| | | | | | | | | | Maintainer use merger mainly from redmine-backporter.rb. [Fix GH-2136] From: Chikanaga Tomoyuki <t-chikanaga@groovenauts.jp> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool/merger.rb: Remove unused command line format.k0kubun2019-04-211-3/+0
| | | | | | | | | | I believe no-one use this notation for years. [Fix GH-2136] From: Chikanaga Tomoyuki <t-chikanaga@groovenauts.jp> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Moved version numbersnobu2018-12-281-0/+14
| | | | | | | | | | | | * Define major and minor version numbers only in the public include/ruby/version.h header, as the API version numbers. * Define only teeny version number in the private version.h header. * RUBY_VERSION moved to version.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Keep RUBY_RELEASE_DATE's definitionnaruse2018-12-251-1/+2
| | | | | | if it uses Y/M/D macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove message already unnecesaryusa2018-10-181-2/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* aliasesusa2017-12-161-1/+1
| | | | | | | * tool/merger.rb: aliases for removetag command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* add `removetag` commandusa2017-12-151-0/+33
| | | | | | | * tool/merger.rb (remove_tag): add `removetag` command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* check the existence of specified tagusa2017-12-151-0/+4
| | | | | | | | * tool/merger.rb (tag): check the existence of specified tag before tagging to get rid of careless mistakes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merger.rb: separate logsnobu2017-09-101-2/+2
| | | | | | * tool/merger.rb: separate each commit logs by an empty line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Generate log from svn lognaruse2017-03-111-4/+5
| | | | | | When there's multiple revisions, all svn logs should be used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool: add descriptions and fix typosnormal2016-07-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tool/asm_parse.rb: add description * tool/change_maker.rb: ditto * tool/downloader.rb: ditto * tool/eval.rb: ditto * tool/expand-config.rb: ditto * tool/extlibs.rb: ditto * tool/fake.rb: ditto * tool/file2lastrev.rb: ditto * tool/gem-unpack.rb: ditto * tool/gen_dummy_probes.rb: ditto * tool/gen_ruby_tapset.rb: ditto * tool/generic_erb.rb: ditto * tool/id2token.rb: ditto * tool/ifchange: ditto * tool/insns2vm.rb: ditto * tool/instruction.rb: ditto * tool/jisx0208.rb: ditto * tool/merger.rb: ditto * tool/mkrunnable.rb: ditto * tool/node_name.rb: ditto * tool/parse.rb: ditto * tool/rbinstall.rb: ditto * tool/rbuninstall.rb: ditto * tool/rmdirs: ditto * tool/runruby.rb: ditto * tool/strip-rdoc.rb: ditto * tool/vcs.rb: ditto * tool/vtlh.rb: ditto * tool/ytab.sed: ditto * tool/enc-unicode.rb: fix typo * tool/mk_call_iseq_optimized.rb: ditto * tool/update-deps: ditto [ruby-core:76215] [Bug #12539] by Noah Gibbs <the.codefolio.guy@gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: use FileUtile.rm_f to fix an error on missing temporary file.nagachika2016-04-231-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: remove temporary file.usa2016-04-221-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (version): version number may be two-digit.usa2016-03-311-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: update revision.h before merge.naruse2016-03-291-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: support to backport header as backport identifier.naruse2016-03-291-4/+8
| | | | | | Now you can specify by 'merge revision(s) 49254: [Backport #10738]'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merger.rb: show procedure to push tag into GitHubnaruse2015-12-111-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: get user's attention by using colored message when ↵usa2015-12-081-1/+1
| | | | | | requiring operation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (versionup): should also increment revision whenusa2015-04-141-4/+4
| | | | | | | changing teeny. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: Added documentation to version method.hsbt2015-03-071-0/+2
| | | | | | [fix GH-847][ci skip] Patch by @magikid git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove ruby_1_9_2 supportnaruse2015-03-031-7/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* add teenyupnaruse2015-03-031-11/+19
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (help): hilighten.usa2015-02-171-8/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: unlink temporary file explicitly.usa2014-05-271-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 19:31:35 +0000