summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-14 15:17:05 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-14 15:17:05 +0000
commit4bbc67e4cfa3296bfe30f42d5cdf05cf5490b280 (patch)
tree19018757fb1e149ee8b8f8ad0acc7ec4cfa01ee4
parent760db25b55ac74c63b8349460c979ac5d9aaacff (diff)
* tool/file2lastrev.rb (VCS::GIT_SVN#get_revisions) :
use block argument 'path' to get the path given by super. * tool/file2lastrev.rb (VCS::GIT#get_revisions): use double quotes for Windows. patched by Vladimir Sizikov [ruby-core:28651] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rwxr-xr-xtool/file2lastrev.rb4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e98b5fd9b..88d6f74062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Mar 15 00:11:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/file2lastrev.rb (VCS::GIT_SVN#get_revisions) :
+ use block argument 'path' to get the path given by super.
+
+ * tool/file2lastrev.rb (VCS::GIT#get_revisions):
+ use double quotes for Windows.
+ patched by Vladimir Sizikov [ruby-core:28651]
+
Sun Mar 14 22:38:31 2010 Tanaka Akira <akr@fsij.org>
* tool/transcode-tblgen.rb: consider valid_encoding for max_input.
diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 66a13b457a..7eb918930f 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -56,7 +56,7 @@ class VCS
register(".git/svn")
def get_revisions(path)
- super do
+ super do |path|
info = `git svn info "#{path}"`
[info[/^Revision: (\d+)/, 1], info[/^Last Changed Rev: (\d+)/, 1]]
end
@@ -67,7 +67,7 @@ class VCS
register(".git")
def get_revisions(path)
- logcmd = %Q[git log -n1 --grep='^ *git-svn-id: .*@[0-9][0-9]* ']
+ logcmd = %Q[git log -n1 --grep="^ *git-svn-id: .*@[0-9][0-9]* "]
idpat = /git-svn-id: .*?@(\d+) \S+\Z/
super do
last = `#{logcmd}`[idpat, 1]