[PATCH v2 3/8] contrib: cc-cmd: add support for multiple patches
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:56:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- contrib/cc-cmd/git-cc-cmd | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/contrib/cc-cmd/git-cc-cmd b/contrib/cc-cmd/git-cc-cmd
index 0a5ec01..e36b1bf 100755
--- a/contrib/cc-cmd/git-cc-cmd
+++ b/contrib/cc-cmd/git-cc-cmd@@ -8,7 +8,7 @@ $min_percent = 5 begin OptionParser.new do |opts| opts.program_name = 'git cc-cmd' - opts.banner = 'usage: git cc-cmd [options] <file>' + opts.banner = 'usage: git cc-cmd [options] <files>' opts.on('-p', '--min-percent N', Integer, 'Minium percentage of role participation') do |v| $min_percent = v
@@ -66,6 +66,7 @@ class Commits def initialize() @items = {} + @main_commits = {} end def size
@@ -103,24 +104,27 @@ class Commits p.each do |line| if line =~ /^(\h{40})/ id = $1 - @items[id] = Commit.new(id) + @items[id] = Commit.new(id) if not @main_commits.include?(id) end end end end - def from_patch(file) + def from_patches(files) source = nil - from = nil - File.open(file) do |f| - f.each do |line| - case line - when /^From (\h+) (.+)$/ - from = $1 - when /^---\s+(\S+)/ - source = $1 != '/dev/null' ? $1[2..-1] : nil - when /^@@\s-(\d+),(\d+)/ - get_blame(source, $1, $2, from) + files.each do |file| + from = nil + File.open(file) do |f| + f.each do |line| + case line + when /^From (\h+) (.+)$/ + from = $1 + @main_commits[from] = true + when /^---\s+(\S+)/ + source = $1 != '/dev/null' ? $1[2..-1] : nil + when /^@@\s-(\d+),(\d+)/ + get_blame(source, $1, $2, from) + end end end end
@@ -128,10 +132,8 @@ class Commits end -exit 1 if ARGV.size != 1 - commits = Commits.new -commits.from_patch(ARGV[0]) +commits.from_patches(ARGV) commits.import # hash of hashes
--
1.8.2.1.790.g4588561