[Pkg-bazaar-commits] ./bzrtools/unstable r683: New upstream release.

[James Westby]

------------------------------------------------------------
revno: 683 [merge]
committer: James Westby <james.westby at canonical.com>
branch nick: unstable
timestamp: Wed 2009-08-26 12:53:01 +0100
message:
  New upstream release.
modified:
  NEWS
  __init__.py
  debian/changelog
  debian/control
  mirror.py
  tests/test_mirror.py
  version.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-06-12 21:17:29 +0000
+++ b/NEWS	2009-08-20 04:23:51 +0000
@@ -1,3 +1,16 @@
+August 20 2009
+* RELEASE: bzrtools 1.18.0
+
+July 13 2009
+* RELEASE: bzrtools 1.17.0
+
+July 10 2009
+* `create-mirror` mirrors child_submit_to
+
+June 16 2009
+* `shelve1` is no longer aliased to `shelve`, `unshelved1` is no longer aliased
+  to `unshelve`.
+
 June 12 2009
 * RELEASE: bzrtools 1.16.0
 

=== modified file '__init__.py'
--- a/__init__.py	2009-06-11 02:05:44 +0000
+++ b/__init__.py	2009-06-16 05:05:04 +0000
@@ -42,9 +42,9 @@
     'cmd_rspush': [],
     'cmd_shelf1': [],
     'cmd_shell': [],
-    'cmd_shelve1': ['shelve'],
+    'cmd_shelve1': [],
     'cmd_trees': [],
-    'cmd_unshelve1': ['unshelve'],
+    'cmd_unshelve1': [],
     'cmd_zap': [],
 }
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-06-18 10:55:57 +0000
+++ b/debian/changelog	2009-08-26 11:53:01 +0000
@@ -1,3 +1,9 @@
+bzrtools (1.18.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- James Westby <james.westby at ubuntu.com>  Wed, 26 Aug 2009 11:31:54 +0100
+
 bzrtools (1.16.0-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- a/debian/control	2009-06-18 10:55:57 +0000
+++ b/debian/control	2009-08-26 11:53:01 +0000
@@ -2,7 +2,7 @@
 Section: vcs
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Gustavo Franco <stratus at debian.org>, Arnaud Fontaine <arnau at debian.org>, Reinhard Tartler <siretart at tauware.de>, Jelmer Vernooij <jelmer at debian.org>
+Uploaders: Gustavo Franco <stratus at debian.org>, Arnaud Fontaine <arnau at debian.org>, Reinhard Tartler <siretart at tauware.de>, Jelmer Vernooij <jelmer at debian.org>, James Westby <james.westby at ubuntu.com>
 Build-Depends: cdbs, debhelper, python, python-central
 Build-Depends-Indep: bzr (>= 1.15~), rsync
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzrtools/unstable
@@ -13,7 +13,7 @@
 
 Package: bzrtools
 Architecture: all
-Depends: ${python:Depends}, bzr (>= 1.16~), bzr (<< 1.17~), patch, ${misc:Depends}
+Depends: ${python:Depends}, bzr (>= 1.18~), bzr (<< 1.19~), patch, ${misc:Depends}
 Recommends: rsync
 Suggests: librsvg2-bin, graphviz
 XB-Python-Version: ${python:Versions}

=== modified file 'mirror.py'
--- a/mirror.py	2009-06-11 23:40:26 +0000
+++ b/mirror.py	2009-07-10 04:05:24 +0000
@@ -10,4 +10,8 @@
     if source_branch.get_config().has_explicit_nickname():
         mirror.nick = source_branch.nick
     mirror.set_submit_branch(source_branch.get_submit_branch())
+    source_config = source_branch.get_config()
+    child_submit_to = source_config.get_user_option('child_submit_to')
+    if child_submit_to is not None:
+        mirror.get_config().set_user_option('child_submit_to', child_submit_to)
     return mirror

=== modified file 'tests/test_mirror.py'
--- a/tests/test_mirror.py	2009-06-11 23:40:26 +0000
+++ b/tests/test_mirror.py	2009-07-10 04:05:24 +0000
@@ -38,6 +38,7 @@
         self.addCleanup(source.unlock)
         source.nick = 'my special nick'
         source.set_submit_branch(':submit:')
+        source.get_config().set_user_option('child_submit_to', 'a at b.com')
         self.commit_transform(source, self.make_transform(source))
         mirror = create_mirror(source, 'target', [])
         self.assertEqual(source.last_revision(), mirror.last_revision())
@@ -45,6 +46,8 @@
         self.assertEqual(source.base, mirror.get_parent())
         self.assertEqual('my special nick', mirror.nick)
         self.assertEqual(':submit:', mirror.get_submit_branch())
+        self.assertEqual('a at b.com', mirror.get_config().get_user_option(
+                         'child_submit_to'))
 
     def test_nonexplict_nick(self):
         source = self.make_branch('source')

=== modified file 'version.py'
--- a/version.py	2009-06-11 01:47:16 +0000
+++ b/version.py	2009-08-14 14:07:03 +0000
@@ -1,2 +1,2 @@
-__version__ = '1.16.0'
+__version__ = '2.0.0'
 version_info = tuple(int(n) for n in __version__.split('.'))