Rev 68: Prefer push location over parent when rebasing. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 68
revision-id:jelmer at samba.org-20071206143825-1214v1ywwvbvxe3p
parent: jelmer at samba.org-20071127134944-wnzy4rifefirlu0i
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-12-06 15:38:25 +0100
message:
  Prefer push location over parent when rebasing.
modified:
  NEWS                           news-20070721005510-kbjm9yxqoeczq9fl-1
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
=== modified file 'NEWS'
--- a/NEWS	2007-10-30 22:55:35 +0000
+++ b/NEWS	2007-12-06 14:38:25 +0000
@@ -7,6 +7,9 @@
   * Don't require "bzr replay" and "bzr rebase" to be run in 
     the branch root.
 
+  * Give preference to push location when no upstream location 
+    is specified.
+
  BUG FIXES
 
   * Fix "bzr replay", add test.

=== modified file '__init__.py'
--- a/__init__.py	2007-11-27 13:49:44 +0000
+++ b/__init__.py	2007-12-06 14:38:25 +0000
@@ -120,7 +120,9 @@
         wt = WorkingTree.open_containing(".")[0]
         wt.lock_write()
         if upstream_location is None:
-            upstream_location = wt.branch.get_parent()
+            upstream_location = wt.branch.get_push_location()
+            if upstream_location is None:
+                upstream_location = wt.branch.get_parent()
             info("Rebasing on %s" % upstream_location)
         upstream = Branch.open_containing(upstream_location)[0]
         upstream_repository = upstream.repository