Rev 453: Merge the 0.3 branch. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Wed May 16 14:30:33 BST 2007
At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
------------------------------------------------------------
revno: 453
revision-id: jelmer at samba.org-20070516133028-ykjexckioosx0vtn
parent: jelmer at samba.org-20070516132803-atj347dynttwtwvv
parent: jelmer at samba.org-20070516105310-6ebfp4439v18qfqg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-05-16 14:30:28 +0100
message:
Merge the 0.3 branch.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
format.py format.py-20060406233823-b6fa009fe35dfde7
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
------------------------------------------------------------
revno: 402.1.47
merged: jelmer at samba.org-20070516105310-6ebfp4439v18qfqg
parent: jelmer at samba.org-20070505140230-7rlcyyelnr15sygw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-05-16 11:53:10 +0100
message:
Start 0.3.4.
------------------------------------------------------------
revno: 402.1.46
merged: jelmer at samba.org-20070505140230-7rlcyyelnr15sygw
parent: jelmer at samba.org-20070429150201-luf9gqyyscj1ee10
parent: jelmer at samba.org-20070429155336-748nze9cgmm7vude
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sat 2007-05-05 16:02:30 +0200
message:
Merge 0.3.3 release.
------------------------------------------------------------
revno: 402.1.45.1.1
tags: bzr-svn-0.3.3
merged: jelmer at samba.org-20070429155336-748nze9cgmm7vude
parent: jelmer at samba.org-20070429150201-luf9gqyyscj1ee10
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-04-29 17:53:36 +0200
message:
Release 0.3.3
------------------------------------------------------------
revno: 402.1.45
merged: jelmer at samba.org-20070429150201-luf9gqyyscj1ee10
parent: jelmer at samba.org-20070425142442-b8gw64dz2nxtw2z1
parent: jelmer at samba.org-20070426131316-hg3jf00jfksudw36
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-04-29 17:02:01 +0200
message:
merge offline revisions.
------------------------------------------------------------
revno: 402.1.44.1.1
merged: jelmer at samba.org-20070426131316-hg3jf00jfksudw36
parent: jelmer at samba.org-20070425142442-b8gw64dz2nxtw2z1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Thu 2007-04-26 15:13:16 +0200
message:
Fix compatibility with latest bzr.dev.
------------------------------------------------------------
revno: 402.1.44
merged: 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 file 'NEWS'
--- a/NEWS 2007-04-15 16:15:53 +0000
+++ b/NEWS 2007-05-16 13:30:28 +0000
@@ -24,14 +24,20 @@
This should reduce the number of roundtrips significantly when
finding file id mappings.
-bzr-svn 0.3.3 UNRELEASED
+bzr-svn 0.3.4 UNRELEASED
+
+bzr-svn 0.3.3 2007-04-29
IMPROVEMENTS
+ * Fix compatibility with 0.16 (#110164)
+
* Don't do extra checkout before push if possible. (#91885)
* 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 'checkout.py'
--- a/checkout.py 2007-04-15 16:15:53 +0000
+++ b/checkout.py 2007-05-16 13:30:28 +0000
@@ -635,7 +635,7 @@
def clone(self, path, revision_id=None, force_new_repo=False):
raise NotImplementedError(self.clone)
- def open_workingtree(self, _unsupported=False):
+ def open_workingtree(self, _unsupported=False, recommend_upgrade=False):
return SvnWorkingTree(self, self.local_path, self.open_branch())
def sprout(self, url, revision_id=None, force_new_repo=False,
=== modified file 'format.py'
--- a/format.py 2007-04-15 16:15:53 +0000
+++ b/format.py 2007-05-16 13:30:28 +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
@@ -102,14 +103,15 @@
transport = SvnRaTransport(self.svn_root_url)
return SvnRepository(self, transport)
- def open_workingtree(self):
+ def open_workingtree(self, _unsupported=False,
+ recommend_upgrade=True):
"""See BzrDir.open_workingtree().
Will always raise NotLocalUrl as this
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-28 04:00:14 +0000
+++ b/tests/test_radir.py 2007-05-16 13:30:28 +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,12 @@
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_open_workingtree_recommend_arg(self):
+ repos_url = self.make_client("d", "dc")
+ x = BzrDir.open(repos_url)
+ self.assertRaises(NoWorkingTree, lambda: x.open_workingtree(recommend_upgrade=True))
def test_create_workingtree(self):
repos_url = self.make_client("d", "dc")
More information about the bazaar-commits
mailing list