# HG changeset patch
# User Josef "Jeff" Sipek <jeff@josefsipek.net>
# Date 1156015254 14400
# Node ID 2a4d4aecb2b47fe1e70bcd996ca388d8aa664495
# Parent  c0be8990e819f48faa1c1e3fb6addea31e699404# Parent  a10adb6a9c9c7169803219141b729f731b4e04d8
Merge with Brendan Cully

diff --git a/hgext/churn.py b/hgext/churn.py
--- a/hgext/churn.py
+++ b/hgext/churn.py
@@ -12,6 +12,7 @@
 # <alias email> <actual email>
 
 from mercurial.demandload import *
+from mercurial.i18n import gettext as _
 demandload(globals(), 'time sys signal os')
 demandload(globals(), 'mercurial:hg,mdiff,fancyopts,commands,ui,util,templater')
 
@@ -69,12 +70,15 @@ def __gather(ui, repo, node1, node2):
 
     return (who, lines)
 
-def gather_stats(ui, repo, amap):
+def gather_stats(ui, repo, amap, revs=None):
     stats = {}
     
     cl    = repo.changelog
 
-    for rev in range(0,cl.count()):
+    if not revs:
+        revs = range(0, cl.count())
+
+    for rev in revs:
         node2    = cl.node(rev)
         node1    = cl.parents(node2)[0]
 
@@ -93,7 +97,7 @@ def gather_stats(ui, repo, amap):
 
     return stats
 
-def churn(ui, repo, aliases):
+def churn(ui, repo, **opts):
     "Graphs the number of lines changed"
     
     def pad(s, l):
@@ -117,6 +121,7 @@ def churn(ui, repo, aliases):
         return aliases
     
     amap = {}
+    aliases = opts.get('aliases')
     if aliases:
         try:
             f = open(aliases,"r")
@@ -126,8 +131,10 @@ def churn(ui, repo, aliases):
 
         amap = get_aliases(f)
         f.close()
-    
-    stats = gather_stats(ui, repo, amap)
+
+    revs = [int(r) for r in commands.revrange(ui, repo, opts['rev'])]
+    revs.sort()
+    stats = gather_stats(ui, repo, amap, revs)
 
     # make a list of tuples (name, lines) and sort it in descending order
     ordered = stats.items()
@@ -147,10 +154,7 @@ def churn(ui, repo, aliases):
 cmdtable = {
     "churn":
     (churn,
-     [('', 'aliases', '', 'file with email aliases')],
-    'hg churn [-a file]'),
+     [('r', 'rev', [], _('limit statistics to the specified revisions')),
+      ('', 'aliases', '', _('file with email aliases'))],
+    'hg churn [-r revision range] [-a file]'),
 }
-
-def reposetup(ui, repo):
-    pass
-