/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

Support the value 'unchecked' for 'can_be_merged' in GitLab proposals.

Merged from https://code.launchpad.net/~jelmer/brz/can-be-merged-unchecked/+merge/384482

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/gitlabs.py
253
253
            return False
254
254
        elif self._mr['merge_status'] == 'can_be_merged':
255
255
            return True
 
256
        elif self._mr['merge_status'] in (
 
257
                'unchecked', 'cannot_be_merged_recheck'):
 
258
            # See https://gitlab.com/gitlab-org/gitlab/-/commit/7517105303c for
 
259
            # an explanation of the distinction between unchecked and
 
260
            # cannot_be_merged_recheck
 
261
            return None
256
262
        else:
257
263
            raise ValueError(self._mr['merge_status'])
258
264