Test for log --prune.

mercurial/commands.py

@@ -183,7 +183,6 b' def walkchangerevs(ui, repo, pats, opts)'
                 fncache[rev] = matches
                 wanted[rev] = 1
 
-    def iterate():
         class followfilter:
             def __init__(self, onlyfirst=False):
                 self.startrev = -1
@@ -220,12 +219,23 b' def walkchangerevs(ui, repo, pats, opts)'
 
                 return False
 
+    # it might be worthwhile to do this in the iterator if the rev range
+    # is descending and the prune args are all within that range
+    for rev in opts.get('prune'):
+        rev = repo.changelog.rev(repo.lookup(rev))
+        ff = followfilter()
+        stop = min(revs[0], revs[-1])
+        for x in range(rev, stop-1, -1):
+            if ff.match(x) and wanted.has_key(x):
+                del wanted[x]
+
+    def iterate():
         if follow and not files:
             ff = followfilter(onlyfirst=opts.get('follow_first'))
             def want(rev):
-                if rev not in wanted:
+                if ff.match(rev) and rev in wanted:
+                    return True
                     return False
-                return ff.match(rev)
         else:
             def want(rev):
                 return rev in wanted
@@ -2966,6 +2976,7 b' table = {'
           ('', 'style', '', _('display using template map file')),
           ('m', 'only-merges', None, _('show only merges')),
           ('p', 'patch', None, _('show patch')),
+          ('P', 'prune', [], _('do not display revision or any of its ancestors')),
           ('', 'template', '', _('display with template')),
           ('I', 'include', [], _('include names matching the given patterns')),
           ('X', 'exclude', [], _('exclude names matching the given patterns'))],

tests/test-log

@@ -63,3 +63,6 b" hg ci -Amb1.1 -d'1 0'"
 
 echo % log --follow-first
 hg log --follow-first
+
+echo % log -P 2
+hg log -P 2

tests/test-log.out

@@ -149,3 +149,29 b' user: test'
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     base
 
+% log -P 2
+changeset:   6:2404bbcab562
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     b1.1
+
+changeset:   5:302e9dd6890d
+parent:      3:e62f78d544b4
+parent:      4:ddb82e70d1a1
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     m12
+
+changeset:   4:ddb82e70d1a1
+parent:      0:67e992f2c4f3
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     b2
+
+changeset:   3:e62f78d544b4
+parent:      1:3d5bf5654eda
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     b1
+