Rev 135: Remove use of deprecated Revision.get_apparent_author(). in file:///home/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 135
revision-id: jelmer at samba.org-20090317062315-29q2l1ulsbw0vdj6
parent: jelmer at samba.org-20090310132349-lkqqbvhuw43xfrhf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2009-03-17 07:23:15 +0100
message:
  Remove use of deprecated Revision.get_apparent_author().
modified:
  NEWS                           news-20070721005510-kbjm9yxqoeczq9fl-1
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
=== modified file 'NEWS'
--- a/NEWS	2009-03-10 13:23:49 +0000
+++ b/NEWS	2009-03-17 06:23:15 +0000
@@ -1,5 +1,9 @@
 0.4.5	UNRELEASED
 
+ BUG FIXES
+
+  * Remove use of deprecated Revision.get_apparent_author().
+
 0.4.4	2009-03-10
 
  BUG FIXES

=== modified file '__init__.py'
--- a/__init__.py	2009-03-10 13:23:49 +0000
+++ b/__init__.py	2009-03-17 06:23:15 +0000
@@ -33,8 +33,7 @@
 __version__ = version_string
 __author__ = 'Jelmer Vernooij <jelmer at samba.org>'
 
-COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0),
-                           (1, 10, 0), (1, 11, 0), (1, 12, 0), (1, 13, 0)]
+COMPATIBLE_BZR_VERSIONS = [(1, 13, 0)]
 
 bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
 

=== modified file 'rebase.py'
--- a/rebase.py	2009-02-21 02:01:58 +0000
+++ b/rebase.py	2009-03-17 06:23:15 +0000
@@ -394,12 +394,17 @@
     revprops = dict(oldrev.properties)
     revprops[REVPROP_REBASE_OF] = oldrev.revision_id
     committer = wt.branch.get_config().username()
-    author = oldrev.get_apparent_author()
-    if author == committer or 'author' in revprops:
-        author = None
+    authors = oldrev.get_apparent_authors()
+    if oldrev.committer == committer:
+        # No need to explicitly record the authors if the original 
+        # committer is rebasing.
+        if [oldrev.committer] == authors:
+            authors = None
+    else:
+        authors.append(oldrev.committer)
     wt.commit(message=oldrev.message, timestamp=oldrev.timestamp, 
               timezone=oldrev.timezone, revprops=revprops, rev_id=newrevid,
-              committer=committer, author=author)
+              committer=committer, authors=authors)
     write_active_rebase_revid(wt, None)