/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/per_branch/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_commit.py
50
50
        super(TestCommitHook, self).setUp()
51
51
 
52
52
    def capture_post_commit_hook(self, local, master, old_revno,
53
 
        old_revid, new_revno, new_revid):
 
53
                                 old_revid, new_revno, new_revid):
54
54
        """Capture post commit hook calls to self.hook_calls.
55
55
 
56
56
        The call is logged, as is some state of the two branches.
150
150
        tree.lock_write()
151
151
        tree.add('')
152
152
        root_delta.added = [('', tree.path2id(''), 'directory')]
 
153
 
153
154
        class PreCommitException(Exception):
154
 
            
 
155
 
155
156
            def __init__(self, revid):
156
157
                self.revid = revid
 
158
 
157
159
        def hook_func(local, master,
158
160
                      old_revno, old_revid, new_revno, new_revid,
159
161
                      tree_delta, future_tree):
176
178
        for i in range(1, 3):
177
179
            revids[i] = tree.commit('message')
178
180
        self.assertEqual([
179
 
            ('pre_commit', 0, revision.NULL_REVISION, 1, revids[0], root_delta),
180
 
            ('pre_commit', 0, revision.NULL_REVISION, 1, revids[1], root_delta),
 
181
            ('pre_commit', 0, revision.NULL_REVISION,
 
182
             1, revids[0], root_delta),
 
183
            ('pre_commit', 0, revision.NULL_REVISION,
 
184
             1, revids[1], root_delta),
181
185
            ('pre_commit', 1, revids[1], 2, revids[2], empty_delta)
182
186
            ],
183
187
            self.hook_calls)
217
221
 
218
222
        expected_delta = delta.TreeDelta()
219
223
        if tree.has_versioned_directories():
220
 
            expected_delta.added.append(('added_dir', added_dir_id, 'directory'))
 
224
            expected_delta.added.append(
 
225
                ('added_dir', added_dir_id, 'directory'))
221
226
        if tree.supports_rename_tracking():
222
227
            expected_delta.removed = [('to_be_unversioned',
223
228
                                       to_be_unversioned_id, 'file')]
225
230
                                       dir_subfile_id, 'file', False, False)]
226
231
        else:
227
232
            expected_delta.added.append(('dir/subfile_renamed',
228
 
                                        tree.path2id('dir/subfile_renamed'), 'file'))
 
233
                                         tree.path2id('dir/subfile_renamed'), 'file'))
229
234
            expected_delta.removed = [
230
 
                    ('dir/subfile', dir_subfile_id, 'file'),
231
 
                    ('to_be_unversioned', to_be_unversioned_id, 'file')]
232
 
        expected_delta.modified=[('rootfile', rootfile_id, 'file', True,
233
 
                                  False)]
 
235
                ('dir/subfile', dir_subfile_id, 'file'),
 
236
                ('to_be_unversioned', to_be_unversioned_id, 'file')]
 
237
        expected_delta.modified = [('rootfile', rootfile_id, 'file', True,
 
238
                                    False)]
234
239
        self.assertEqual([('pre_commit', 1, revid1, 2, revid2,
235
240
                           expected_delta)], self.hook_calls)