grep: move getbody() to grepsearcher class

mercurial/commands.py

@@ -3404,16 +3404,6 b' def grep(ui, repo, pattern, *pats, **opt'
     matches = searcher._matches
     copies = searcher._copies
 
-    def grepbody(fn, rev, body):
-        matches[rev].setdefault(fn, [])
-        m = matches[rev][fn]
-        if body is None:
-            return
-
-        for lnum, cstart, cend, line in grepmod.matchlines(body, regexp):
-            s = grepmod.linestate(line, lnum, cstart, cend)
-            m.append(s)
-
     uipathfn = scmutil.getuipathfn(repo)
 
     def display(fm, fn, ctx, pstates, states):
@@ -3591,12 +3581,12 b' def grep(ui, repo, pattern, *pats, **opt'
                 files.append(fn)
 
                 if fn not in matches[rev]:
-                    grepbody(fn, rev, readfile(ctx, fn))
+                    searcher._grepbody(fn, rev, readfile(ctx, fn))
 
                 if diff:
                     pfn = copy or fn
                     if pfn not in matches[parent] and pfn in pctx:
-                        grepbody(pfn, parent, readfile(pctx, pfn))
+                        searcher._grepbody(pfn, parent, readfile(pctx, pfn))
 
     wopts = logcmdutil.walkopts(
         pats=pats,

mercurial/grep.py

@@ -90,3 +90,13 b' class grepsearcher(object):'
         self._copies = {}
         self._skip = set()
         self._revfiles = {}
+
+    def _grepbody(self, fn, rev, body):
+        self._matches[rev].setdefault(fn, [])
+        m = self._matches[rev][fn]
+        if body is None:
+            return
+
+        for lnum, cstart, cend, line in matchlines(body, self._regexp):
+            s = linestate(line, lnum, cstart, cend)
+            m.append(s)