/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-08 23:15:51 UTC
  • mfrom: (7484.1.3 git-follow-symref)
  • Revision ID: breezy.the.bot@gmail.com-20200208231551-ir5l2ihfj47gzug0
Follow symrefs when pushing to git repositories.

Merged from https://code.launchpad.net/~jelmer/brz/git-follow-symref/+merge/378769

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_remote.py
357
357
             },
358
358
            self.remote_real.get_refs())
359
359
 
 
360
    def test_push_branch_symref(self):
 
361
        cfg = self.remote_real.get_config()
 
362
        cfg.set((b'core', ), b'bare', True)
 
363
        cfg.write_to_path()
 
364
        self.remote_real.refs.set_symbolic_ref(b'HEAD', b'refs/heads/master')
 
365
        c1 = self.remote_real.do_commit(
 
366
            message=b'message',
 
367
            committer=b'committer <committer@example.com>',
 
368
            author=b'author <author@example.com>',
 
369
            ref=b'refs/heads/master')
 
370
        remote = ControlDir.open(self.remote_url)
 
371
        wt = self.make_branch_and_tree('local', format=self._from_format)
 
372
        self.build_tree(['local/blah'])
 
373
        wt.add(['blah'])
 
374
        revid = wt.commit('blah')
 
375
 
 
376
        if self._from_format == 'git':
 
377
            result = remote.push_branch(wt.branch, overwrite=True)
 
378
        else:
 
379
            result = remote.push_branch(wt.branch, lossy=True, overwrite=True)
 
380
 
 
381
        self.assertEqual(None, result.old_revno)
 
382
        if self._from_format == 'git':
 
383
            self.assertEqual(1, result.new_revno)
 
384
        else:
 
385
            self.assertIs(None, result.new_revno)
 
386
 
 
387
        result.report(BytesIO())
 
388
 
 
389
        self.assertEqual(
 
390
            {
 
391
                b'HEAD': self.remote_real.refs[b'refs/heads/master'],
 
392
                b'refs/heads/master': self.remote_real.refs[b'refs/heads/master'],
 
393
            },
 
394
            self.remote_real.get_refs())
 
395
 
360
396
    def test_push_branch_new_with_tags(self):
361
397
        remote = ControlDir.open(self.remote_url)
362
398
        builder = self.make_branch_builder('local', format=self._from_format)