Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changegroup: don't reuse 'mfest' variable for different type
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 28 Apr 2015 10:21:04 -0700
changeset 24900 59d1bf41af85
parent 24899 cf1ea7566b20
child 24901 e9edd53770fb
changegroup: don't reuse 'mfest' variable for different type We have a variable 'mfest' that's first a manifest nodeid and then a manifest. Let's make it clearer by using separate variables for the two uses.
mercurial/changegroup.py file | annotate | diff | comparison | revisions 
--- a/mercurial/changegroup.py	Tue Apr 28 10:19:42 2015 -0700
+++ b/mercurial/changegroup.py	Tue Apr 28 10:21:04 2015 -0700
@@ -789,8 +789,8 @@
         if repo.ui.configbool('server', 'validate', default=False):
             # validate incoming csets have their manifests
             for cset in xrange(clstart, clend):
-                mfest = repo.changelog.read(repo.changelog.node(cset))[0]
-                mfest = repo.manifest.readdelta(mfest)
+                mfnode = repo.changelog.read(repo.changelog.node(cset))[0]
+                mfest = repo.manifest.readdelta(mfnode)
                 # store file nodes we must see
                 for f, n in mfest.iteritems():
                     needfiles.setdefault(f, set()).add(n)
hg-stable