/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/gitlab/hoster.py

Committer: Breezy landing bot
Author(s): Jelmer Vernooĳ
Date: 2020-07-26 19:25:19 UTC
mfrom: (7490.106.1 fork-error-msg)
mto: (7490.111.2 github-401) (7519.1.1 merge-3.1) (7520.1.1 merge-3.1) (7524.2.1 merge-3.1) (7526.2.1 merge-3.1)
mto: This revision was merged to the branch mainline in revision 7520.
Revision ID: breezy.the.bot@gmail.com-20200726192519-059angogn8a2nm1k

Avoid use of reserved 'msg' argument for BrzError.

Merged from https://code.launchpad.net/~jelmer/brz/fork-error-msg/+merge/388101

files modified:
breezy/plugins/gitlab/hoster.py

Show diffs side-by-side

added added

removed removed

breezy/plugins/gitlab/hoster.py

102

102

103

103

class GitLabConflict(errors.BzrError):

104

104

105

_fmt = "Conflict during operation: %(msg)s"

105

_fmt = "Conflict during operation: %(reason)s"

106

106

107

def __init__(self, msg):

108

errors.BzrError(self, msg=msg)

107

def __init__(self, reason):

108

errors.BzrError(self, reason=reason)

109

109

110

110

111

111

class ForkingDisabled(errors.BzrError):

Older »