From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Duy Nguyen <pclouds@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v10 08/15] contrib: related: show role count
Date: Sat, 12 Oct 2013 02:06:23 -0500 [thread overview]
Message-ID: <1381561584-20529-15-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1381561584-20529-1-git-send-email-felipe.contreras@gmail.com>
Instead of showing the total involvement, show it per role: author, or
signer.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/related/git-related | 18 +++++++++++++-----
contrib/related/test-related.t | 30 +++++++++++++++---------------
2 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 3cac925..04c56f5 100755
--- a/contrib/related/git-related
+++ b/contrib/related/git-related
@@ -16,10 +16,12 @@ class Person
@name = name
@email = email
@commits = {}
+ @roles = Hash.new(0)
end
- def add_role(commit)
+ def add_role(commit, role)
@commits[commit] = true
+ @roles[role] += 1
end
def <=>(b)
@@ -64,20 +66,20 @@ class Commit
end
def parse(data)
- in_body = nil
+ in_body = author = nil
data.each_line do |line|
if not in_body
case line
when /^author ([^<>]+) <(\S+)> (.+)$/
author = Persons.get($1, $2)
- author.add_role(@id)
+ author.add_role(@id, :author)
when /^$/
in_body = true
end
else
if line =~ /^(Signed-off-by|Reviewed-by|Acked-by|Cc): ([^<>]+) <(\S+?)>$/
person = Persons.get($2, $3)
- person.add_role(@id)
+ person.add_role(@id, :signer) if person != author
end
end
end
@@ -204,5 +206,11 @@ persons = Persons.new
persons.sort.reverse.each do |person|
percent = person.size.to_f * 100 / commits.size
next if percent < $min_percent
- puts '%s (involved: %u%%)' % [person, percent]
+
+ roles = person.roles.map do |role, role_count|
+ role_percent = role_count.to_f * 100 / commits.size
+ '%s: %u%%' % [role, role_percent]
+ end
+
+ puts '%s (%s)' % [person, roles.join(', ')]
end
diff --git a/contrib/related/test-related.t b/contrib/related/test-related.t
index ec2680a..90cc516 100755
--- a/contrib/related/test-related.t
+++ b/contrib/related/test-related.t
@@ -34,8 +34,8 @@ test_expect_success "basic" "
git format-patch --stdout -1 basic > patch &&
git related patch | sort > actual &&
cat > expected <<-EOF &&
- Jon Stewart <jon@stewart.com> (involved: 50%)
- Pablo Escobar <pablo@escobar.com> (involved: 50%)
+ Jon Stewart <jon@stewart.com> (author: 50%)
+ Pablo Escobar <pablo@escobar.com> (author: 50%)
EOF
test_cmp expected actual
"
@@ -44,9 +44,9 @@ test_expect_success "others" "
git format-patch --stdout -1 master > patch &&
git related patch | sort > actual &&
cat > expected <<-EOF &&
- John Doe <john@doe.com> (involved: 33%)
- John Poppins <john@doe.com> (involved: 33%)
- Jon Stewart <jon@stewart.com> (involved: 66%)
+ John Doe <john@doe.com> (author: 33%)
+ John Poppins <john@doe.com> (author: 33%)
+ Jon Stewart <jon@stewart.com> (signer: 33%, author: 33%)
EOF
test_cmp expected actual
"
@@ -56,10 +56,10 @@ test_expect_success "multiple patches" "
git format-patch --stdout -1 master^ > patch2 &&
git related patch1 patch2 | sort > actual &&
cat > expected <<-EOF &&
- John Doe <john@doe.com> (involved: 25%)
- John Poppins <john@doe.com> (involved: 25%)
- Jon Stewart <jon@stewart.com> (involved: 50%)
- Pablo Escobar <pablo@escobar.com> (involved: 25%)
+ John Doe <john@doe.com> (author: 25%)
+ John Poppins <john@doe.com> (author: 25%)
+ Jon Stewart <jon@stewart.com> (signer: 25%, author: 25%)
+ Pablo Escobar <pablo@escobar.com> (author: 25%)
EOF
test_cmp expected actual
"
@@ -67,9 +67,9 @@ test_expect_success "multiple patches" "
test_expect_success "from committish" "
git related -1 master | sort > actual &&
cat > expected <<-EOF &&
- John Doe <john@doe.com> (involved: 33%)
- John Poppins <john@doe.com> (involved: 33%)
- Jon Stewart <jon@stewart.com> (involved: 66%)
+ John Doe <john@doe.com> (author: 33%)
+ John Poppins <john@doe.com> (author: 33%)
+ Jon Stewart <jon@stewart.com> (signer: 33%, author: 33%)
EOF
test_cmp expected actual
"
@@ -77,9 +77,9 @@ test_expect_success "from committish" "
test_expect_success "from single rev committish" "
git related -1 master | sort > actual &&
cat > expected <<-EOF &&
- John Doe <john@doe.com> (involved: 33%)
- John Poppins <john@doe.com> (involved: 33%)
- Jon Stewart <jon@stewart.com> (involved: 66%)
+ John Doe <john@doe.com> (author: 33%)
+ John Poppins <john@doe.com> (author: 33%)
+ Jon Stewart <jon@stewart.com> (signer: 33%, author: 33%)
EOF
test_cmp expected actual
"
--
1.8.4-fc
next prev parent reply other threads:[~2013-10-12 7:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 7:06 [PATCH v10 14/15] contrib: related: add option to show commits Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 00/15] New git-related helper Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 07/15] contrib: related: add helper Person classes Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 10/15] contrib: related: group persons with same email Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 02/15] contrib: related: add tests Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 06/15] contrib: related: print the amount of involvement Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 04/15] contrib: related: add option to parse from committish Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 15/15] contrib: related: add README Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 09/15] contrib: related: add support for more roles Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 03/15] contrib: related: add support for multiple patches Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 12/15] contrib: related: add mailmap support Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 13/15] contrib: related: add option parsing Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 01/15] Add new git-related helper to contrib Felipe Contreras
2013-10-12 7:06 ` [PATCH v10 11/15] contrib: related: allow usage on other directories Felipe Contreras
2013-10-12 7:06 ` Felipe Contreras [this message]
2013-10-12 7:06 ` [PATCH v10 05/15] contrib: related: parse committish like format-patch 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=1381561584-20529-15-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--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).