Rev 1672: Remove evil _backing_url hack. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1672
revision-id: jelmer at samba.org-20080827173248-mhzk5odpw8w413dm
parent: jelmer at samba.org-20080827095753-8f2uiz5jzkvfjecl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-08-27 19:32:48 +0200
message:
  Remove evil _backing_url hack.
modified:
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'transport.py'
--- a/transport.py	2008-08-26 12:13:30 +0000
+++ b/transport.py	2008-08-27 17:32:48 +0000
@@ -173,21 +173,16 @@
     This implements just as much of Transport as is necessary 
     to fool Bazaar. """
     @convert_svn_error
-    def __init__(self, url="", _backing_url=None, pool=None, _uuid=None, _repos_root=None):
+    def __init__(self, url="", pool=None, _uuid=None, _repos_root=None):
         bzr_url = url
         self.svn_url = bzr_to_svn_url(url)
-        # _backing_url is an evil hack so the root directory of a repository 
-        # can be accessed on some HTTP repositories. 
-        if _backing_url is None:
-            _backing_url = self.svn_url
-        self._backing_url = _backing_url.rstrip("/")
         Transport.__init__(self, bzr_url)
 
         if pool is None:
             self.connections = ConnectionPool()
 
             # Make sure that the URL is valid by connecting to it.
-            self.connections.add(self.connections.get(self._backing_url))
+            self.connections.add(self.connections.get(self.svn_url))
         else:
             self.connections = pool
 
@@ -199,7 +194,7 @@
         lazy_check_versions()
 
     def get_connection(self):
-        return self.connections.get(self._backing_url)
+        return self.connections.get(self.svn_url)
 
     def add_connection(self, conn):
         self.connections.add(conn)
@@ -305,12 +300,7 @@
                     self.pending.append(Exception("Some exception was not handled"))
                     self.semaphore.release()
 
-        if paths is None:
-            newpaths = None
-        else:
-            newpaths = [self._request_path(path) for path in paths]
-        
-        fetcher = logfetcher(self, paths=newpaths, start=from_revnum, end=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, include_merged_revisions=include_merged_revisions, revprops=revprops)
+        fetcher = logfetcher(self, paths=paths, start=from_revnum, end=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, include_merged_revisions=include_merged_revisions, revprops=revprops)
         fetcher.start()
         return iter(fetcher.next, None)
 
@@ -328,14 +318,9 @@
 
         self.mutter('svn log -r%d:%d %r' % (from_revnum, to_revnum, paths))
 
-        if paths is None:
-            newpaths = None
-        else:
-            newpaths = [self._request_path(path) for path in paths]
-
         conn = self.get_connection()
         try:
-            return conn.get_log(rcvr, newpaths, 
+            return conn.get_log(rcvr, paths, 
                     from_revnum, to_revnum,
                     limit, discover_changed_paths, strict_node_history, 
                     include_merged_revisions,
@@ -343,11 +328,6 @@
         finally:
             self.add_connection(conn)
 
-    def _open_real_transport(self):
-        if self._backing_url != self.svn_url:
-            return self.connections.get(self.svn_url)
-        return self.get_connection()
-
     def change_rev_prop(self, revnum, name, value):
         conn = self.get_connection()
         self.mutter('svn change-revprop -r%d %s=%s' % (revnum, name, value))
@@ -357,7 +337,6 @@
             self.add_connection(conn)
 
     def get_dir(self, path, revnum, kind=False):
-        path = self._request_path(path)
         conn = self.get_connection()
         self.mutter('svn get-dir -r%d %s' % (revnum, path))
         try:
@@ -366,7 +345,6 @@
             self.add_connection(conn)
 
     def get_file(self, path, stream, revnum):
-        path = self._request_path(path)
         conn = self.get_connection()
         self.mutter('svn get-file -r%d %s' % (revnum, path))
         try:
@@ -378,16 +356,6 @@
         if 'transport' in debug.debug_flags:
             mutter(text, *args)
 
-    def _request_path(self, relpath):
-        if self._backing_url == self.svn_url:
-            return relpath.strip("/")
-        newsvnurl = urlutils.join(self.svn_url, relpath)
-        if newsvnurl == self._backing_url:
-            return ""
-        newrelpath = urlutils.relative_url(self._backing_url+"/", newsvnurl+"/").strip("/")
-        self.mutter('request path %r -> %r', relpath, newrelpath)
-        return newrelpath
-
     def list_dir(self, relpath):
         assert len(relpath) == 0 or relpath[0] != "/"
         if relpath == ".":
@@ -401,7 +369,6 @@
         return dirents.keys()
 
     def check_path(self, path, revnum):
-        path = self._request_path(path)
         conn = self.get_connection()
         self.mutter('svn check-path -r%d %s' % (revnum, path))
         try: