Rev 69: Merge some fixes. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 69
revision-id:jelmer at samba.org-20071206154141-j731rqud42825cw4
parent: jelmer at samba.org-20071206143825-1214v1ywwvbvxe3p
parent: jelmer at samba.org-20071127151447-zt2earxxxuwx502e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-12-06 16:41:41 +0100
message:
  Merge some fixes.
modified:
  NEWS                           news-20070721005510-kbjm9yxqoeczq9fl-1
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
    ------------------------------------------------------------
    revno: 67.1.2
    revision-id:jelmer at samba.org-20071127151447-zt2earxxxuwx502e
    parent: jelmer at samba.org-20071127151340-ldz7f9wncy319n8a
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2007-11-27 15:14:47 +0000
    message:
      Update NEWS.
    modified:
      NEWS                           news-20070721005510-kbjm9yxqoeczq9fl-1
    ------------------------------------------------------------
    revno: 67.1.1
    revision-id:jelmer at samba.org-20071127151340-ldz7f9wncy319n8a
    parent: jelmer at samba.org-20071127134944-wnzy4rifefirlu0i
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2007-11-27 15:13:40 +0000
    message:
      Allow use in non-root directories for rebase-continue, rebase-todo and rebase-abort.
    modified:
      __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
=== modified file 'NEWS'
--- a/NEWS	2007-12-06 14:38:25 +0000
+++ b/NEWS	2007-12-06 15:41:41 +0000
@@ -4,12 +4,15 @@
 
   * "bzr replay" now supports revision ranges.
 
-  * Don't require "bzr replay" and "bzr rebase" to be run in 
+  * Don't require any of the commands to be run in 
     the branch root.
 
   * Give preference to push location when no upstream location 
     is specified.
 
+  * Make message when there is nothing to rebase a 
+    bit friendlier.
+
  BUG FIXES
 
   * Fix "bzr replay", add test.

=== modified file '__init__.py'
--- a/__init__.py	2007-12-06 14:38:25 +0000
+++ b/__init__.py	2007-12-06 15:41:41 +0000
@@ -217,7 +217,7 @@
     def run(self):
         from rebase import read_rebase_plan, remove_rebase_plan, complete_revert
         from bzrlib.workingtree import WorkingTree
-        wt = WorkingTree.open('.')
+        wt = WorkingTree.open_containing('.')[0]
         wt.lock_write()
         try:
             # Read plan file and set last revision
@@ -243,7 +243,7 @@
                             read_rebase_plan, read_active_rebase_revid, 
                             remove_rebase_plan, workingtree_replay)
         from bzrlib.workingtree import WorkingTree
-        wt = WorkingTree.open('.')
+        wt = WorkingTree.open_containing('.')[0]
         wt.lock_write()
         try:
             # Abort if there are any conflicts
@@ -282,7 +282,7 @@
         from rebase import (rebase_todo, read_rebase_plan, 
                             read_active_rebase_revid)
         from bzrlib.workingtree import WorkingTree
-        wt = WorkingTree.open('.')
+        wt = WorkingTree.open_containing('.')[0]
         wt.lock_read()
         try:
             try:
@@ -297,6 +297,7 @@
         finally:
             wt.unlock()
 
+
 class cmd_replay(Command):
     """Replay commits from another branch on top of this one.