diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-01 23:16:47 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-07-01 23:16:47 +0900 |
| commit | 7ff2bfed92f8017184963eaac13e75cfb5ce5d4a (patch) | |
| tree | 7937be8e6ef623ad300ee611cbdbb85d955fa337 | |
| parent | f2769ae2c9f5c5a902584282f1e512437db1f395 (diff) | |
Alias "master" and "trunk"
| -rwxr-xr-x | tool/make-snapshot | 4 | ||||
| -rw-r--r-- | tool/vcs.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 8b60ee21cb..b166c7258f 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -42,7 +42,7 @@ options: -s3=PATH s3 bucket path(default=tmp) -help, --help show this message version: - trunk, stable, branches/*, tags/*, X.Y, X.Y.Z, X.Y.Z-pL + master, trunk, stable, branches/*, tags/*, X.Y, X.Y.Z, X.Y.Z-pL each versions may be followed by optional @revision. USAGE end @@ -207,7 +207,7 @@ def package(vcs, rev, destdir, tmp = nil) case rev when nil url = nil - when /\Atrunk\z/ + when /\A(?:master|trunk)\z/ url = vcs.trunk when /\Abranches\// url = vcs.branch($') diff --git a/tool/vcs.rb b/tool/vcs.rb index 4554da35c8..dd6162c8c2 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -326,6 +326,7 @@ class VCS def trunk url + "trunk" end + alias master trunk def branch_list(pat) IO.popen(%W"#{COMMAND} ls #{branch('')}") do |f| @@ -507,9 +508,10 @@ class VCS alias tag branch - def trunk - branch("trunk") + def master + branch("master") end + alias trunk master def stable cmd = %W"#{COMMAND} for-each-ref --format=\%(refname:short) refs/heads/ruby_[0-9]*" |