Rev 173: Fixed issues with PGP headers and footers in merge directive mail. in http://bzr.daniel-watkins.co.uk/pqm/merge-directives

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/merge-directives

------------------------------------------------------------
revno: 173
revision-id: daniel at daniel-watkins.co.uk-20080709050819-ecojceikr452xkjs
parent: daniel at daniel-watkins.co.uk-20080709050758-758s3n21jwvc6b5o
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: merge-directives
timestamp: Wed 2008-07-09 06:08:19 +0100
message:
  Fixed issues with PGP headers and footers in merge directive mail.
-------------- next part --------------
=== modified file 'pqm/__init__.py'
--- a/pqm/__init__.py	2008-07-08 14:15:12 +0000
+++ b/pqm/__init__.py	2008-07-09 05:08:19 +0000
@@ -179,8 +179,19 @@
         result = []
         legacy_lines = []
         try:
-            directive = merge_directive.MergeDirective.from_lines(
-                self.getRawLines())
+            md_lines = []
+            to_skip = 0
+            for line in self.getRawLines():
+                if to_skip:
+                    to_skip -= 1
+                    continue
+                if self.pgp_re.match(line):
+                    to_skip = 2
+                    continue
+                if self.pgp_end_re.match(line):
+                    break
+                md_lines.append(line)
+            directive = merge_directive.MergeDirective.from_lines(md_lines)
         except errors.NotAMergeDirective:
             pass
         else:
@@ -838,6 +849,7 @@
         self.revision_id = revision_id
         self.testament_sha1 = testament_sha1
         self.message = message
+        self.from_branch = from_branch
         self.bundle = bundle
 
     def run(self):
@@ -852,7 +864,7 @@
         def merge_callback(sender, dir):
             return self.get_vcs().do_bzr_merge(sender, self.revision_id,
                                                self.testament_sha1, dir,
-                                               None, self.bundle)
+                                               self.from_branch, self.bundle)
         return self._do_merge(self.from_branch, self.to_branch, 'bzr-merge',
                               merge_callback, line)