Mercurial > hgsubversion
view tests/test_fetch_branches.py @ 1233:0d0132cba155
editor: fix edge case with in memory file-store size limit
There are a few cases where we will set a single file into to the
editor's FileStore object more than once. Notably, for copied and
then modified files, we will set it at least twice. Three times if
editing fails (which it can for symlinks).
If we pass the in-memory storage limit in between the first (or second
if editing fails) time we set the file and the last time we set the
file, we will write the data to the in memory store the first time and
the file store the last time. We didn't remove it form the in-memory
store though, and we always prefer reading from the in-memory store.
This means we can sometimes end up with the wrong version of a file.
This is fairly unlikely to happen in normal use since you need to hit
the memory limit between two writes to the store for the same file.
We only write a file multiple times if a) the file (and not one of
it's parent directories) is copied and then modified or b) editing
fails. From what I can tell, it's only common for editing to fail for
symlinks, and they ten to be relatively small data that is unlikely to
push over the limit. Finally, the default limit is 100MB which I
would expect to be most often either well over (source code) or well
under (binaries or automated changes) the size of the changes files in
a single commit.
The easiest way to reproduce this is to set the in-memory cache size
to 0 and then commit a copied and modified symlink. The empty-string
version from the failed editing will be the one that persists. I
happened to stumble upon this while trying (and failing) to test a
bug-fix for a related bug with identical symptoms (empty simlink). I
have seen this in the wild, once, but couldn't reproduce it at the
time. The repo in question is quite large and quite active, so I am
quite confident in my estimation that this is a real, but very rare,
problem.
The test changes attached to this was mneant to test a related bug,
but turned out not to actually cover the bug in question. They did
trigger this bug though, and are worthwhile to test, so I kept them.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Mon, 07 Apr 2014 17:51:59 -0700 |
parents | ba8485b9fee0 |
children | a36e87ae2380 |
line wrap: on
line source
import test_util import unittest from mercurial import error from mercurial import hg from mercurial import node from hgsubversion import compathacks class TestFetchBranches(test_util.TestBase): stupid_mode_tests = True def _load_fixture_and_fetch_with_anchor(self, fixture_name, anchor): repo_path = self.load_svndump(fixture_name) source = '%s#%s' % (test_util.fileurl(repo_path), anchor) test_util.hgclone(self.ui(), source, self.wc_path) return hg.repository(self.ui(), self.wc_path) def branches(self, repo): hctxs = [repo[hn] for hn in repo.heads()] openbranches = set(ctx.branch() for ctx in hctxs if ctx.extra().get('close', None) != '1') closedbranches = set(ctx.branch() for ctx in hctxs if ctx.extra().get('close', None) == '1') return sorted(openbranches), sorted(closedbranches) def openbranches(self, repo): return self.branches(repo)[0] def test_rename_branch_parent(self): repo = self._load_fixture_and_fetch('rename_branch_parent_dir.svndump') heads = [repo[n] for n in repo.heads()] heads = dict([(ctx.branch(), ctx) for ctx in heads]) # Let these tests disabled yet as the fix is not obvious self.assertEqual(['dev_branch'], self.openbranches(repo)) def test_unrelatedbranch(self): repo = self._load_fixture_and_fetch('unrelatedbranch.svndump') heads = [repo[n] for n in repo.heads()] heads = dict([(ctx.branch(), ctx) for ctx in heads]) # Let these tests disabled yet as the fix is not obvious self.assertEqual(heads['branch1'].manifest().keys(), ['b']) self.assertEqual(heads['branch2'].manifest().keys(), ['a', 'b']) def test_unorderedbranch(self): repo = self._load_fixture_and_fetch('unorderedbranch.svndump') r = repo['branch'] self.assertEqual(0, r.parents()[0].rev()) self.assertEqual(['a', 'c', 'z'], sorted(r.manifest())) def test_renamed_branch_to_trunk(self): repo = self._load_fixture_and_fetch('branch_rename_to_trunk.svndump') self.assertEqual(repo['default'].parents()[0].branch(), 'dev_branch') self.assert_('iota' in repo['default']) self.assertEqual(repo['old_trunk'].parents()[0].branch(), 'default') self.assert_('iota' not in repo['old_trunk']) expected = ['default', 'old_trunk'] self.assertEqual(self.openbranches(repo), expected) def test_replace_trunk_with_branch(self): repo = self._load_fixture_and_fetch('replace_trunk_with_branch.svndump') self.assertEqual(repo['default'].parents()[0].branch(), 'test') self.assertEqual(repo['tip'].branch(), 'default') self.assertEqual(repo['tip'].extra().get('close'), '1') self.assertEqual(self.openbranches(repo), ['default']) def test_copybeforeclose(self): repo = self._load_fixture_and_fetch('copybeforeclose.svndump') self.assertEqual(repo['tip'].branch(), 'test') self.assertEqual(repo['test'].extra().get('close'), '1') self.assertEqual(repo['test']['b'].data(), 'a\n') def test_copyafterclose(self): repo = self._load_fixture_and_fetch('copyafterclose.svndump') self.assertEqual(repo['tip'].branch(), 'test') self.assert_('file' in repo['test']) self.assertEqual(repo['test']['file'].data(), 'trunk2\n') self.assert_('dir/file' in repo['test']) self.assertEqual(repo['test']['dir/file'].data(), 'trunk2\n') def test_branch_create_with_dir_delete_works(self): repo = self._load_fixture_and_fetch('branch_create_with_dir_delete.svndump') self.assertEqual(repo['tip'].manifest().keys(), ['alpha', 'beta', 'iota', 'gamma', ]) def test_branch_tip_update_to_default(self): repo = self._load_fixture_and_fetch('unorderedbranch.svndump', noupdate=False) self.assertEqual(repo[None].branch(), 'default') self.assertTrue('tip' not in repo[None].tags()) def test_branch_pull_anchor(self): self.assertRaises(error.RepoLookupError, self._load_fixture_and_fetch_with_anchor, 'unorderedbranch.svndump', 'NaN') repo = self._load_fixture_and_fetch_with_anchor( 'unorderedbranch.svndump', '4') self.assertTrue('c' not in compathacks.branchset(repo)) def test_branches_weird_moves(self): repo = self._load_fixture_and_fetch('renamedproject.svndump', subdir='project') heads = [repo[n] for n in repo.heads()] heads = dict((ctx.branch(), ctx) for ctx in heads) mdefault = sorted(heads['default'].manifest().keys()) mbranch = sorted(heads['branch'].manifest().keys()) self.assertEqual(mdefault, ['a', 'b', 'd/a']) self.assertEqual(mbranch, ['a']) def test_branch_delete_parent_dir(self): repo = self._load_fixture_and_fetch('branch_delete_parent_dir.svndump') openb, closedb = self.branches(repo) self.assertEqual(openb, []) self.assertEqual(closedb, ['dev_branch']) self.assertEqual(list(repo['dev_branch']), ['foo']) def test_replace_branch_with_branch(self): repo = self._load_fixture_and_fetch('replace_branch_with_branch.svndump') self.assertEqual(7, test_util.repolen(repo)) # tip is former topological branch1 being closed ctx = repo['tip'] self.assertEqual('1', ctx.extra().get('close', '0')) self.assertEqual('branch1', ctx.branch()) # r5 is where the replacement takes place ctx = repo[5] self.assertEqual(set(['a', 'c', 'dir/e', 'dir2/e', 'f', 'g']), set(ctx)) self.assertEqual('0', ctx.extra().get('close', '0')) self.assertEqual('branch1', ctx.branch()) self.assertEqual('c\n', ctx['c'].data()) self.assertEqual('d\n', ctx['a'].data()) self.assertEqual('e\n', ctx['dir/e'].data()) self.assertEqual('e\n', ctx['dir2/e'].data()) self.assertEqual('f\n', ctx['f'].data()) self.assertEqual('g\n', ctx['g'].data()) for f in ctx: self.assertTrue(not ctx[f].renamed()) def test_misspelled_branches_tags(self): config = { 'hgsubversion.branchdir': 'branchez', 'hgsubversion.tagpaths': 'tagz', } '''Tests using the tags dir for branches and the branches dir for tags''' repo = self._load_fixture_and_fetch('misspelled_branches_tags.svndump', layout='standard', config=config) heads = set([repo[n].branch() for n in repo.heads()]) expected_heads = set(['default', 'branch']) self.assertEqual(heads, expected_heads) tags = set(repo.tags()) expected_tags = set(['tip', 'tag_from_trunk', 'tag_from_branch']) self.assertEqual(tags, expected_tags) def test_subdir_branches_tags(self): '''Tests using the tags dir for branches and the branches dir for tags''' config = { 'hgsubversion.branchdir': 'bran/ches', 'hgsubversion.tagpaths': 'ta/gs', } repo = self._load_fixture_and_fetch('subdir_branches_tags.svndump', layout='standard', config=config) heads = set([repo[n].branch() for n in repo.heads()]) expected_heads = set(['default', 'branch']) self.assertEqual(heads, expected_heads) tags = set(repo.tags()) expected_tags = set(['tip', 'tag_from_trunk', 'tag_from_branch']) self.assertEqual(tags, expected_tags) def test_subproject_fetch(self): config = { 'hgsubversion.infix': 'project', } repo = self._load_fixture_and_fetch('subprojects.svndump', layout='standard', config=config) heads = set([repo[n].branch() for n in repo.heads()]) expected_heads = set(['default', 'branch']) self.assertEqual(heads, expected_heads) tags = set(repo.tags()) expected_tags = set(['tip', 'tag_from_trunk', 'tag_from_branch']) self.assertEqual(tags, expected_tags) for head in repo.heads(): ctx = repo[head] self.assertFalse('project/file' in ctx, 'failed to strip infix') self.assertTrue('file' in ctx, 'failed to track a simple file') self.assertFalse('other/phile' in ctx, 'pulled in other project') self.assertFalse('phile' in ctx, 'merged other project in repo') def suite(): all_tests = [unittest.TestLoader().loadTestsFromTestCase(TestFetchBranches), ] return unittest.TestSuite(all_tests)