kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Shorten git revision name without "r" prefix in snapshot

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-04-28 02:00:39 +09:00
parent 2c283655a6
commit 7790b610b8
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tool/make-snapshot
View file

@ -301,14 +301,14 @@ def package(vcs, rev, destdir, tmp = nil)
unless tag.empty?
versionhdr ||= IO.read("#{v}/version.h")
patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}")
tag = (patchlevel ? "p#{patchlevel}" : vcs.revision_name(revision))
end
elsif prerelease
versionhdr ||= IO.read("#{v}/version.h")
versionhdr.sub!(/^\#define\s+RUBY_PATCHLEVEL_STR\s+"\K.+?(?=")/, tag)
IO.write("#{v}/version.h", versionhdr)
else
tag ||= "r#{revision}"
tag ||= vcs.revision_name(revision)
end
unless v == $exported
if $archname

21
tool/vcs.rb
View file

@ -220,10 +220,18 @@ class VCS
def after_export(dir)
end
def revision_name(rev)
self.class.revision_name(rev)
end
class SVN < self
register(".svn")
COMMAND = ENV['SVN'] || 'svn'
def self.revision_name(rev)
"r#{rev}"
end
def self.get_revisions(path, srcdir = nil)
if srcdir and local_path?(path)
path = File.join(srcdir, path)
@ -374,20 +382,25 @@ class VCS
def self.get_revisions(path, srcdir = nil)
gitcmd = [COMMAND]
last = cmd_read_at(srcdir, [[*gitcmd, 'rev-parse', 'HEAD']]).rstrip
last = cmd_read_at(srcdir, [[*gitcmd, 'rev-parse', '--short', 'HEAD']]).rstrip
if path
log = cmd_read_at(srcdir, [[*gitcmd, 'log', '-n1', '--date=iso', path]])
else
log = cmd_read_at(srcdir, [[*gitcmd, 'log', '-n1', '--date=iso']])
end
changed = log[/\Acommit (\h+)/, 1]
changed = changed[0, last.size]
modified = log[/^Date:\s+(.*)/, 1]
branch = cmd_read_at(srcdir, [gitcmd + %W[symbolic-ref HEAD]])[%r'\A(?:refs/heads/)?(.+)', 1]
branch = cmd_read_at(srcdir, [gitcmd + %W[symbolic-ref --short HEAD]])
title = cmd_read_at(srcdir, [gitcmd + %W[log --format=%s -n1 FETCH_HEAD..HEAD]])
title = nil if title.empty?
[last, changed, modified, branch, title]
end
def self.revision_name(rev)
rev
end
def initialize(*)
super
if srcdir = @srcdir and self.class.local_path?(srcdir)
@ -488,6 +501,10 @@ class VCS
end
class GITSVN < GIT
def self.revision_name(rev)
SVN.short_revision(rev)
end
def format_changelog(r, path)
open(path, 'w') do |w|
sep = "-"*72