← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tag.py

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tag.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2009-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
 
21
    controldir,
22
22
    errors,
23
23
    )
24
24
from bzrlib.tag import (
57
57
        store = self.make_branch_supporting_tags('a').tags
58
58
        store.set_tag("foo", "myoldrevid")
59
59
        store.rename_revisions({"myoldrevid": "mynewrevid"})
60
 
        self.assertEquals({"foo": "mynewrevid"}, store.get_tag_dict())
 
60
        self.assertEqual({"foo": "mynewrevid"}, store.get_tag_dict())
61
61
 
62
62
    def test_unknown_ignored(self):
63
63
        store = self.make_branch_supporting_tags('a').tags
64
64
        store.set_tag("foo", "myoldrevid")
65
65
        store.rename_revisions({"anotherrevid": "mynewrevid"})
66
 
        self.assertEquals({"foo": "myoldrevid"}, store.get_tag_dict())
 
66
        self.assertEqual({"foo": "myoldrevid"}, store.get_tag_dict())
67
67
 
68
68
 
69
69
class TestTagMerging(TestCaseWithTransport):
70
70
 
71
71
    def make_knit_branch(self, relpath):
72
 
        old_bdf = bzrdir.format_registry.make_bzrdir('knit')
73
 
        return bzrdir.BzrDir.create_branch_convenience(relpath, format=old_bdf)
 
72
        old_bdf = controldir.format_registry.make_bzrdir('knit')
 
73
        return controldir.ControlDir.create_branch_convenience(relpath, format=old_bdf)
74
74
 
75
75
    def make_branch_supporting_tags(self, relpath):
76
76
        return self.make_branch(relpath, format='dirstate-tags')
109
109
        self.assertRaises(errors.NoSuchTag, a.tags.lookup_tag, 'tag-2')
110
110
        # conflicting merge
111
111
        a.tags.set_tag('tag-2', 'z')
112
 
        conflicts = a.tags.merge_to(b.tags)
 
112
        updates, conflicts = a.tags.merge_to(b.tags)
 
113
        self.assertEqual({}, updates)
113
114
        self.assertEqual(list(conflicts), [('tag-2', 'z', 'y')])
114
115
        self.assertEqual('y', b.tags.lookup_tag('tag-2'))
115
116
        # overwrite conflicts
116
 
        conflicts = a.tags.merge_to(b.tags, overwrite=True)
 
117
        updates, conflicts = a.tags.merge_to(b.tags, overwrite=True)
117
118
        self.assertEqual(list(conflicts), [])
 
119
        self.assertEqual({u'tag-2': 'z'}, updates)
118
120
        self.assertEqual('z', b.tags.lookup_tag('tag-2'))
119
121
 
120
122
 
131
133
        child = self.make_branch('child')
132
134
        child.bind(master)
133
135
        child.tags.set_tag('foo', 'rev-1')
134
 
        self.assertEquals('rev-1', master.tags.lookup_tag('foo'))
 
136
        self.assertEqual('rev-1', master.tags.lookup_tag('foo'))
135
137
        # deleting a tag updates the master too
136
138
        child.tags.delete_tag('foo')
137
139
        self.assertRaises(errors.NoSuchTag,
142
144
        master = self.make_branch('master')
143
145
        master.tags.set_tag('foo', 'rev-1')
144
146
        co_tree = master.create_checkout('checkout')
145
 
        self.assertEquals('rev-1',
 
147
        self.assertEqual('rev-1',
146
148
            co_tree.branch.tags.lookup_tag('foo'))
147
149
 
148
150
    def test_update_updates_tags(self):
153
155
        child.bind(master)
154
156
        child.update()
155
157
        # after an update, the child has all the master's tags
156
 
        self.assertEquals('rev-1', child.tags.lookup_tag('foo'))
 
158
        self.assertEqual('rev-1', child.tags.lookup_tag('foo'))
157
159
        # add another tag and update again
158
160
        master.tags.set_tag('tag2', 'target2')
159
161
        child.update()
160
 
        self.assertEquals('target2', child.tags.lookup_tag('tag2'))
 
162
        self.assertEqual('target2', child.tags.lookup_tag('tag2'))
161
163
 
162
164
    def test_tag_deletion_from_master_to_bound(self):
163
165
        master = self.make_branch('master')