Mercurial > hgsubversion
comparison tests/test_fetch_branches.py @ 1570:d55c9d0ba350
tests: use scmutils.revsymbol instead of repo.__getitem__ for non-integers
author | Paul Morelle <paul.morelle@octobus.net> |
---|---|
date | Fri, 25 May 2018 11:52:03 +0200 |
parents | 253b2ab253a1 |
children | 7bb6562feb85 |
comparison
equal
deleted
inserted
replaced
1569:4afe8d7e4602 | 1570:d55c9d0ba350 |
---|---|
5 from mercurial import error | 5 from mercurial import error |
6 from mercurial import hg | 6 from mercurial import hg |
7 from mercurial import node | 7 from mercurial import node |
8 | 8 |
9 from hgsubversion import compathacks | 9 from hgsubversion import compathacks |
10 | |
11 revsymbol = test_util.revsymbol | |
10 | 12 |
11 class TestFetchBranches(test_util.TestBase): | 13 class TestFetchBranches(test_util.TestBase): |
12 stupid_mode_tests = True | 14 stupid_mode_tests = True |
13 | 15 |
14 def _load_fixture_and_fetch_with_anchor(self, fixture_name, anchor): | 16 def _load_fixture_and_fetch_with_anchor(self, fixture_name, anchor): |
44 self.assertEqual(sorted(heads['branch2'].manifest().keys()), | 46 self.assertEqual(sorted(heads['branch2'].manifest().keys()), |
45 ['a', 'b']) | 47 ['a', 'b']) |
46 | 48 |
47 def test_unorderedbranch(self): | 49 def test_unorderedbranch(self): |
48 repo = self._load_fixture_and_fetch('unorderedbranch.svndump') | 50 repo = self._load_fixture_and_fetch('unorderedbranch.svndump') |
49 r = repo['branch'] | 51 r = revsymbol(repo, 'branch') |
50 self.assertEqual(0, r.parents()[0].rev()) | 52 self.assertEqual(0, r.parents()[0].rev()) |
51 self.assertEqual(['a', 'c', 'z'], sorted(r.manifest())) | 53 self.assertEqual(['a', 'c', 'z'], sorted(r.manifest())) |
52 | 54 |
53 def test_renamed_branch_to_trunk(self): | 55 def test_renamed_branch_to_trunk(self): |
54 repo = self._load_fixture_and_fetch('branch_rename_to_trunk.svndump') | 56 repo = self._load_fixture_and_fetch('branch_rename_to_trunk.svndump') |
55 self.assertEqual(repo['default'].parents()[0].branch(), 'dev_branch') | 57 self.assertEqual(revsymbol(repo, 'default').parents()[0].branch(), 'dev_branch') |
56 self.assert_('iota' in repo['default']) | 58 self.assert_('iota' in revsymbol(repo, 'default')) |
57 self.assertEqual(repo['old_trunk'].parents()[0].branch(), 'default') | 59 self.assertEqual(revsymbol(repo, 'old_trunk').parents()[0].branch(), 'default') |
58 self.assert_('iota' not in repo['old_trunk']) | 60 self.assert_('iota' not in revsymbol(repo, 'old_trunk')) |
59 expected = ['default', 'old_trunk'] | 61 expected = ['default', 'old_trunk'] |
60 self.assertEqual(self.openbranches(repo), expected) | 62 self.assertEqual(self.openbranches(repo), expected) |
61 | 63 |
62 def test_replace_trunk_with_branch(self): | 64 def test_replace_trunk_with_branch(self): |
63 repo = self._load_fixture_and_fetch('replace_trunk_with_branch.svndump') | 65 repo = self._load_fixture_and_fetch('replace_trunk_with_branch.svndump') |
64 self.assertEqual(repo['default'].parents()[0].branch(), 'test') | 66 self.assertEqual(revsymbol(repo, 'default').parents()[0].branch(), 'test') |
65 self.assertEqual(repo['tip'].branch(), 'default') | 67 self.assertEqual(revsymbol(repo, 'tip').branch(), 'default') |
66 self.assertEqual(repo['tip'].extra().get('close'), '1') | 68 self.assertEqual(revsymbol(repo, 'tip').extra().get('close'), '1') |
67 self.assertEqual(self.openbranches(repo), ['default']) | 69 self.assertEqual(self.openbranches(repo), ['default']) |
68 | 70 |
69 def test_copybeforeclose(self): | 71 def test_copybeforeclose(self): |
70 repo = self._load_fixture_and_fetch('copybeforeclose.svndump') | 72 repo = self._load_fixture_and_fetch('copybeforeclose.svndump') |
71 self.assertEqual(repo['tip'].branch(), 'test') | 73 self.assertEqual(revsymbol(repo, 'tip').branch(), 'test') |
72 self.assertEqual(repo['test'].extra().get('close'), '1') | 74 self.assertEqual(revsymbol(repo, 'test').extra().get('close'), '1') |
73 self.assertEqual(repo['test']['b'].data(), 'a\n') | 75 self.assertEqual(revsymbol(repo, 'test')['b'].data(), 'a\n') |
74 | 76 |
75 def test_copyafterclose(self): | 77 def test_copyafterclose(self): |
76 repo = self._load_fixture_and_fetch('copyafterclose.svndump') | 78 repo = self._load_fixture_and_fetch('copyafterclose.svndump') |
77 self.assertEqual(repo['tip'].branch(), 'test') | 79 self.assertEqual(revsymbol(repo, 'tip').branch(), 'test') |
78 self.assert_('file' in repo['test']) | 80 self.assert_('file' in revsymbol(repo, 'test')) |
79 self.assertEqual(repo['test']['file'].data(), 'trunk2\n') | 81 self.assertEqual(revsymbol(repo, 'test')['file'].data(), 'trunk2\n') |
80 self.assert_('dir/file' in repo['test']) | 82 self.assert_('dir/file' in revsymbol(repo, 'test')) |
81 self.assertEqual(repo['test']['dir/file'].data(), 'trunk2\n') | 83 self.assertEqual(revsymbol(repo, 'test')['dir/file'].data(), 'trunk2\n') |
82 | 84 |
83 | 85 |
84 def test_branch_create_with_dir_delete_works(self): | 86 def test_branch_create_with_dir_delete_works(self): |
85 repo = self._load_fixture_and_fetch('branch_create_with_dir_delete.svndump') | 87 repo = self._load_fixture_and_fetch('branch_create_with_dir_delete.svndump') |
86 self.assertEqual(sorted(repo['tip'].manifest().keys()), | 88 self.assertEqual(sorted(revsymbol(repo, 'tip').manifest().keys()), |
87 ['alpha', 'beta', 'gamma', 'iota', ]) | 89 ['alpha', 'beta', 'gamma', 'iota', ]) |
88 | 90 |
89 def test_branch_tip_update_to_default(self): | 91 def test_branch_tip_update_to_default(self): |
90 repo = self._load_fixture_and_fetch('unorderedbranch.svndump', | 92 repo = self._load_fixture_and_fetch('unorderedbranch.svndump', |
91 noupdate=False) | 93 noupdate=False) |
113 def test_branch_delete_parent_dir(self): | 115 def test_branch_delete_parent_dir(self): |
114 repo = self._load_fixture_and_fetch('branch_delete_parent_dir.svndump') | 116 repo = self._load_fixture_and_fetch('branch_delete_parent_dir.svndump') |
115 openb, closedb = self.branches(repo) | 117 openb, closedb = self.branches(repo) |
116 self.assertEqual(openb, []) | 118 self.assertEqual(openb, []) |
117 self.assertEqual(closedb, ['dev_branch']) | 119 self.assertEqual(closedb, ['dev_branch']) |
118 self.assertEqual(list(repo['dev_branch']), ['foo']) | 120 self.assertEqual(list(revsymbol(repo, 'dev_branch')), ['foo']) |
119 | 121 |
120 def test_replace_branch_with_branch(self): | 122 def test_replace_branch_with_branch(self): |
121 repo = self._load_fixture_and_fetch('replace_branch_with_branch.svndump') | 123 repo = self._load_fixture_and_fetch('replace_branch_with_branch.svndump') |
122 self.assertEqual(7, test_util.repolen(repo)) | 124 self.assertEqual(7, test_util.repolen(repo)) |
123 # tip is former topological branch1 being closed | 125 # tip is former topological branch1 being closed |
124 ctx = repo['tip'] | 126 ctx = revsymbol(repo, 'tip') |
125 self.assertEqual('1', ctx.extra().get('close', '0')) | 127 self.assertEqual('1', ctx.extra().get('close', '0')) |
126 self.assertEqual('branch1', ctx.branch()) | 128 self.assertEqual('branch1', ctx.branch()) |
127 # r5 is where the replacement takes place | 129 # r5 is where the replacement takes place |
128 ctx = repo[5] | 130 ctx = repo[5] |
129 self.assertEqual(set(['a', 'c', 'dir/e', 'dir2/e', 'f', 'g']), set(ctx)) | 131 self.assertEqual(set(['a', 'c', 'dir/e', 'dir2/e', 'f', 'g']), set(ctx)) |