Rev 720: Merge some offline changes. in file:///data/jelmer/bzr-svn/0.4/
Jelmer Vernooij
jelmer at samba.org
Wed Oct 17 01:14:30 BST 2007
At file:///data/jelmer/bzr-svn/0.4/
------------------------------------------------------------
revno: 720
revision-id: jelmer at samba.org-20071001181833-0ziqv0xb584jl20k
parent: jelmer at samba.org-20070926021308-mji79tvaal40fdz2
parent: jelmer at samba.org-20070926120521-pf02sdwj0shlev95
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2007-10-01 20:18:33 +0200
message:
Merge some offline changes.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
------------------------------------------------------------
revno: 719.1.3
revision-id: jelmer at samba.org-20070926120521-pf02sdwj0shlev95
parent: jelmer at samba.org-20070926115802-qdslky3kk1v2k8r5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-09-26 14:05:21 +0200
message:
Give proper warning message when running 'bzr svn-import' on something that is
not a Subversion repository.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 719.1.2
revision-id: jelmer at samba.org-20070926115802-qdslky3kk1v2k8r5
parent: jelmer at samba.org-20070926114550-i2ik0775h63xepgy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-09-26 13:58:02 +0200
message:
Use new KnownFailure exception.
modified:
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
------------------------------------------------------------
revno: 719.1.1
revision-id: jelmer at samba.org-20070926114550-i2ik0775h63xepgy
parent: jelmer at samba.org-20070926021308-mji79tvaal40fdz2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-09-26 13:45:50 +0200
message:
Give proper warning message when running 'bzr svn-branching-scheme' on something that is not a Subversion repository. (#145159)
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
=== modified file 'NEWS'
--- a/NEWS 2007-09-24 19:23:19 +0000
+++ b/NEWS 2007-09-26 12:05:21 +0000
@@ -20,6 +20,12 @@
* Handle long file names with unicode characters correctly on python2.4 (#129334)
+ * Give proper warning message when running 'bzr svn-branching-scheme' on
+ something that is not a Subversion repository. (#145159)
+
+ * Give proper warning message when running 'bzr svn-import' on
+ something that is not a Subversion repository.
+
DOCUMENTATION
* Add simple FAQ file. (#144388)
=== modified file '__init__.py'
--- a/__init__.py 2007-09-17 14:19:05 +0000
+++ b/__init__.py 2007-09-26 12:05:21 +0000
@@ -167,9 +167,10 @@
@display_command
def run(self, from_location, to_location=None, trees=False,
standalone=False, scheme=None, all=False, prefix=None):
- from bzrlib.errors import NoRepositoryPresent
+ from bzrlib.errors import BzrCommandError, NoRepositoryPresent
from bzrlib.bzrdir import BzrDir
from convert import convert_repository
+ from repository import SvnRepository
import os
if to_location is None:
@@ -193,10 +194,13 @@
try:
from_repos = from_dir.open_repository()
except NoRepositoryPresent, e:
- from bzrlib.errors import BzrCommandError
raise BzrCommandError("No Repository found at %s. "
"For individual branches, use 'bzr branch'." % from_location)
+ if not isinstance(from_repos, SvnRepository):
+ raise BzrCommandError(
+ "Not a Subversion repository: %s" % from_location)
+
def filter_branch((branch_path, revnum, exists)):
if prefix is not None and not branch_path.startswith(prefix):
return False
@@ -309,15 +313,19 @@
]
def run(self, location=".", set=False, repository_wide=False):
+ from bzrlib.errors import BzrCommandError
from bzrlib.msgeditor import edit_commit_message
from bzrlib.repository import Repository
from bzrlib.trace import info
+ from repository import SvnRepository
from scheme import scheme_from_branch_list
def scheme_str(scheme):
if scheme is None:
return ""
return "".join(map(lambda x: x+"\n", scheme.to_lines()))
repos = Repository.open(location)
+ if not isinstance(repos, SvnRepository):
+ raise BzrCommandError("Not a Subversion repository: %s" % location)
if repository_wide:
scheme = repos._get_property_scheme()
else:
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2007-08-06 08:19:13 +0000
+++ b/tests/test_blackbox.py 2007-09-26 11:45:50 +0000
@@ -209,3 +209,4 @@
self.client_commit("dc", "Msg")
self.check_output(
"Repository branch (format: subversion)\nLocation:\n shared repository: a\n repository branch: a\n\nRelated branches:\n parent branch: a\n", 'info a')
+
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2007-08-09 18:59:40 +0000
+++ b/tests/test_workingtree.py 2007-09-26 11:58:02 +0000
@@ -19,6 +19,7 @@
from bzrlib.bzrdir import BzrDir
from bzrlib.errors import NoSuchFile
from bzrlib.inventory import Inventory
+from bzrlib.tests import KnownFailure
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
@@ -247,7 +248,7 @@
self.assertTrue(tree.is_control_filename(".svn"))
self.assertFalse(tree.is_control_filename(".bzr"))
- def notest_revert(self):
+ def test_revert(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
@@ -255,6 +256,7 @@
self.client_update("dc")
tree = WorkingTree.open("dc")
os.remove("dc/bl")
+ raise KnownFailure("revert not supported yet")
tree.revert(["bl"])
self.assertEqual("data", open('dc/bl').read())
More information about the bazaar-commits
mailing list