Changeset 4977

Timestamp:

06/30/08 11:56:54 (6 months ago)

Author:

magi@…

Message:

Fixed massmerge command from merge tool and some HTML log formatting.

Files:

• branches/5.2/build/bin/batchmerge.py (modified) (3 diffs)

branches/5.2/build/bin/batchmerge.py

@@ -298 +298 @@
 
         def logHtml(self):
-                print "<table>"
+                print "<table id=\"changelog-table\">"
                 print "  <tr><td>#</td><td>Changeset Comment</td></tr>"
                 for change in self.changes:
@@ -308 +308 @@
                         # Handle merge undo markup
                         if change.getUndo():
-                                changeref     = "<font style=\"text-decoration: line-through;\">%s</font>" % (changeref)
-                                changecomment = "<font style=\"text-decoration: line-through;\">%s</font>" % (changecomment)
+                                changeref     = "<font class=\"changeset-merge-undone\">%s</font>" % (changeref)
+                                changecomment = "<font class=\"changeset-merge-undone\">%s</font>" % (changecomment)
                                 changecomment = "Reverted a change: "+changecomment
 
                         # Make basic HTML formatting
-                        item = "  <tr style=\"vertical-align: top;\"><td>%s:</td><td>%s</td></tr>" % (changeref, changecomment)
+                        item = "  <tr><td>%s:</td><td>%s</td></tr>" % (changeref, changecomment)
 
                         # Add ticket summary after ticket number, if missing
@@ -501 +501 @@
         commandRevert()
 
-elif len(sys.argv) == 3 and sys.argv[1] == "massmerge":
+elif (len(sys.argv) == 3 or len(sys.argv)==4) and sys.argv[1] == "massmerge":
         cfgfilename = sys.argv[2]
         startfrom = None