archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
93371 commits 29 branches 1174 tags 475 MiB
Commit graph

82 commits

Author SHA1 Message Date
NARUSE, Yui
d88c066f42 Add fail safe to check uncommitted changes 2024-12-25 16:55:27 +09:00
Takashi Kokubun
40a9e806f2 merger.rb: Put spaces in between revisions 
so that they are linked correctly on GitHub
 2024-06-04 11:31:20 -07:00
Takashi Kokubun
d9d7ae7830 merger.rb: Don't ask "conflicts resolved?" if not needed 2024-05-28 17:46:58 -07:00
Takashi Kokubun
2eded6cc5d merger.rb: Auto-detect tickets when --ticket is not given 2024-05-28 16:30:22 -07:00
Takashi Kokubun
24c56ed516 merger.rb: Drop an obsoleted command from help 
It was needed only for SVN, and we dropped SVN support.
 2024-05-28 15:43:24 -07:00
Takashi Kokubun
d1265d6172 merger.rb: Improve the help message 
It wasn't clear whether the backport command takes a commit hash or a
ticket number.
 2024-05-28 14:05:51 -07:00
Takashi Kokubun
7a860bacee merger.rb: Drop SVN support 2024-05-28 13:51:45 -07:00
NARUSE, Yui
3fadd68452 Remove newlines of MIME encoded subject line 2024-04-23 20:14:41 +09:00
NARUSE, Yui
0b4bf05985 exit 1 if failed 2024-04-23 20:14:18 +09:00
nagachika
4dccb145a8 tool/merger.rb: Support commit URLs as revisions 2023-07-23 22:47:09 +09:00
NARUSE, Yui
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
NARUSE, Yui
ff91b97c83 The guard is to alert patchlevel of X.Y.0 2021-04-06 12:02:46 +09:00
NARUSE, Yui
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
NARUSE, Yui
35608760ff Add github repo to remove_tag 2019-11-22 19:05:58 +09:00
NARUSE, Yui
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
nagachika
ed8d2e1cfd tool/merger.rb: fix tag existence check with subversion. 2019-08-28 14:50:21 +09:00
NAKAMURA Usaku
4515bcc922
Omit version.h when merging 2019-08-19 15:37:28 +09:00
nagachika
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
NAKAMURA Usaku
7d02bab0b0
Nil cannot and should not convert to a string 2019-05-03 06:24:57 +09:00
NAKAMURA Usaku
dd942cd5b3
Use redirect keyword arguments instead of ">" 2019-04-30 22:24:45 +09:00
Nobuyoshi Nakada
50872f4a15
Use array mode of system instead of shellescape 
`&.` is not available in ruby 2.0.
 2019-04-30 22:23:20 +09:00
Nobuyoshi Nakada
df3de40932
String#[] with index to extract matched substring safely 2019-04-30 22:13:47 +09:00
NAKAMURA Usaku
5a83a1d554
**Must** use IO::NULL for null device 2019-04-30 18:01:17 +09:00
Takashi Kokubun
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
git
75260d36b5 * remove trailing spaces. 2019-04-29 01:00:20 +09:00
Takashi Kokubun
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
Takashi Kokubun
2dddd370a1
Support tool/merger.rb removetag under Git 
repository.
 2019-04-29 00:53:38 +09:00
Takashi Kokubun
fad2825e42
Support tool/merger.rb tag under Git repository 2019-04-29 00:19:58 +09:00
Takashi Kokubun
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
Takashi Kokubun
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
Takashi Kokubun
1c8cefca31
Stop using global variable for repos 
to avoid having impact from other places.
 2019-04-28 22:02:34 +09:00
Takashi Kokubun
cb8eb37377
Now tool/merger.rb may use Git [ci skip] 2019-04-28 21:53:58 +09:00
Takashi Kokubun
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
Takashi Kokubun
fcb1875513
Make Merger.version private to the module 
because it's not used outside the Module.
 2019-04-28 21:41:02 +09:00
Takashi Kokubun
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
k0kubun
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
k0kubun
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
k0kubun
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
k0kubun
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
k0kubun
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
k0kubun
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
nobu
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
naruse
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
usa
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
usa
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
usa
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
usa
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
nobu
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
naruse
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
normal
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