* 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
This commit is contained in:
parent
ca64478089
commit
a51acf3689
@ -9,7 +9,7 @@ def diff2index(cmd, *argv)
|
|||||||
path = $1
|
path = $1
|
||||||
when /^@@\s*-[,\d]+ +\+(\d+)[,\d]*\s*@@(?: +([A-Za-z_][A-Za-z_0-9 ]*[A-Za-z_0-9]))?/
|
when /^@@\s*-[,\d]+ +\+(\d+)[,\d]*\s*@@(?: +([A-Za-z_][A-Za-z_0-9 ]*[A-Za-z_0-9]))?/
|
||||||
line = $1.to_i
|
line = $1.to_i
|
||||||
ent = "* #{path}"
|
ent = "\t* #{path}"
|
||||||
ent << " (#{$2})" if $2
|
ent << " (#{$2})" if $2
|
||||||
lines << "#{ent}:"
|
lines << "#{ent}:"
|
||||||
end
|
end
|
||||||
@ -20,10 +20,11 @@ end
|
|||||||
|
|
||||||
if File.directory?(".svn")
|
if File.directory?(".svn")
|
||||||
cmd = "svn diff --diff-cmd=diff -x-pU0"
|
cmd = "svn diff --diff-cmd=diff -x-pU0"
|
||||||
puts diff2index(cmd, ARGV)
|
change = diff2index(cmd, ARGV)
|
||||||
elsif File.directory?(".git")
|
elsif File.directory?(".git")
|
||||||
cmd = "git diff"
|
cmd = "git diff"
|
||||||
puts diff2index(cmd, ARGV) || diff2index(cmd, "--cached", ARGV)
|
change = diff2index(cmd, ARGV) || diff2index(cmd, "--cached", ARGV)
|
||||||
else
|
else
|
||||||
abort "does not seem to be under a vcs"
|
abort "does not seem to be under a vcs"
|
||||||
end
|
end
|
||||||
|
puts change if change
|
||||||
|
Loading…
x
Reference in New Issue
Block a user