Changeset 90478727 in mainline for contrib

Timestamp:

2012-08-12T11:46:44Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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

Location:

contrib

Files:

• arch/HelenOS.adl (modified) (1 diff)
• bazaar/bzreml/__init__.py (modified) (4 diffs)
• bazaar/bzreml/setup.py (modified) (2 diffs)
• bazaar/mbprotect/__init__.py (modified) (3 diffs)
• conf/mips32-gx.sh (modified) (1 diff)

contrib/arch/HelenOS.adl

@@ -1 @@
-system architecture HelenOS version 0.4.1 {
+system architecture HelenOS version 0.5.0 {
         /* SPARTAN kernel */
         inst kernel kernel;

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()

contrib/bazaar/bzreml/setup.py

@@ -7 +7 @@
         description = 'Commit email plugin for Bazaar',
         keywords = 'plugin bzr email',
-        version = '1.2',
+        version = '1.3',
         url = 'http://www.decky.cz/',
         license = 'BSD',
@@ -13 +13 @@
         author_email = 'martin@decky.cz',
         long_description = """Hooks into Bazaar and sends commit notification emails.""",
-        package_dir = {'bzrlib.plugins.eml':'.'}, 
+        package_dir = {'bzrlib.plugins.eml':'.'},
         packages = ['bzrlib.plugins.eml']
 )

contrib/bazaar/mbprotect/__init__.py

@@ -45 +45 @@
 from bzrlib.errors import TipChangeRejected
 
+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 pre_change_branch_tip(params):
         repo = params.branch.repository
@@ -54 +61 @@
         # First permitted case is appending changesets to main branch.Look for
         # old tip in new main branch.
-        for revision_id in repo.iter_reverse_revision_history(params.new_revid):
+        for revision_id in iter_reverse_revision_history(repo, params.new_revid):
                 if revision_id == params.old_revid:
                         return  # Found old tip
@@ -60 +67 @@
         # Another permitted case is backing out changesets. Look for new tip
         # in old branch.
-        for revision_id in repo.iter_reverse_revision_history(params.old_revid):
+        for revision_id in iter_reverse_revision_history(repo, params.old_revid):
                 if revision_id == params.new_revid:
                         return  # Found new tip

contrib/conf/mips32-gx.sh

@@ -8 +8 @@
 fi
 
-gxemul $@ -E oldtestmips -C R4000 -X image.boot -d d0:"$DISK_IMG"
+if [ "$1" == "-E" ] && [ -n "$2" ]; then
+        MACHINE="$2"
+        shift 2
+else
+        MACHINE="oldtestmips"
+fi
+
+gxemul $@ -E "$MACHINE" -C R4000 -X image.boot -d d0:"$DISK_IMG"