mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
69d6e315b5
* configure.in (AC_CONFIG_FILES): $srcdir/.git can be a file pointing the real git_dir, such as when the git working tree is a "linked working tree" (a working tree created by git-worktree). So use git-rev-parse --git-dir to check if $srcdir is the top-level of a git repository, not just checking if the $srcdir/.git directory does exist or not. [ruby-core:74759] [Bug #12239] * tool/change_maker.rb: use tool/vcs.rb to detect VCS. This used to have its own VCS detection code, while we have tool/vcs.rb. * tool/vcs.rb (detect): remove code duplication git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
44 lines
1,004 B
Ruby
Executable file
44 lines
1,004 B
Ruby
Executable file
#! ./miniruby
|
|
|
|
$:.unshift(File.expand_path("../../lib", __FILE__))
|
|
require File.expand_path("../vcs", __FILE__)
|
|
|
|
def diff2index(cmd, *argv)
|
|
lines = []
|
|
path = nil
|
|
output = `#{cmd} #{argv.join(" ")}`
|
|
if defined? Encoding::BINARY
|
|
output.force_encoding Encoding::BINARY
|
|
end
|
|
output.each_line do |line|
|
|
case line
|
|
when /^Index: (\S*)/, /^diff --git [a-z]\/(\S*) [a-z]\/\1/
|
|
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 = "\t* #{path}"
|
|
ent << " (#{$2})" if $2
|
|
lines << "#{ent}:"
|
|
end
|
|
end
|
|
lines.uniq!
|
|
lines.empty? ? nil : lines
|
|
end
|
|
|
|
vcs = begin
|
|
VCS.detect(".")
|
|
rescue VCS::NotFoundError
|
|
nil
|
|
end
|
|
|
|
case vcs
|
|
when VCS::SVN
|
|
cmd = "svn diff --diff-cmd=diff -x-pU0"
|
|
change = diff2index(cmd, ARGV)
|
|
when VCS::GIT
|
|
cmd = "git diff -U0"
|
|
change = diff2index(cmd, ARGV) || diff2index(cmd, "--cached", ARGV)
|
|
else
|
|
abort "does not seem to be under a vcs"
|
|
end
|
|
puts change if change
|