Rev 1673: Cope with svn+ prefix when setting tags. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1673
revision-id: jelmer at samba.org-20080827173912-nn377l0t8yj0nfkq
parent: jelmer at samba.org-20080827173248-mhzk5odpw8w413dm
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-08-27 19:39:12 +0200
message:
  Cope with svn+ prefix when setting tags.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tags.py                        tags.py-20080822211316-scblu3akdvu0b64c-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'NEWS'
--- a/NEWS	2008-08-27 09:57:53 +0000
+++ b/NEWS	2008-08-27 17:39:12 +0000
@@ -1,5 +1,9 @@
 bzr-svn 0.4.12	UNRELEASED
 
+  BUG FIXES
+
+   * Cope with svn+ prefix when setting tags. (#261748)
+
 bzr-svn 0.4.11	2008-08-26
 
 bzr-svn 0.4.11~rc2	2008-08-26

=== modified file 'fetch.py'
--- a/fetch.py	2008-08-23 14:55:24 +0000
+++ b/fetch.py	2008-08-27 17:39:12 +0000
@@ -755,7 +755,7 @@
                     try:
                         conn = None
                         try:
-                            conn = self.source.transport.connections.get(urlutils.join(repos_root, parent_branch))
+                            conn = self.source.transport.get_connection(parent_branch)
 
                             assert revmeta.revnum > parent_revnum or start_empty
 

=== modified file 'repository.py'
--- a/repository.py	2008-08-26 04:29:43 +0000
+++ b/repository.py	2008-08-27 17:39:12 +0000
@@ -353,7 +353,7 @@
                                       self.get_fileid_map(revision.svn_meta.revnum, 
                                                           revision.svn_meta.branch_path,
                                                           revision.svn_mapping), parentfileidmap)
-        conn = self.transport.connections.get(urlutils.join(self.transport.get_svn_repos_root(), parent_branch_path))
+        conn = self.transport.get_connection(parent_branch_path)
         try:
             reporter = conn.do_diff(revision.svn_meta.revnum, "", urlutils.join(self.transport.get_svn_repos_root(), revision.svn_meta.branch_path), editor, True, True, False)
             reporter.set_path("", parentrevnum, start_empty)

=== modified file 'tags.py'
--- a/tags.py	2008-08-26 04:29:43 +0000
+++ b/tags.py	2008-08-27 17:39:12 +0000
@@ -73,7 +73,7 @@
         if from_bp == path:
             return
         self._ensure_tag_parent_exists(parent)
-        conn = self.repository.transport.connections.get(urlutils.join(self.repository.base, parent))
+        conn = self.repository.transport.get_connection(parent)
         deletefirst = (conn.check_path(urlutils.basename(path), self.repository.get_latest_revnum()) != core.NODE_NONE)
         try:
             ci = conn.get_commit_editor({properties.PROP_REVISION_LOG: "Add tag %s" % tag_name.encode("utf-8")})
@@ -116,7 +116,7 @@
     def delete_tag(self, tag_name):
         path = self.branch.layout.get_tag_path(tag_name, self.branch.project)
         parent = urlutils.dirname(path)
-        conn = self.repository.transport.connections.get(urlutils.join(self.repository.base, parent))
+        conn = self.repository.transport.get_connection(parent)
         try:
             if conn.check_path(urlutils.basename(path), self.repository.get_latest_revnum()) != core.NODE_DIR:
                 raise NoSuchTag(tag_name)

=== modified file 'transport.py'
--- a/transport.py	2008-08-27 17:32:48 +0000
+++ b/transport.py	2008-08-27 17:39:12 +0000
@@ -193,8 +193,12 @@
         from bzrlib.plugins.svn import lazy_check_versions
         lazy_check_versions()
 
-    def get_connection(self):
-        return self.connections.get(self.svn_url)
+    def get_connection(self, repos_path=None):
+        if repos_path is not None:
+            return self.connections.get(urlutils.join(self.get_svn_repos_root(), 
+                                        repos_path))
+        else:
+            return self.connections.get(self.svn_url)
 
     def add_connection(self, conn):
         self.connections.add(conn)

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-23 15:14:26 +0000
+++ b/workingtree.py	2008-08-27 17:39:12 +0000
@@ -159,7 +159,7 @@
             revnum = self.branch.get_revnum()
         adm = self._get_wc(write_lock=True)
         try:
-            conn = self.branch.repository.transport.connections.get(bzr_to_svn_url(self.branch.base))
+            conn = self.branch.repository.transport.get_connection(self.branch.get_branch_path())
             try:
                 update_wc(adm, self.basedir, conn, revnum)
             finally: