Alias "master" and "trunk"

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($')

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]*"