Rev 177: ExtendedMergeCommands now work with the UI correctly. in http://bzr.daniel-watkins.co.uk/pqm/merge-directives

[Daniel Watkins]

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

------------------------------------------------------------
revno: 177
revision-id: daniel at daniel-watkins.co.uk-20080823210635-6kdv2ebvcbozv76x
parent: daniel at daniel-watkins.co.uk-20080823204906-59oaayma1xecgh9z
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: merge-directives
timestamp: Sat 2008-08-23 22:06:35 +0100
message:
  ExtendedMergeCommands now work with the UI correctly.
-------------- next part --------------
=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-07-17 11:27:16 +0000
+++ b/pqm/script.py	2008-08-23 21:06:35 +0000
@@ -709,6 +709,14 @@
         self.from_branch = from_branch
         self.bundle = bundle
 
+    def asHTML(self):
+        print self.from_branch
+        if self.from_branch is not None:
+            s = " (%s)" % (str(self.from_branch),)
+        else:
+            s = ""
+        return cgi.escape("Merge from bundle%s" % (s,))
+
     def run(self):
         super(MergeCommand, self).run()
         self.cleanup_wd()