Signed-off-by: Felipe Contreras <[email protected]>
---
contrib/related/git-related | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index bde5b99..0de1c6c 100755
--- a/contrib/related/git-related
+++ b/contrib/related/git-related
@@ -10,7 +10,7 @@ $min_percent = 10
OptionParser.new do |opts|
opts.program_name = 'git related'
- opts.banner = 'usage: git related [options] <file>'
+ opts.banner = 'usage: git related [options] <files>'
opts.on('-p', '--min-percent N', Integer,
'Minium percentage of role participation') do |v|
@@ -56,6 +56,7 @@ class Commits
def initialize
@items = {}
+ @main_commits = {}
end
def size
@@ -91,23 +92,27 @@ class Commits
p.each do |line|
if line =~ /^\h{40}/
id = $&
- @items[id] = Commit.new(id)
+ @items[id] = Commit.new(id) if not @main_commits.include?(id)
end
end
end
end
- def from_patch(file)
- from = source = 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 /^@@ -(\d+)(?:,(\d+))?/
- get_blame(source, $1, $2, from) if source and from
+ def from_patches(files)
+ source = nil
+ 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 /^@@ -(\d+)(?:,(\d+))?/
+ get_blame(source, $1, $2, from) if source and from
+ end
end
end
end
@@ -115,10 +120,8 @@ class Commits
end
-exit 1 if ARGV.size != 1
-
commits = Commits.new
-commits.from_patch(ARGV[0])
+commits.from_patches(ARGV)
commits.import
count_per_person = Hash.new(0)
--
1.8.3.358.g5a91d05
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
