/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/git/tests/test_remote.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_remote.py
144
144
 
145
145
class TestRemoteGitBranch(TestCaseWithTransport):
146
146
 
 
147
    _test_needs_features = [ExecutableFeature('git')]
 
148
 
147
149
    def setUp(self):
148
150
        TestCaseWithTransport.setUp(self)
149
151
        self.remote_real = GitRepo.init('remote', mkdir=True)
336
338
             },
337
339
            self.remote_real.get_refs())
338
340
 
 
341
    def test_push_branch_new_with_tags(self):
 
342
        remote = ControlDir.open(self.remote_url)
 
343
        builder = self.make_branch_builder('local', format=self._from_format)
 
344
        builder.start_series()
 
345
        rev_1 = builder.build_snapshot(None, [
 
346
            ('add', ('', None, 'directory', '')),
 
347
            ('add', ('filename', None, 'file', b'content'))])
 
348
        rev_2 = builder.build_snapshot(
 
349
            [rev_1], [('modify', ('filename', b'new-content\n'))])
 
350
        rev_3 = builder.build_snapshot(
 
351
            [rev_1], [('modify', ('filename', b'new-new-content\n'))])
 
352
        builder.finish_series()
 
353
        branch = builder.get_branch()
 
354
        try:
 
355
            branch.tags.set_tag('atag', rev_2)
 
356
        except TagsNotSupported:
 
357
            raise TestNotApplicable('source format does not support tags')
 
358
 
 
359
        branch.get_config_stack().set('branch.fetch_tags', True)
 
360
        if self._from_format == 'git':
 
361
            result = remote.push_branch(branch, name='newbranch')
 
362
        else:
 
363
            result = remote.push_branch(
 
364
                branch, lossy=True, name='newbranch')
 
365
 
 
366
        self.assertEqual(0, result.old_revno)
 
367
        if self._from_format == 'git':
 
368
            self.assertEqual(2, result.new_revno)
 
369
        else:
 
370
            self.assertIs(None, result.new_revno)
 
371
 
 
372
        result.report(BytesIO())
 
373
 
 
374
        self.assertEqual(
 
375
            {b'refs/heads/newbranch', b'refs/tags/atag'},
 
376
            set(self.remote_real.get_refs().keys()))
 
377
 
339
378
    def test_push(self):
340
379
        c1 = self.remote_real.do_commit(
341
380
            message=b'message',