Rev 1440: Deprecate the svn+ syntax. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1440
revision-id: jelmer at samba.org-20080706134340-gnz8c40ryx5n4oai
parent: jelmer at samba.org-20080706134004-e3i2h5m7riu3v4vp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-07-06 15:43:40 +0200
message:
  Deprecate the svn+ syntax.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'NEWS'
--- a/NEWS	2008-07-04 12:12:57 +0000
+++ b/NEWS	2008-07-06 13:43:40 +0000
@@ -18,11 +18,9 @@
 
      * Username and password prompting will now always work.
 
-   * Now uses absolute imports and no longer adds plugin directory to the system path.
-
-   * Basic support for stacked branches.
-
-   * Avoid reopening connections to branch and repository when finding branches. (#243749)
+   * The "svn+https://..." syntax has been deprecated. It still works in the 
+     current release but will be removed in the future. If you are unable to 
+	 get a repository to work without the svn+ prefix, please file a bug.
 
   FEATURES
   
@@ -32,8 +30,14 @@
 
    * Set mergeinfo properties when pushing merges. (write part of #131323)
 
+   * Basic support for stacked branches.
+
+   * Avoid reopening connections to branch and repository when finding branches. (#243749)
+
   BUG FIXES
 
+   * Now uses absolute imports and no longer adds plugin directory to the system path.
+
    * More efficient use of mutter.
 
    * Remember parent branch correctly during sprout. (#237174)

=== modified file 'transport.py'
--- a/transport.py	2008-07-02 00:21:50 +0000
+++ b/transport.py	2008-07-06 13:43:40 +0000
@@ -19,7 +19,7 @@
 from bzrlib import debug, urlutils
 from bzrlib.errors import (NoSuchFile, TransportNotPossible, 
                            FileExists, NotLocalUrl, InvalidURL)
-from bzrlib.trace import mutter
+from bzrlib.trace import mutter, warning
 from bzrlib.transport import Transport
 
 import bzrlib.plugins.svn
@@ -68,6 +68,15 @@
     return urlparse.urlunsplit((scheme, netloc, path, query, fragment))
 
 
+svnplus_warning_showed = False
+
+def warn_svnplus(url):
+    global svnplus_warning_showed
+    if not svnplus_warning_showed:
+        warning("The svn+ syntax is deprecated, use %s instead.", url)
+        svnplus_warning_showed = True
+
+
 def bzr_to_svn_url(url):
     """Convert a Bazaar URL to a URL understood by Subversion.
 
@@ -77,6 +86,7 @@
         url.startswith("svn+file://") or
         url.startswith("svn+https://")):
         url = url[len("svn+"):] # Skip svn+
+        warn_svnplus(url)
 
     if url.startswith("http"):
         # Without this, URLs with + in them break