At http://people.samba.org/bzr/jelmer/bzr-svn/0.5
------------------------------------------------------------
revno: 2093
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.5
timestamp: Sat 2008-11-29 03:04:06 +0100
message:
Don't do guessing based on path in repository when importing (parts of)
repositories.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
remote.py format.py-20060406233823-b6fa009fe35dfde7
=== modified file '__init__.py'
--- a/__init__.py 2008-11-29 01:53:59 +0000
+++ b/__init__.py 2008-11-29 02:04:06 +0000
@@ -231,7 +231,7 @@
if prefix is not None:
raise BzrCommandError("Path inside repository specified "
"and --prefix specified")
- from_repos = from_dir.find_repository()
+ from_repos = from_dir.find_repository(_ignore_branch_path=True)
assert from_location.startswith(from_repos.base)
prefix = from_location[len(from_repos.base):].strip("/")
prefix = prefix.encode("utf-8")
=== modified file 'remote.py'
--- a/remote.py 2008-11-12 10:57:24 +0000
+++ b/remote.py 2008-11-29 02:04:06 +0000
@@ -76,7 +76,7 @@
def break_lock(self):
pass
- def find_repository(self):
+ def find_repository(self, _ignore_branch_path=False):
"""Open the repository associated with this BzrDir.
:return: instance of SvnRepository.
@@ -84,7 +84,10 @@
transport = self.root_transport
if self.root_url != transport.base:
transport = transport.clone_root()
- return SvnRepository(self, transport, self.branch_path)
+ if _ignore_branch_path:
+ return SvnRepository(self, transport)
+ else:
+ return SvnRepository(self, transport, self.branch_path)
def cloning_metadir(self, stacked=False):
"""Produce a metadir suitable for cloning with."""
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
