← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

Convert some gpg options to config stacks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
244
244
        :param branch: The source branch, to get the signing strategy
245
245
        :return: a string
246
246
        """
247
 
        my_gpg = gpg.GPGStrategy(branch.get_config())
 
247
        my_gpg = gpg.GPGStrategy(branch.get_config_stack())
248
248
        return my_gpg.sign(''.join(self.to_lines()))
249
249
 
250
250
    def to_email(self, mail_to, branch, sign=False):