4dccb145a8
tool/merger.rb: Support commit URLs as revisions
2023-07-23 22:47:09 +09:00
9891797a27
Use 3 way merge for merger.rb
...
Since --3way insists --index, git diff needs to compare with HEAD.
2023-03-28 16:57:55 +09:00
ff91b97c83
The guard is to alert patchlevel of X.Y.0
2021-04-06 12:02:46 +09:00
ce2062dee6
Drop pushing local repo
...
I want to push another repo/branch to run CI before pushing it to
official branch.
2021-02-02 19:12:49 +09:00
35608760ff
Add github repo to remove_tag
2019-11-22 19:05:58 +09:00
0ba1ea7fbf
Always use git.ruby-lang.org as origin
...
naruse sets remote.origin.pushUrl = nonexistent as fail-safe
configuration to avoid accidentally push a new branch to origin.
2019-11-12 01:22:59 +09:00
ed8d2e1cfd
tool/merger.rb: fix tag existence check with subversion.
2019-08-28 14:50:21 +09:00
4515bcc922
Omit version.h when merging
2019-08-19 15:37:28 +09:00
73530a9619
tool/merger.rb: execute 'svn update' after 'svn ci' to update revision info on working copy.
2019-07-27 20:15:53 +09:00
7d02bab0b0
Nil cannot and should not convert to a string
2019-05-03 06:24:57 +09:00
dd942cd5b3
Use redirect keyword arguments instead of ">"
2019-04-30 22:24:45 +09:00
50872f4a15
Use array mode of `system` instead of `shellescape`
...
`&.` is not available in ruby 2.0.
2019-04-30 22:23:20 +09:00
df3de40932
String#[] with index to extract matched substring safely
2019-04-30 22:13:47 +09:00
5a83a1d554
**Must** use IO::NULL for null device
2019-04-30 18:01:17 +09:00
dfc0eeb0cf
Fully support Git in tool/merger.rb
...
as both backport source repository and backport destination repository.
2019-04-29 01:54:01 +09:00
75260d36b5
* remove trailing spaces.
2019-04-29 01:00:20 +09:00
991e32681e
tool/merger.rb: Avoid making too-deep indentation
...
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-29 00:59:22 +09:00
2dddd370a1
Support `tool/merger.rb removetag` under Git
...
repository.
2019-04-29 00:53:38 +09:00
fad2825e42
Support `tool/merger.rb tag` under Git repository
2019-04-29 00:19:58 +09:00
3bc810334c
Support `tool/merger.rb up` under Git repository
...
updating indentation (and slightly changing styles) for areas already
supporting Git.
2019-04-28 22:53:21 +09:00
392d84b490
Fix wrong svn options
...
for SVN as a backport source.
This was a mistake in de5378233b2ff5434f024ac66285e699794a321d...
2019-04-28 22:15:01 +09:00
1c8cefca31
Stop using global variable for repos
...
to avoid having impact from other places.
2019-04-28 22:02:34 +09:00
cb8eb37377
Now tool/merger.rb may use Git [ci skip]
2019-04-28 21:53:58 +09:00
14965c5f4b
Drop SVN-specific method from Merger module
...
to clarify it's not needed for Git support.
2019-04-28 21:41:02 +09:00
fcb1875513
Make Merger.version private to the module
...
because it's not used outside the Module.
2019-04-28 21:41:02 +09:00
d835ed4df1
Define merger.rb's methods under Merger namespace
...
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-28 21:08:58 +09:00
2c31e6dec4
tool/merger.rb: Guard match failure properly
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-21 12:03:39 +00:00
de5378233b
tool/merger.rb: Support fetching patch from cgit
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-21 11:49:11 +00:00
47676e969e
tool/merger.rb: Drop ChangeLog handling
...
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-21 10:01:44 +00:00
add82b7e7e
Drop obsoleted feature from help
...
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-21 08:19:48 +00:00
e7d76e3f5a
tool/merger.rb: Drop some revision notations.
...
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-21 02:58:10 +00:00
ffc93316c8
tool/merger.rb: Remove unused command line format.
...
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
2019-04-21 02:58:10 +00:00
8422725408
Moved version numbers
...
* 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-28 02:12:34 +00:00
4937c6c7da
Keep RUBY_RELEASE_DATE's definition
...
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-12-25 09:34:35 +00:00
6db7b1c55a
remove message already unnecesary
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-10-18 00:54:32 +00:00
d837e5321d
aliases
...
* 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-16 01:56:14 +00:00
e13d347df6
add `removetag` command
...
* 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-15 03:22:51 +00:00
3b10f70220
check the existence of specified tag
...
* 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-12-15 03:04:56 +00:00
83299c73f3
merger.rb: separate logs
...
* 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-09-10 12:35:06 +00:00
1c96bfab98
Generate log from svn log
...
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
2017-03-11 19:03:11 +00:00
f8d0bdedf1
tool: add descriptions and fix typos
...
* 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-07-02 21:01:04 +00:00
8f9b8d48b6
* tool/merger.rb: use FileUtile.rm_f to fix an error on missing temporary file.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-23 18:05:26 +00:00
696adbccd3
* tool/merger.rb: remove temporary file.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-22 05:52:30 +00:00
a517e6f9e3
* tool/merger.rb (version): version number may be two-digit.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-31 15:04:34 +00:00
e5472649f4
* tool/merger.rb: update revision.h before merge.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29 16:55:54 +00:00
33a8940855
* tool/merger.rb: support to backport header as backport identifier.
...
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
2016-03-29 09:59:26 +00:00
825bcc36ee
merger.rb: show procedure to push tag into GitHub
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-11 02:08:41 +00:00
be801955e9
* tool/merger.rb: get user's attention by using colored message when requiring operation.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08 03:20:07 +00:00
cdf0a92c75
* tool/merger.rb (versionup): should also increment revision when
...
changing teeny.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-14 07:05:30 +00:00
fe46bec769
* tool/merger.rb: Added documentation to version method.
...
[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-07 00:18:46 +00:00
nagachika
NARUSE, Yui
NAKAMURA Usaku
Nobuyoshi Nakada
Takashi Kokubun
git
k0kubun
nobu
naruse
usa
normal
nagachika
hsbt