From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Duy Nguyen <pclouds@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v8 3/6] contrib: related: add support for multiple patches
Date: Fri, 31 May 2013 02:37:41 -0500 [thread overview]
Message-ID: <1369985864-31922-4-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369985864-31922-1-git-send-email-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
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
next prev parent reply other threads:[~2013-05-31 7:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 7:37 [PATCH v8 0/6] New git-related helper Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 1/6] Add new git-related helper to contrib Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 2/6] contrib: related: add option parsing Felipe Contreras
2013-05-31 7:37 ` Felipe Contreras [this message]
2013-05-31 7:37 ` [PATCH v8 4/6] contrib: related: add option to parse from committish Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 5/6] contrib: related: parse committish like format-patch Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 6/6] contrib: related: implement custom option parser Felipe Contreras
2013-05-31 7:48 ` [PATCH v8 0/6] New git-related helper Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369985864-31922-4-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).