[PATCH] treemanifest: fix bad argument order to treemanifestctx
Martin von Zweigbergk
martinvonz at google.com
Mon Oct 17 23:13:56 UTC 2016
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1476745932 25200
# Mon Oct 17 16:12:12 2016 -0700
# Node ID b36a81cd4015b9742d1fbb0d5f94207e7a400cdb
# Parent 8a864844d5a0c34bdb24d2e098a0cd339e32e020
treemanifest: fix bad argument order to treemanifestctx
Found by running tests with _treeinmem (both of them) modified to be
True.
diff -r 8a864844d5a0 -r b36a81cd4015 mercurial/manifest.py
--- a/mercurial/manifest.py Wed Oct 12 21:33:45 2016 +0200
+++ 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():
More information about the Mercurial-devel
mailing list