Changeset 903bac0a in mainline for contrib/bazaar/bzreml/__init__.py

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• contrib/bazaar/bzreml/__init__.py (modified) (4 diffs)

contrib/bazaar/bzreml/__init__.py

@@ -134 +134 @@
                                 body.write("New Revision: %s%s\n" % (revision_ac_no, merge_marker(revision_ac)))
                                 body.write("New Id: %s\n" % revision_ac_id)
-                                
-                                body.write("\n")
-                                
                                 for parent_id in revision_ac.parent_ids:
                                         body.write("Parent: %s\n" % parent_id)
-                                        
-                                        tree_old = branch.repository.revision_tree(parent_id)
-                                        tree_ac = branch.repository.revision_tree(revision_ac_id)
-                                        
-                                        delta = tree_ac.changes_from(tree_old)
-                                        
-                                        if (len(delta.added) > 0):
-                                                body.write("Added:\n")
-                                                for item in delta.added:
-                                                        body.write("    %s\n" % item[0])
-                                        
-                                        if (len(delta.removed) > 0):
-                                                body.write("Removed:\n")
-                                                for item in delta.removed:
-                                                        body.write("    %s\n" % item[0])
-                                        
-                                        if (len(delta.renamed) > 0):
-                                                body.write("Renamed:\n")
-                                                for item in delta.renamed:
-                                                        body.write("    %s -> %s\n" % (item[0], item[1]))
-                                        
-                                        if (len(delta.kind_changed) > 0):
-                                                body.write("Changed:\n")
-                                                for item in delta.kind_changed:
-                                                        body.write("    %s\n" % item[0])
-                                                
-                                        if (len(delta.modified) > 0):
-                                                body.write("Modified:\n")
-                                                for item in delta.modified:
-                                                        body.write("    %s\n" % item[0])
-                                        
-                                        body.write("\n")
-                                
+                                
+                                body.write("\n")
+                                
+                                commit_message = ""
                                 body.write("Log:\n")
                                 if (not revision_ac.message):
@@ -179 +147 @@
                                         for line in log.split("\n"):
                                                 body.write("%s\n" % line)
+                                                if (commit_message == ""):
+                                                        commit_message = line
+                                
+                                if (commit_message == ""):
+                                        commit_message = "(empty)"
                                 
                                 body.write("\n")
@@ -184 +157 @@
                         tree_old = branch.repository.revision_tree(revision_old_id)
                         tree_new = branch.repository.revision_tree(revision_new_id)
+                        
+                        revision_new_no = branch.revision_id_to_revno(revision_new_id)
+                        delta = tree_new.changes_from(tree_old)
+                        
+                        if (len(delta.added) > 0):
+                                body.write("Added:\n")
+                                for item in delta.added:
+                                        body.write("    %s\n" % item[0])
+                        
+                        if (len(delta.removed) > 0):
+                                body.write("Removed:\n")
+                                for item in delta.removed:
+                                        body.write("    %s\n" % item[0])
+                        
+                        if (len(delta.renamed) > 0):
+                                body.write("Renamed:\n")
+                                for item in delta.renamed:
+                                        body.write("    %s -> %s\n" % (item[0], item[1]))
+                        
+                        if (len(delta.kind_changed) > 0):
+                                body.write("Changed:\n")
+                                for item in delta.kind_changed:
+                                        body.write("    %s\n" % item[0])
+                        
+                        if (len(delta.modified) > 0):
+                                body.write("Modified:\n")
+                                for item in delta.modified:
+                                        body.write("    %s\n" % item[0])
+                        
+                        body.write("\n")
                         
                         tree_old.lock_read()
@@ -196 +199 @@
                                 tree_old.unlock()
                         
-                        revision_new_no = branch.revision_id_to_revno(revision_new_id)
-                        
-                        delta = tree_new.changes_from(tree_old)
-                        files = []
-                        
-                        for item in delta.added:
-                                files.append(item[0])
-                        
-                        for item in delta.removed:
-                                files.append(item[0])
-                        
-                        for item in delta.renamed:
-                                files.append(item[0])
-                        
-                        for item in delta.kind_changed:
-                                files.append(item[0])
-                        
-                        for item in delta.modified:
-                                files.append(item[0])
-                        
-                        subject = "r%d - %s" % (revision_new_no, " ".join(files))
+                        subject = "r%d - %s" % (revision_new_no, commit_message)
                         
                         send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue())