comparison tests/test_tags.py @ 375:af9fc01299b4

Make branch closing more Mercurial-like. We now use the 'close' value from extra instead of the old closed-branches branch.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 29 May 2009 15:24:12 +0200
parents 46e69be8e2c8
children 9327e9325645
comparison
equal deleted inserted replaced
374:758d9dbae9f9 375:af9fc01299b4
69 69
70 def test_tag_by_renaming_branch(self, stupid=False): 70 def test_tag_by_renaming_branch(self, stupid=False):
71 repo = self._load_fixture_and_fetch('tag_by_rename_branch.svndump', 71 repo = self._load_fixture_and_fetch('tag_by_rename_branch.svndump',
72 stupid=stupid) 72 stupid=stupid)
73 repo = self.repo 73 repo = self.repo
74 self.assertEqual(repo['tip'], repo['closed-branches']) 74 branches = set()
75 self.assertEqual(node.hex(repo['tip'].node()), 75 for h in repo.heads():
76 '2f0a3abe2004c0fa01f5f6074a8b5441e9c80c2a') 76 ctx = repo[h]
77 taggedrev = repo['tip'].parents()[0] 77 if 'close' not in ctx.extra():
78 self.assertEqual(node.hex(taggedrev.node()), 78 branches.add(ctx.branch())
79 '50c67c73267987de705ee335183c5486641e56e9') 79
80 self.assertEqual(node.hex(repo['tag/dummy'].node()), 80 self.assert_('dummy' not in branches)
81 '50c67c73267987de705ee335183c5486641e56e9') 81 self.assertEqual(repo['tag/dummy'], repo['tip'].parents()[0])
82 extra = repo['tip'].extra().copy()
83 extra.pop('convert_revision', None)
84 self.assertEqual(extra, {'branch': 'dummy', 'close': '1'})
82 85
83 def test_tag_by_renaming_branch_stupid(self): 86 def test_tag_by_renaming_branch_stupid(self):
84 self.test_tag_by_renaming_branch(stupid=True) 87 self.test_tag_by_renaming_branch(stupid=True)
85 88
86 def suite(): 89 def suite():