summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-28 11:53:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-28 11:53:21 +0000
commita51acf36898f819d5da89165d394d638e505d78b (patch)
tree1c648fd5b74196099256d679aef4c426cc5a3d06 /tool
parentca64478089a6c43f56eef1d11a0ed8ac2d402f73 (diff)
* tool/change_maker.rb: change-log-mode needs tabs, and omit only
empty line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/change_maker.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/tool/change_maker.rb b/tool/change_maker.rb
index d1b29d64e9..456260cd4c 100755
--- a/tool/change_maker.rb
+++ b/tool/change_maker.rb
@@ -9,7 +9,7 @@ def diff2index(cmd, *argv)
path = $1
when /^@@\s*-[,\d]+ +\+(\d+)[,\d]*\s*@@(?: +([A-Za-z_][A-Za-z_0-9 ]*[A-Za-z_0-9]))?/
line = $1.to_i
- ent = "* #{path}"
+ ent = "\t* #{path}"
ent << " (#{$2})" if $2
lines << "#{ent}:"
end
@@ -20,10 +20,11 @@ end
if File.directory?(".svn")
cmd = "svn diff --diff-cmd=diff -x-pU0"
- puts diff2index(cmd, ARGV)
+ change = diff2index(cmd, ARGV)
elsif File.directory?(".git")
cmd = "git diff"
- puts diff2index(cmd, ARGV) || diff2index(cmd, "--cached", ARGV)
+ change = diff2index(cmd, ARGV) || diff2index(cmd, "--cached", ARGV)
else
abort "does not seem to be under a vcs"
end
+puts change if change