Changeset 72cf064 in mainline for contrib/bazaar/bzreml/__init__.py

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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

@@ -102 +102 @@
         return ""
 
+def iter_reverse_revision_history(repository, revision_id):
+        """Iterate backwards through revision ids in the lefthand history"""
+        
+        graph = repository.get_graph()
+        stop_revisions = (None, _mod_revision.NULL_REVISION)
+        return graph.iter_lefthand_ancestry(revision_id, stop_revisions)
+
 def revision_sequence(branch, revision_old_id, revision_new_id):
         """Calculate a sequence of revisions"""
         
-        for revision_ac_id in branch.repository.iter_reverse_revision_history(revision_new_id):
+        for revision_ac_id in iter_reverse_revision_history(branch.repository, revision_new_id):
                 if (revision_ac_id == revision_old_id):
                         break
+                
                 yield revision_ac_id
 
@@ -117 +125 @@
                 branch.repository.lock_read()
                 try:
-                        body = StringIO()
+                        revision_prev_id = revision_old_id
                         
-                        for revision_ac_id in revision_sequence(branch, revision_old_id, revision_new_id):
+                        for revision_ac_id in reversed(list(revision_sequence(branch, revision_old_id, revision_new_id))):
+                                body = StringIO()
+                                
                                 revision_ac = branch.repository.get_revision(revision_ac_id)
                                 revision_ac_no = branch.revision_id_to_revno(revision_ac_id)
@@ -139 +149 @@
                                 body.write("\n")
                                 
-                                commit_message = ""
+                                commit_message = None
                                 body.write("Log:\n")
                                 if (not revision_ac.message):
@@ -147 +157 @@
                                         for line in log.split("\n"):
                                                 body.write("%s\n" % line)
-                                                if (commit_message == ""):
+                                                if (commit_message == None):
                                                         commit_message = line
                                 
-                                if (commit_message == ""):
+                                if (commit_message == None):
                                         commit_message = "(empty)"
                                 
                                 body.write("\n")
+                                
+                                tree_prev = branch.repository.revision_tree(revision_prev_id)
+                                tree_ac = branch.repository.revision_tree(revision_ac_id)
+                                
+                                delta = tree_ac.changes_from(tree_prev)
+                                
+                                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_prev.lock_read()
+                                try:
+                                        tree_ac.lock_read()
+                                        try:
+                                                diff = DiffTree.from_trees_options(tree_prev, tree_ac, body, "utf8", None, "", "", None)
+                                                diff.show_diff(None, None)
+                                        finally:
+                                                tree_ac.unlock()
+                                finally:
+                                        tree_prev.unlock()
+                                
+                                subject = "r%d - %s" % (revision_ac_no, commit_message)
+                                send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue())
+                                
+                                revision_prev_id = revision_ac_id
                         
-                        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()
-                        try:
-                                tree_new.lock_read()
-                                try:
-                                        diff = DiffTree.from_trees_options(tree_old, tree_new, body, "utf8", None, "", "", None)
-                                        diff.show_diff(None, None)
-                                finally:
-                                        tree_new.unlock()
-                        finally:
-                                tree_old.unlock()
-                        
-                        subject = "r%d - %s" % (revision_new_no, commit_message)
-                        
-                        send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue())
                 finally:
                         branch.repository.unlock()