Patchwork [1,of,6,stable] cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher

login
register
mail settings
Submitter Siddharth Agarwal
Date Aug. 13, 2014, 11:05 p.m.
Message ID <a3921b24a97d4f0fa48d.1407971120@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/5384/
State Accepted
Headers show

Comments

Siddharth Agarwal - Aug. 13, 2014, 11:05 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1407968113 25200
#      Wed Aug 13 15:15:13 2014 -0700
# Branch stable
# Node ID a3921b24a97d4f0fa48d58edb6a5cf8c355b7df1
# Parent  f72b71ba756bc3250e49678598609cacb720ae33
cmdutil: rename _makelogfilematcher to _makefollowlogfilematcher

We're going to add a _makenofollowlogfilematcher in an upcoming patch.

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1492,7 +1492,7 @@ 
 
     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 @@ 
         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