treemanifest: fix bad argument order to treemanifestctx
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 17 Oct 2016 16:12:12 -0700
changeset 30207 abe723002509
parent 30206 d105195436c0
child 30208 87a7c0d403ff
treemanifest: fix bad argument order to treemanifestctx Found by running tests with _treeinmem (both of them) modified to be True.
mercurial/manifest.py
--- a/mercurial/manifest.py	Sun Oct 16 11:10:21 2016 -0700
+++ b/mercurial/manifest.py	Mon Oct 17 16:12:12 2016 -0700
@@ -1386,7 +1386,7 @@
         # Need to perform a slow delta
         revlog = self._revlog
         r0 = revlog.deltaparent(revlog.rev(self._node))
-        m0 = treemanifestctx(revlog, revlog.node(r0), dir=self._dir).read()
+        m0 = treemanifestctx(revlog, self._dir, revlog.node(r0)).read()
         m1 = self.read()
         md = treemanifest(dir=self._dir)
         for f, ((n0, fl0), (n1, fl1)) in m0.diff(m1).iteritems():