Rev 446: Fix no working tree warning. in file:///home/jelmer/bzr-svn/0.3/

Jelmer Vernooij jelmer at samba.org
Wed Apr 25 15:24:46 BST 2007


At file:///home/jelmer/bzr-svn/0.3/

------------------------------------------------------------
revno: 446
revision-id: jelmer at samba.org-20070425142442-b8gw64dz2nxtw2z1
parent: jelmer at samba.org-20070415161300-w8q2nd1f32e4ik16
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-04-25 16:24:42 +0200
message:
  Fix no working tree warning.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  format.py                      format.py-20060406233823-b6fa009fe35dfde7
  tests/test_radir.py            test_radir.py-20061231173434-31utf9o4byu7wktm-1
=== modified file 'NEWS'
--- a/NEWS	2007-04-08 13:39:54 +0000
+++ b/NEWS	2007-04-25 14:24:42 +0000
@@ -6,6 +6,8 @@
 
   * Set parent URLs in svn-import. (#94406)
 
+  * Don't show "not updating working tree" warnings when pushing.
+
 bzr-svn 0.3.2	2007-03-13
 
   BUG FIXES

=== modified file 'format.py'
--- a/format.py	2007-04-15 16:13:00 +0000
+++ b/format.py	2007-04-25 14:24:42 +0000
@@ -15,7 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from bzrlib.bzrdir import BzrDirFormat, BzrDir
-from bzrlib.errors import NotBranchError, NotLocalUrl, NoRepositoryPresent
+from bzrlib.errors import (NotBranchError, NotLocalUrl, NoRepositoryPresent,
+                           NoWorkingTree)
 from bzrlib.lockable_files import TransportLock
 from bzrlib.transport.local import LocalTransport
 
@@ -108,7 +109,7 @@
         BzrDir can not be associated with working trees.
         """
         # Working trees never exist on remote Subversion repositories
-        raise NotLocalUrl(self.root_transport.base)
+        raise NoWorkingTree(self.root_transport.base)
 
     def create_workingtree(self, revision_id=None):
         """See BzrDir.create_workingtree().

=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py	2007-03-25 14:41:44 +0000
+++ b/tests/test_radir.py	2007-04-25 14:24:42 +0000
@@ -15,7 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import NoRepositoryPresent, NotBranchError, NotLocalUrl
+from bzrlib.errors import (NoRepositoryPresent, NotBranchError, NotLocalUrl,
+                           NoWorkingTree)
 
 from tests import TestCaseWithSubversionRepository
 
@@ -31,7 +32,7 @@
     def test_open_workingtree(self):
         repos_url = self.make_client("d", "dc")
         x = BzrDir.open(repos_url)
-        self.assertRaises(NotLocalUrl, x.open_workingtree)
+        self.assertRaises(NoWorkingTree, x.open_workingtree)
 
     def test_create_workingtree(self):
         repos_url = self.make_client("d", "dc")




More information about the bazaar-commits mailing list