# HG changeset patch # User Martin von Zweigbergk # Date 2015-04-28 17:19:42 # Node ID cf1ea7566b209dfe090cc6ca8eba65e7f300293e # Parent 0bbf061564cfde660d11881e4e026d0d19f75e1c 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. diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -358,7 +358,7 @@ class cg1packer(object): '''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 @@ class cg1packer(object): 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 @@ class cg1packer(object): 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