~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-03-02 04:07:59 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: aaron.bentley@utoronto.ca-20070302040759-5xs52rvht12z9pld
Enable signing merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
    branch as _mod_branch,
5
5
    diff,
6
6
    errors,
 
7
    gpg,
7
8
    revision as _mod_revision,
8
9
    rio,
9
10
    testament,
77
78
            lines.extend(self.patch.splitlines(True))
78
79
        return lines
79
80
 
 
81
    def to_signed(self, branch):
 
82
        my_gpg = gpg.GPGStrategy(branch.get_config())
 
83
        return my_gpg.sign(''.join(self.to_lines()))
 
84
 
80
85
    @classmethod
81
86
    def from_objects(klass, repository, revision_id, time, timezone,
82
87
                 target_branch, patch_type='bundle',