/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/launchpad.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-08-31 10:54:46 UTC
  • mfrom: (7381.2.1 lp-detect-conflict)
  • Revision ID: breezy.the.bot@gmail.com-20190831105446-rtk1u19vu10n2d9j
Add support for detecting conflicts in Launchpad merge proposals.

Merged from https://code.launchpad.net/~jelmer/brz/lp-detect-conflict/+merge/371775

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/launchpad.py
154
154
    def close(self):
155
155
        self._mp.setStatus(status='Rejected')
156
156
 
 
157
    def can_be_merged(self):
 
158
        if not self._mp.preview_diff:
 
159
            # Maybe?
 
160
            return True
 
161
        return not bool(self._mp.preview_diff.conflicts)
 
162
 
157
163
    def merge(self, commit_message=None):
158
164
        target_branch = _mod_branch.Branch.open(
159
165
            self.get_target_branch_url())