summaryrefslogtreecommitdiff
path: root/tool/merger.rb
AgeCommit message (Collapse)Author
2019-05-03Nil cannot and should not convert to a stringNAKAMURA Usaku
2019-04-30Use redirect keyword arguments instead of ">"NAKAMURA Usaku
2019-04-30Use array mode of `system` instead of `shellescape`Nobuyoshi Nakada
`&.` is not available in ruby 2.0.
2019-04-30String#[] with index to extract matched substring safelyNobuyoshi Nakada
2019-04-30**Must** use IO::NULL for null deviceNAKAMURA Usaku
2019-04-29Fully support Git in tool/merger.rbTakashi Kokubun
as both backport source repository and backport destination repository.
2019-04-29* remove trailing spaces.git
2019-04-29tool/merger.rb: Avoid making too-deep indentationTakashi Kokubun
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.
2019-04-29Support `tool/merger.rb removetag` under GitTakashi Kokubun
repository.
2019-04-29Support `tool/merger.rb tag` under Git repositoryTakashi Kokubun
2019-04-28Support `tool/merger.rb up` under Git repositoryTakashi Kokubun
updating indentation (and slightly changing styles) for areas already supporting Git.
2019-04-28Fix wrong svn optionsTakashi Kokubun
for SVN as a backport source. This was a mistake in de5378233b2ff5434f024ac66285e699794a321d...
2019-04-28Stop using global variable for reposTakashi Kokubun
to avoid having impact from other places.
2019-04-28Now tool/merger.rb may use Git [ci skip]Takashi Kokubun
2019-04-28Drop SVN-specific method from Merger moduleTakashi Kokubun
to clarify it's not needed for Git support.
2019-04-28Make Merger.version private to the moduleTakashi Kokubun
because it's not used outside the Module.
2019-04-28Define merger.rb's methods under Merger namespaceTakashi Kokubun
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.
2019-04-21tool/merger.rb: Guard match failure properlyk0kubun
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-21tool/merger.rb: Support fetching patch from cgitk0kubun
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-21tool/merger.rb: Drop ChangeLog handlingk0kubun
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
2019-04-21Drop obsoleted feature from helpk0kubun
I understand this is dropped in r67569 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-21tool/merger.rb: Drop some revision notations.k0kubun
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
2019-04-21tool/merger.rb: Remove unused command line format.k0kubun
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
2018-12-28Moved version numbersnobu
* 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
2018-12-25Keep RUBY_RELEASE_DATE's definitionnaruse
if it uses Y/M/D macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-10-18remove message already unnecesaryusa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-16aliasesusa
* tool/merger.rb: aliases for removetag command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-15add `removetag` commandusa
* 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
2017-12-15check the existence of specified tagusa
* 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
2017-09-10merger.rb: separate logsnobu
* 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
2017-03-11Generate log from svn lognaruse
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
2016-07-02tool: add descriptions and fix typosnormal
* 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
2016-04-23* tool/merger.rb: use FileUtile.rm_f to fix an error on missing temporary file.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-22* tool/merger.rb: remove temporary file.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-31* tool/merger.rb (version): version number may be two-digit.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29* tool/merger.rb: update revision.h before merge.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29* tool/merger.rb: support to backport header as backport identifier.naruse
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
2015-12-11merger.rb: show procedure to push tag into GitHubnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08* tool/merger.rb: get user's attention by using colored message when ↵usa
requiring operation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-14* tool/merger.rb (versionup): should also increment revision whenusa
changing teeny. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-07* tool/merger.rb: Added documentation to version method.hsbt
[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
2015-03-03remove ruby_1_9_2 supportnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-03add teenyupnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17* tool/merger.rb (help): hilighten.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27* tool/merger.rb: unlink temporary file explicitly.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-27X:Y doesn't include X in svnnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-27tool/merger.rb: normalize the merged revision stringnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-26* tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0 ↵usa
explicit tagging. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23merger.rb: runnablenobu
* tool/merger.rb: make runnable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23merger.rb: suppress warningsnobu
* tool/merger.rb (version_up, tag, default_merge_branch): suppress syntax warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 15:39:34 +0000