/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: 2020-01-02 12:21:20 UTC
  • mfrom: (7414.4.2 merged-by)
  • Revision ID: breezy.the.bot@gmail.com-20200102122120-1vg4sad77vzeyv6n
Add a MergeProposal.get_merged_by method.

Merged from https://code.launchpad.net/~jelmer/brz/merged-by/+merge/377146

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/launchpad.py
162
162
            return True
163
163
        return not bool(self._mp.preview_diff.conflicts)
164
164
 
 
165
    def get_merged_by(self):
 
166
        merge_reporter = self._mp.merge_reporter
 
167
        if merge_reporter is None:
 
168
            return None
 
169
        return merge_reporter.name
 
170
 
165
171
    def merge(self, commit_message=None):
166
172
        target_branch = _mod_branch.Branch.open(
167
173
            self.get_target_branch_url())