/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_revision.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revision.py
27
27
 
28
28
# We're allowed to test deprecated interfaces
29
29
warnings.filterwarnings('ignore',
30
 
                        '.*get_intervening_revisions was deprecated',
31
 
                        DeprecationWarning,
32
 
                        r'breezy\.tests\.test_revision')
 
30
        '.*get_intervening_revisions was deprecated',
 
31
        DeprecationWarning,
 
32
        r'breezy\.tests\.test_revision')
33
33
 
34
34
# XXX: Make this a method of a merge base case
35
 
 
36
 
 
37
35
def make_branches(self, format=None):
38
36
    """Create two branches
39
37
 
56
54
    tree1 = self.make_branch_and_tree("branch1", format=format)
57
55
    br1 = tree1.branch
58
56
 
59
 
    tree1.commit("Commit one", rev_id=b"a@u-0-0")
60
 
    tree1.commit("Commit two", rev_id=b"a@u-0-1")
61
 
    tree1.commit("Commit three", rev_id=b"a@u-0-2")
 
57
    tree1.commit("Commit one", rev_id="a@u-0-0")
 
58
    tree1.commit("Commit two", rev_id="a@u-0-1")
 
59
    tree1.commit("Commit three", rev_id="a@u-0-2")
62
60
 
63
61
    tree2 = tree1.controldir.sprout("branch2").open_workingtree()
64
62
    br2 = tree2.branch
65
 
    tree2.commit("Commit four", rev_id=b"b@u-0-3")
66
 
    tree2.commit("Commit five", rev_id=b"b@u-0-4")
67
 
    self.assertEqual(br2.last_revision(), b'b@u-0-4')
68
 
 
69
 
    tree1.merge_from_branch(br2)
70
 
    tree1.commit("Commit six", rev_id=b"a@u-0-3")
71
 
    tree1.commit("Commit seven", rev_id=b"a@u-0-4")
72
 
    tree2.commit("Commit eight", rev_id=b"b@u-0-5")
73
 
    self.assertEqual(br2.last_revision(), b'b@u-0-5')
74
 
 
75
 
    tree1.merge_from_branch(br2)
76
 
    tree1.commit("Commit nine", rev_id=b"a@u-0-5")
 
63
    tree2.commit("Commit four", rev_id="b@u-0-3")
 
64
    tree2.commit("Commit five", rev_id="b@u-0-4")
 
65
    self.assertEqual(br2.last_revision(), 'b@u-0-4')
 
66
 
 
67
    tree1.merge_from_branch(br2)
 
68
    tree1.commit("Commit six", rev_id="a@u-0-3")
 
69
    tree1.commit("Commit seven", rev_id="a@u-0-4")
 
70
    tree2.commit("Commit eight", rev_id="b@u-0-5")
 
71
    self.assertEqual(br2.last_revision(), 'b@u-0-5')
 
72
 
 
73
    tree1.merge_from_branch(br2)
 
74
    tree1.commit("Commit nine", rev_id="a@u-0-5")
77
75
    # DO NOT MERGE HERE - we WANT a GHOST.
78
76
    br1.lock_read()
79
77
    try:
80
78
        graph = br1.repository.get_graph()
81
79
        revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
82
 
                                                       [revision.NULL_REVISION]))
 
80
            [revision.NULL_REVISION]))
83
81
        revhistory.reverse()
84
82
    finally:
85
83
        br1.unlock()
86
84
    tree2.add_parent_tree_id(revhistory[4])
87
 
    tree2.commit("Commit ten - ghost merge", rev_id=b"b@u-0-6")
 
85
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
88
86
 
89
87
    return br1, br2
90
88
 
94
92
    def test_recorded_ancestry(self):
95
93
        """Test that commit records all ancestors"""
96
94
        br1, br2 = make_branches(self)
97
 
        d = [(b'a@u-0-0', [b'a@u-0-0']),
98
 
             (b'a@u-0-1', [b'a@u-0-0', b'a@u-0-1']),
99
 
             (b'a@u-0-2', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2']),
100
 
             (b'b@u-0-3', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3']),
101
 
             (b'b@u-0-4', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3',
102
 
                           b'b@u-0-4']),
103
 
             (b'a@u-0-3', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
104
 
                           b'a@u-0-3']),
105
 
             (b'a@u-0-4', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
106
 
                           b'a@u-0-3', b'a@u-0-4']),
107
 
             (b'b@u-0-5', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
108
 
                           b'b@u-0-5']),
109
 
             (b'a@u-0-5', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'a@u-0-3', b'a@u-0-4',
110
 
                           b'b@u-0-3', b'b@u-0-4',
111
 
                           b'b@u-0-5', b'a@u-0-5']),
112
 
             (b'b@u-0-6', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'a@u-0-4',
113
 
                           b'b@u-0-3', b'b@u-0-4',
114
 
                           b'b@u-0-5', b'b@u-0-6']),
 
95
        d = [('a@u-0-0', ['a@u-0-0']),
 
96
             ('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
 
97
             ('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
 
98
             ('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
 
99
             ('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
 
100
                          'b@u-0-4']),
 
101
             ('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
102
                          'a@u-0-3']),
 
103
             ('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
104
                          'a@u-0-3', 'a@u-0-4']),
 
105
             ('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
106
                          'b@u-0-5']),
 
107
             ('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
 
108
                          'b@u-0-3', 'b@u-0-4',
 
109
                          'b@u-0-5', 'a@u-0-5']),
 
110
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-4',
 
111
                          'b@u-0-3', 'b@u-0-4',
 
112
                          'b@u-0-5', 'b@u-0-6']),
115
113
             ]
116
 
        br1_only = (b'a@u-0-3', b'a@u-0-4', b'a@u-0-5')
117
 
        br2_only = (b'b@u-0-6',)
 
114
        br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
 
115
        br2_only = ('b@u-0-6',)
118
116
        for branch in br1, br2:
119
117
            for rev_id, anc in d:
120
 
                if rev_id in br1_only and branch is not br1:
 
118
                if rev_id in br1_only and not branch is br1:
121
119
                    continue
122
 
                if rev_id in br2_only and branch is not br2:
 
120
                if rev_id in br2_only and not branch is br2:
123
121
                    continue
124
122
                self.assertThat(anc,
125
 
                                MatchesAncestry(branch.repository, rev_id))
 
123
                    MatchesAncestry(branch.repository, rev_id))
126
124
 
127
125
 
128
126
class TestIntermediateRevisions(TestCaseWithTransport):
132
130
        self.br1, self.br2 = make_branches(self)
133
131
        wt1 = self.br1.controldir.open_workingtree()
134
132
        wt2 = self.br2.controldir.open_workingtree()
135
 
        wt2.commit("Commit eleven", rev_id=b"b@u-0-7")
136
 
        wt2.commit("Commit twelve", rev_id=b"b@u-0-8")
137
 
        wt2.commit("Commit thirtteen", rev_id=b"b@u-0-9")
 
133
        wt2.commit("Commit eleven", rev_id="b@u-0-7")
 
134
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
 
135
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
138
136
 
139
137
        wt1.merge_from_branch(self.br2)
140
 
        wt1.commit("Commit fourtten", rev_id=b"a@u-0-6")
 
138
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
141
139
 
142
140
        wt2.merge_from_branch(self.br1)
143
 
        wt2.commit("Commit fifteen", rev_id=b"b@u-0-10")
 
141
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
142
 
145
143
 
146
144
class MockRevisionSource(object):
167
165
        # indicator. i.e. NULL_REVISION
168
166
        # RBC 20060608
169
167
        tree = self.make_branch_and_tree('.')
170
 
        tree.commit('1', rev_id=b'1', allow_pointless=True)
171
 
        tree.commit('2', rev_id=b'2', allow_pointless=True)
172
 
        tree.commit('3', rev_id=b'3', allow_pointless=True)
173
 
        rev = tree.branch.repository.get_revision(b'1')
174
 
        history = rev.get_history(tree.branch.repository)
175
 
        self.assertEqual([None, b'1'], history)
176
 
        rev = tree.branch.repository.get_revision(b'2')
177
 
        history = rev.get_history(tree.branch.repository)
178
 
        self.assertEqual([None, b'1', b'2'], history)
179
 
        rev = tree.branch.repository.get_revision(b'3')
180
 
        history = rev.get_history(tree.branch.repository)
181
 
        self.assertEqual([None, b'1', b'2', b'3'], history)
 
168
        tree.commit('1', rev_id = '1', allow_pointless=True)
 
169
        tree.commit('2', rev_id = '2', allow_pointless=True)
 
170
        tree.commit('3', rev_id = '3', allow_pointless=True)
 
171
        rev = tree.branch.repository.get_revision('1')
 
172
        history = rev.get_history(tree.branch.repository)
 
173
        self.assertEqual([None, '1'], history)
 
174
        rev = tree.branch.repository.get_revision('2')
 
175
        history = rev.get_history(tree.branch.repository)
 
176
        self.assertEqual([None, '1', '2'], history)
 
177
        rev = tree.branch.repository.get_revision('3')
 
178
        history = rev.get_history(tree.branch.repository)
 
179
        self.assertEqual([None, '1', '2' ,'3'], history)
182
180
 
183
181
 
184
182
class TestReservedId(TestCase):
187
185
        self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
188
186
        self.assertEqual(True, revision.is_reserved_id(
189
187
            revision.CURRENT_REVISION))
190
 
        self.assertEqual(True, revision.is_reserved_id(b'arch:'))
191
 
        self.assertEqual(False, revision.is_reserved_id(b'null'))
 
188
        self.assertEqual(True, revision.is_reserved_id('arch:'))
 
189
        self.assertEqual(False, revision.is_reserved_id('null'))
192
190
        self.assertEqual(False, revision.is_reserved_id(
193
 
            b'arch:a@example.com/c--b--v--r'))
 
191
            'arch:a@example.com/c--b--v--r'))
194
192
        self.assertEqual(False, revision.is_reserved_id(None))
195
193
 
196
194
 
211
209
        r = revision.Revision('1')
212
210
        r.committer = 'A'
213
211
        self.assertEqual(['A'], r.get_apparent_authors())
214
 
        r.properties[u'author'] = 'B'
 
212
        r.properties['author'] = 'B'
215
213
        self.assertEqual(['B'], r.get_apparent_authors())
216
 
        r.properties[u'authors'] = 'C\nD'
 
214
        r.properties['authors'] = 'C\nD'
217
215
        self.assertEqual(['C', 'D'], r.get_apparent_authors())
218
216
 
219
217
    def test_get_apparent_authors_no_committer(self):
231
229
    def test_some_bugs(self):
232
230
        r = revision.Revision(
233
231
            '1', properties={
234
 
                u'bugs': bugtracker.encode_fixes_bug_urls(
235
 
                    [('http://example.com/bugs/1', 'fixed'),
236
 
                     ('http://launchpad.net/bugs/1234', 'fixed')])})
 
232
                'bugs': bugtracker.encode_fixes_bug_urls(
 
233
                    ['http://example.com/bugs/1',
 
234
                     'http://launchpad.net/bugs/1234'])})
237
235
        self.assertEqual(
238
236
            [('http://example.com/bugs/1', bugtracker.FIXED),
239
237
             ('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
241
239
 
242
240
    def test_no_status(self):
243
241
        r = revision.Revision(
244
 
            '1', properties={u'bugs': 'http://example.com/bugs/1'})
 
242
            '1', properties={'bugs': 'http://example.com/bugs/1'})
245
243
        self.assertRaises(bugtracker.InvalidLineInBugsProperty, list,
246
 
                          r.iter_bugs())
 
244
                r.iter_bugs())
247
245
 
248
246
    def test_too_much_information(self):
249
247
        r = revision.Revision(
250
 
            '1', properties={u'bugs': 'http://example.com/bugs/1 fixed bar'})
 
248
            '1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
251
249
        self.assertRaises(bugtracker.InvalidLineInBugsProperty, list,
252
 
                          r.iter_bugs())
 
250
                r.iter_bugs())
253
251
 
254
252
    def test_invalid_status(self):
255
253
        r = revision.Revision(
256
 
            '1', properties={u'bugs': 'http://example.com/bugs/1 faxed'})
 
254
            '1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
257
255
        self.assertRaises(bugtracker.InvalidBugStatus, list, r.iter_bugs())