Rev 1567: Add configuration option for pushing merged revisions. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pushmerged/

------------------------------------------------------------
revno: 1567
revision-id: jelmer at samba.org-20080804163735-m3uxvbm321y7pj7r
parent: jelmer at samba.org-20080804162324-73wmjhv74lmbzgmh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Mon 2008-08-04 18:37:35 +0200
message:
  Add configuration option for pushing merged revisions.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  config.py                      config.py-20070624185721-0j8f1ly75uo4s1lk-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
=== modified file 'NEWS'
--- a/NEWS	2008-08-03 00:02:00 +0000
+++ b/NEWS	2008-08-04 16:37:35 +0000
@@ -51,6 +51,9 @@
    * Support bzr sign-my-commits. (Requires revision properties in the 
 	 Subversion repository to be mutable)
 
+   * Support pushing merged revisions. To enable, set 
+     ``push_merged_revisions = True'' in the repository config. (#158883)
+
   BUG FIXES
 
    * Now uses absolute imports and no longer adds plugin directory to the 

=== modified file 'config.py'
--- a/config.py	2008-07-08 23:28:17 +0000
+++ b/config.py	2008-08-04 16:37:35 +0000
@@ -173,6 +173,13 @@
             return set()
         return set(val.split(";"))
 
+    def get_push_merged_revisions(self):
+        """Check whether merged revisions should be pushed."""
+        try:
+            return self._get_parser().get_bool(self.uuid, "push_merged_revisions")
+        except KeyError:
+            return None
+
     def add_location(self, location):
         """Add a location for this repository.
 

=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-08-03 16:42:20 +0000
+++ b/mapping3/__init__.py	2008-08-04 16:37:35 +0000
@@ -126,7 +126,7 @@
     def push_merged_revisions(self, project=""):
         try:
             self.scheme.get_branch_path("somebranch")
-            return True
+            return self.repository.get_config().get_push_merged_revisions()
         except NotImplementedError:
             return False