Merge lp:~jelmer/lp-dev-utils/loc-contributions-author into lp:lp-dev-utils

[Jelmer Vernooij]

Default to the current users' email address in loc-contributions, since usually you're looking at your own LOC stats.

[j.c.sackett (jcsackett)]

Do we need this? Looking at Colin Watson's branch (the prereq for this one) it seems that this improvement has already been implemented in rev 107.

review: Needs Information

[Jelmer Vernooij (jelmer)]

Yep - see Colin's MP.

Unmerged revisions

110. By Jelmer Vernooij on 2012-05-17

Default to current users' email address.

106. By William Grant on 2012-03-14

Fix ec2's ~/.bazaar/bazaar.conf generator to include a [DEFAULT] section header, letting bzr 2.5 see the email options so it doesn't just send to localhost.

105. By Aaron Bentley on 2012-03-13

Merge compatibility fixes.

=== modified file 'loc-contributions'
--- loc-contributions	2012-05-17 12:11:18 +0000
+++ loc-contributions	2012-05-17 12:11:18 +0000
@@ -54,8 +54,9 @@
                 return
 
 
-def show_loc(options, author):
+def show_loc(options, author=None):
     branch = Branch.open(".")
+    author = branch.get_config_stack().get('email')
     logger = log.Logger(branch, {
         "direction": "forward",
         "start_revision": options.start_rev,
@@ -108,7 +109,7 @@
 
 
 def main(args):
-    usage = "%prog [options] AUTHOR"
+    usage = "%prog [options] [AUTHOR]"
     description = dedent("""\
         Show contributions to lines-of-code count by a given author.
 
@@ -122,10 +123,14 @@
     parser.add_option("--verbose", action="store_true", default=False,
                       help="Show detailed information about each revision.")
     options, args = parser.parse_args(args)
-    if len(args) != 1:
-        parser.error("must select an author")
+    if len(args) > 1:
+        parser.error("must select only one author")
+    elif len(args) == 1:
+        author = args[0]
+    else:
+        author = None
 
-    show_loc(options, args[0])
+    show_loc(options, author)
 
     return 0