grep: incrementing is always False during 'iter'

mercurial/commands.py

@@ -1151,7 +1151,7 b' def grep(ui, repo, pattern, *pats, **opt'
     def display(fn, rev, states, prevstates):
         counts = {'-': 0, '+': 0}
         filerevmatches = {}
-        if incrementing or not opts['all']:
+        if not opts['all']:
             a, b, r = prevstates, states, rev
         else:
             a, b, r = states, prevstates, prev.get(fn, -1)
@@ -1179,11 +1179,9 b' def grep(ui, repo, pattern, *pats, **opt'
     get = util.cachefunc(lambda r: repo.changectx(r).changeset())
     changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
     count = 0
-    incrementing = False
     follow = opts.get('follow')
     for st, rev, fns in changeiter:
         if st == 'window':
-            incrementing = rev
             matches.clear()
         elif st == 'add':
             mf = repo.changectx(rev).manifest()
@@ -1209,7 +1207,7 b' def grep(ui, repo, pattern, *pats, **opt'
                     if copy:
                         skip[copy] = True
                     continue
-                if incrementing or not opts['all'] or fstate[fn]:
+                if not opts['all'] or fstate[fn]:
                     pos, neg = display(fn, rev, m, fstate[fn])
                     count += pos + neg
                     if pos and not opts['all']:
@@ -1221,7 +1219,6 b' def grep(ui, repo, pattern, *pats, **opt'
                     fstate[copy] = m
                 prev[fn] = rev
 
-    if not incrementing:
         fstate = fstate.items()
         fstate.sort()
         for fn, state in fstate:

tests/test-grep

@@ -17,8 +17,11 b" hg commit -m 3 -u eggs -d '3 0'"
 head -n 3 port > port1
 mv port1 port
 hg commit -m 4 -u spam -d '4 0'
+echo % simple
 hg grep port port
+echo % all
 hg grep --all -nu port port
+echo % other
 hg grep import port
 
 hg cp port port2

tests/test-grep.out

@@ -1,6 +1,8 b''
+% simple
 port:4:export
 port:4:vaportight
 port:4:import/export
+% all
 port:4:4:-:spam:import/export
 port:3:4:+:eggs:import/export
 port:2:1:-:spam:import
@@ -10,6 +12,7 b' port:2:2:+:spam:vaportight'
 port:2:3:+:spam:import/export
 port:1:2:+:eggs:export
 port:0:1:+:spam:import
+% other
 port:4:import/export
 % follow
 port:0:import