Patchwork [4,of,6] changegroup: rename 'mf' to 'ml' to match 'cl', since it's a revlog

login
register
mail settings
Submitter Martin von Zweigbergk
Date May 1, 2015, 10:50 p.m.
Message ID <bb89e35096d2792b16f1.1430520642@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/8829/
State Accepted
Headers show

Comments

Martin von Zweigbergk - May 1, 2015, 10:50 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1430241582 25200
#      Tue Apr 28 10:19:42 2015 -0700
# Node ID bb89e35096d2792b16f102cad8f05a0e3b8534e1
# Parent  28c7322c4d565b61101b6c8da36bd361297d3535
changegroup: rename 'mf' to 'ml' to match 'cl', since it's a revlog

The 'mf' variable is a manifest revlog, not a manifest, so let's
rename it accordingly. We already call the changelog variable 'cl', so
'ml' seems appropriate.

Patch

diff -r 28c7322c4d56 -r bb89e35096d2 mercurial/changegroup.py
--- a/mercurial/changegroup.py	Mon Apr 20 14:11:20 2015 -0700
+++ b/mercurial/changegroup.py	Tue Apr 28 10:19:42 2015 -0700
@@ -358,7 +358,7 @@ 
         '''yield a sequence of changegroup chunks (strings)'''
         repo = self._repo
         cl = self._changelog
-        mf = self._manifest
+        ml = self._manifest
         reorder = self._reorder
         progress = self._progress
 
@@ -396,7 +396,7 @@ 
         def lookupmf(x):
             clnode = mfs[x]
             if not fastpathlinkrev or reorder:
-                mdata = mf.readfast(x)
+                mdata = ml.readfast(x)
                 for f, n in mdata.iteritems():
                     if f in changedfiles:
                         # record the first changeset introducing this filelog
@@ -407,9 +407,9 @@ 
                             fclnodes[n] = clnode
             return clnode
 
-        mfnodes = self.prune(mf, mfs, commonrevs)
+        mfnodes = self.prune(ml, mfs, commonrevs)
         size = 0
-        for chunk in self.group(mfnodes, mf, lookupmf, units=_('manifests'),
+        for chunk in self.group(mfnodes, ml, lookupmf, units=_('manifests'),
                                 reorder=reorder):
             size += len(chunk)
             yield chunk