[Pkg-bazaar-commits] ./bzr-rebase/unstable r58: New upstream release.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 58
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Fri 2009-06-19 00:07:33 +0200
message:
  New upstream release.
modified:
  NEWS
  __init__.py
  debian/changelog
  rebase.py
  setup.py
    ------------------------------------------------------------
    revno: 24.1.126
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2009-05-20 17:50:30 +0200
    message:
      Start on 0.5.1.
    modified:
      NEWS
      __init__.py
      setup.py
    ------------------------------------------------------------
    revno: 24.1.127
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2009-05-27 23:39:56 +0200
    message:
      Rename message to msg because the first happens to have the same name as an attribute that is deprecated in python 2.6.
    modified:
      rebase.py
    ------------------------------------------------------------
    revno: 24.1.128
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2009-06-10 20:36:05 +0200
    message:
      Don't add original author more than once.
    modified:
      rebase.py
    ------------------------------------------------------------
    revno: 24.1.129
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2009-06-18 23:58:17 +0200
    message:
      Release 0.5.1.
    modified:
      NEWS
      __init__.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-05-20 15:47:23 +0000
+++ b/NEWS	2009-06-18 21:58:17 +0000
@@ -1,3 +1,9 @@
+0.5.1	2009-06-18
+
+ BUG FIXES
+
+  * Mark as compatible with Bazaar 1.16.
+
 0.5.0	2009-05-20
 
  BUG FIXES

=== modified file '__init__.py'
--- a/__init__.py	2009-05-20 15:47:23 +0000
+++ b/__init__.py	2009-06-18 21:58:17 +0000
@@ -25,7 +25,7 @@
 import bzrlib.api
 from bzrlib.commands import plugin_cmds
 
-version_info = (0, 5, 0, 'final', 0)
+version_info = (0, 5, 1, 'final', 0)
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
 else:
@@ -33,7 +33,7 @@
 __version__ = version_string
 __author__ = 'Jelmer Vernooij <jelmer at samba.org>'
 
-COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0)]
+COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0), (1, 16, 0)]
 
 bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-05-20 16:06:51 +0000
+++ b/debian/changelog	2009-06-18 22:07:33 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Fri, 19 Jun 2009 00:05:36 +0200
+
 bzr-rebase (0.5.0-2) unstable; urgency=low
 
   * Add conflict with older versions of bzr-svn (<< 0.6.0) that also provide 

=== modified file 'rebase.py'
--- a/rebase.py	2009-05-02 13:41:46 +0000
+++ b/rebase.py	2009-06-10 18:36:05 +0000
@@ -401,7 +401,8 @@
         if [oldrev.committer] == authors:
             authors = None
     else:
-        authors.append(oldrev.committer)
+        if not oldrev.committer in authors:
+            authors.append(oldrev.committer)
     if 'author' in revprops:
         del revprops['author']
     if 'authors' in revprops:
@@ -546,11 +547,11 @@
 
 class ReplaySnapshotError(BzrError):
     """Raised when replaying a snapshot failed."""
-    _fmt = """Replaying the snapshot failed: %(message)s."""
+    _fmt = """Replaying the snapshot failed: %(msg)s."""
 
-    def __init__(self, message):
+    def __init__(self, msg):
         BzrError.__init__(self)
-        self.message = message
+        self.msg = msg
 
 
 class ReplayParentsInconsistent(BzrError):

=== modified file 'setup.py'
--- a/setup.py	2009-05-20 15:47:23 +0000
+++ b/setup.py	2009-05-20 15:50:30 +0000
@@ -5,7 +5,7 @@
 setup(name='bzr-rebase',
       description='Rebase plugin for Bazaar',
       keywords='plugin bzr rebase',
-      version='0.5.0',
+      version='0.5.1',
       url='http://bazaar-vcs.org/Rebase',
       download_url='http://bazaar-vcs.org/Rebase',
       license='GPLv3 or later',