/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/plugins/propose/gitlabs.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-21 03:58:42 UTC
  • mfrom: (7490.3.4 work)
  • mto: This revision was merged to the branch mainline in revision 7495.
  • Revision ID: jelmer@jelmer.uk-20200221035842-j97r6b74q8cgxb21
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/gitlabs.py
413
413
 
414
414
    def publish_derived(self, local_branch, base_branch, name, project=None,
415
415
                        owner=None, revision_id=None, overwrite=False,
416
 
                        allow_lossy=True):
 
416
                        allow_lossy=True, tag_selector=None):
417
417
        (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
418
418
        if owner is None:
419
419
            owner = self._get_logged_in_username()
428
428
        try:
429
429
            push_result = remote_dir.push_branch(
430
430
                local_branch, revision_id=revision_id, overwrite=overwrite,
431
 
                name=name)
 
431
                name=name, tag_selector=tag_selector)
432
432
        except errors.NoRoundtrippingSupport:
433
433
            if not allow_lossy:
434
434
                raise
435
435
            push_result = remote_dir.push_branch(
436
436
                local_branch, revision_id=revision_id, overwrite=overwrite,
437
 
                name=name, lossy=True)
 
437
                name=name, lossy=True, tag_selector=tag_selector)
438
438
        public_url = gitlab_url_to_bzr_url(
439
439
            target_project['http_url_to_repo'], name)
440
440
        return push_result.target_branch, public_url