Mercurial > hg
view tests/test-simplekeyvaluefile.py @ 40923:3ed77780f4a6
wireprotov2: send linknodes to emitfilerevisions()
Previously, linknodes were calculated within emitfilerevisions() by
using filectx.introrev(), which would always use the linkrev/linknode
as recorded by storage. This is wrong for cases where the receiver
doesn't have the changeset the linknode refers to.
This commit changes the logic for linknode emission so the mapping
of filenode to linknode is computed by the caller and passed into
emitfilerevisions().
As part of the change, linknodes for "filesdata" in the
haveparents=False case are now correct: the existing code performed a
manifest walk and it was trivial to plug in the correct linknode.
However, behavior for the haveparents=True case is still wrong
because it relies on filtering linkrevs against the outgoing set in
order to determine what to send. This will be fixed in a subsequent
commit.
The change test test-wireproto-exchangev2-shallow.t is a bit wonky.
The test repo has 6 revisions. The changed test is performing a shallow
clone with depth=1. So, only file data for revision 5 is present
locally. So, the new behavior of associating the linknode with
revision 5 for every file revision seems correct. Of course, when
backfilling old revisions, we'll want to update the linknode. But
this problem requires wire protocol support and we'll cross that
bridge later.
Differential Revision: https://phab.mercurial-scm.org/D5405
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 10 Dec 2018 18:04:12 +0000 |
parents | 6eca47f6319d |
children | aaad36b88298 |
line wrap: on
line source
from __future__ import absolute_import import unittest import silenttestrunner from mercurial import ( error, scmutil, ) class mockfile(object): def __init__(self, name, fs): self.name = name self.fs = fs def __enter__(self): return self def __exit__(self, *args, **kwargs): pass def write(self, text): self.fs.contents[self.name] = text def read(self): return self.fs.contents[self.name] class mockvfs(object): def __init__(self): self.contents = {} def read(self, path): return mockfile(path, self).read() def readlines(self, path): # lines need to contain the trailing '\n' to mock the real readlines return [l for l in mockfile(path, self).read().splitlines(True)] def __call__(self, path, mode, atomictemp): return mockfile(path, self) class testsimplekeyvaluefile(unittest.TestCase): def setUp(self): self.vfs = mockvfs() def testbasicwritingiandreading(self): dw = {b'key1': b'value1', b'Key2': b'value2'} scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(dw) self.assertEqual(sorted(self.vfs.read(b'kvfile').split(b'\n')), [b'', b'Key2=value2', b'key1=value1']) dr = scmutil.simplekeyvaluefile(self.vfs, b'kvfile').read() self.assertEqual(dr, dw) if not getattr(unittest.TestCase, 'assertRaisesRegex', False): # Python 3.7 deprecates the regex*p* version, but 2.7 lacks # the regex version. assertRaisesRegex = (# camelcase-required unittest.TestCase.assertRaisesRegexp) def testinvalidkeys(self): d = {b'0key1': b'value1', b'Key2': b'value2'} with self.assertRaisesRegex(error.ProgrammingError, 'keys must start with a letter.*'): scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(d) d = {b'key1@': b'value1', b'Key2': b'value2'} with self.assertRaisesRegex(error.ProgrammingError, 'invalid key.*'): scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(d) def testinvalidvalues(self): d = {b'key1': b'value1', b'Key2': b'value2\n'} with self.assertRaisesRegex(error.ProgrammingError, 'invalid val.*'): scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(d) def testcorruptedfile(self): self.vfs.contents[b'badfile'] = b'ababagalamaga\n' with self.assertRaisesRegex(error.CorruptedState, 'dictionary.*element.*'): scmutil.simplekeyvaluefile(self.vfs, b'badfile').read() def testfirstline(self): dw = {b'key1': b'value1'} scmutil.simplekeyvaluefile(self.vfs, b'fl').write(dw, firstline=b'1.0') self.assertEqual(self.vfs.read(b'fl'), b'1.0\nkey1=value1\n') dr = scmutil.simplekeyvaluefile(self.vfs, b'fl')\ .read(firstlinenonkeyval=True) self.assertEqual(dr, {b'__firstline': b'1.0', b'key1': b'value1'}) if __name__ == "__main__": silenttestrunner.main(__name__)