| hg-reviewers |
I also snuck a %s -> %d in there to appease Python 3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| def createPack(self, revisions=None): | def createPack(self, revisions=None): | ||||
| """Creates and returns a historypack containing the specified revisions. | """Creates and returns a historypack containing the specified revisions. | ||||
| `revisions` is a list of tuples, where each tuple contains a filanem, | `revisions` is a list of tuples, where each tuple contains a filanem, | ||||
| node, p1node, p2node, and linknode. | node, p1node, p2node, and linknode. | ||||
| """ | """ | ||||
| if revisions is None: | if revisions is None: | ||||
| revisions = [("filename", self.getFakeHash(), nullid, nullid, | revisions = [(b"filename", self.getFakeHash(), nullid, nullid, | ||||
| self.getFakeHash(), None)] | self.getFakeHash(), None)] | ||||
| packdir = pycompat.fsencode(self.makeTempDir()) | packdir = pycompat.fsencode(self.makeTempDir()) | ||||
| packer = historypack.mutablehistorypack(uimod.ui(), packdir, | packer = historypack.mutablehistorypack(uimod.ui(), packdir, | ||||
| version=2) | version=2) | ||||
| for filename, node, p1, p2, linknode, copyfrom in revisions: | for filename, node, p1, p2, linknode, copyfrom in revisions: | ||||
| packer.add(filename, node, p1, p2, linknode, copyfrom) | packer.add(filename, node, p1, p2, linknode, copyfrom) | ||||
| path = packer.close() | path = packer.close() | ||||
| return historypack.historypack(path) | return historypack.historypack(path) | ||||
| def testAddSingle(self): | def testAddSingle(self): | ||||
| """Test putting a single entry into a pack and reading it out. | """Test putting a single entry into a pack and reading it out. | ||||
| """ | """ | ||||
| filename = "foo" | filename = b"foo" | ||||
| node = self.getFakeHash() | node = self.getFakeHash() | ||||
| p1 = self.getFakeHash() | p1 = self.getFakeHash() | ||||
| p2 = self.getFakeHash() | p2 = self.getFakeHash() | ||||
| linknode = self.getFakeHash() | linknode = self.getFakeHash() | ||||
| revisions = [(filename, node, p1, p2, linknode, None)] | revisions = [(filename, node, p1, p2, linknode, None)] | ||||
| pack = self.createPack(revisions) | pack = self.createPack(revisions) | ||||
| actual = pack.getancestors(filename, node)[node] | actual = pack.getancestors(filename, node)[node] | ||||
| self.assertEqual(p1, actual[0]) | self.assertEqual(p1, actual[0]) | ||||
| self.assertEqual(p2, actual[1]) | self.assertEqual(p2, actual[1]) | ||||
| self.assertEqual(linknode, actual[2]) | self.assertEqual(linknode, actual[2]) | ||||
| def testAddMultiple(self): | def testAddMultiple(self): | ||||
| """Test putting multiple unrelated revisions into a pack and reading | """Test putting multiple unrelated revisions into a pack and reading | ||||
| them out. | them out. | ||||
| """ | """ | ||||
| revisions = [] | revisions = [] | ||||
| for i in range(10): | for i in range(10): | ||||
| filename = "foo-%s" % i | filename = b"foo-%d" % i | ||||
| node = self.getFakeHash() | node = self.getFakeHash() | ||||
| p1 = self.getFakeHash() | p1 = self.getFakeHash() | ||||
| p2 = self.getFakeHash() | p2 = self.getFakeHash() | ||||
| linknode = self.getFakeHash() | linknode = self.getFakeHash() | ||||
| revisions.append((filename, node, p1, p2, linknode, None)) | revisions.append((filename, node, p1, p2, linknode, None)) | ||||
| pack = self.createPack(revisions) | pack = self.createPack(revisions) | ||||
| self.assertFalse(missing) | self.assertFalse(missing) | ||||
| fakenode = self.getFakeHash() | fakenode = self.getFakeHash() | ||||
| missing = pack.getmissing([(filename, revisions[0][1]), | missing = pack.getmissing([(filename, revisions[0][1]), | ||||
| (filename, fakenode)]) | (filename, fakenode)]) | ||||
| self.assertEqual(missing, [(filename, fakenode)]) | self.assertEqual(missing, [(filename, fakenode)]) | ||||
| # Test getmissing on a non-existant filename | # Test getmissing on a non-existant filename | ||||
| missing = pack.getmissing([("bar", fakenode)]) | missing = pack.getmissing([(b"bar", fakenode)]) | ||||
| self.assertEqual(missing, [("bar", fakenode)]) | self.assertEqual(missing, [(b"bar", fakenode)]) | ||||
| def testAddThrows(self): | def testAddThrows(self): | ||||
| pack = self.createPack() | pack = self.createPack() | ||||
| try: | try: | ||||
| pack.add(b'filename', nullid, nullid, nullid, nullid, None) | pack.add(b'filename', nullid, nullid, nullid, nullid, None) | ||||
| self.assertTrue(False, "historypack.add should throw") | self.assertTrue(False, "historypack.add should throw") | ||||
| except RuntimeError: | except RuntimeError: | ||||