From b112932fc10d8e9fd1d87541983f4cd965661ebc Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Wed, 13 Aug 2014 15:15:13 -0700 Subject: [PATCH] cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher We're going to add a _makenofollowlogfilematcher in an upcoming patch. --- mercurial/cmdutil.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py index 67bf26bb70..04d981f3f9 100644 --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1492,7 +1492,7 @@ def walkchangerevs(repo, match, opts, prepare): return iterate() -def _makelogfilematcher(repo, files, followfirst): +def _makefollowlogfilematcher(repo, files, followfirst): # When displaying a revision with --patch --follow FILE, we have # to know which file of the revision must be diffed. With # --follow, we want the names of the ancestors of FILE in the @@ -1632,7 +1632,8 @@ def _makelogrevset(repo, pats, opts, revs): if follow and not match.always(): # _makelogfilematcher expects its files argument to be relative to # the repo root, so use match.files(), not pats. - filematcher = _makelogfilematcher(repo, match.files(), followfirst) + filematcher = _makefollowlogfilematcher(repo, match.files(), + followfirst) else: filematcher = lambda rev: match