Merge lp:~jelmer/brz/probe-svn into lp:brz

[Jelmer Vernooij]

Add basic svn plugin that warns the user when they attempt to access a svn working tree.

Add basic svn plugin that warns the user when they attempt to access a svn working tree.

[Jelmer Vernooij (jelmer)]

review: Approve

[Peter J. Mello (roguescholar)]

LGTM. Came looking to see if this was in the works after, that's right, issuing `brz-svn checkout yadayadaURL` and getting decidedly no satisfaction as a result. Happy New Year to you as well.

review: Approve (bystander)

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/585/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/588/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/608/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/609/

=== added directory 'breezy/plugins/svn'
=== added file 'breezy/plugins/svn/__init__.py'
--- breezy/plugins/svn/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/svn/__init__.py	2020-01-13 00:27:28 +0000
@@ -0,0 +1,197 @@
+# Copyright (C) 2019 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License or
+# (at your option) a later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""Subversion foreign branch support.
+
+Currently only tells the user that Subversion is not supported.
+"""
+
+from __future__ import absolute_import
+
+from ... import version_info  # noqa: F401
+
+from ... import (
+    controldir,
+    errors,
+    transport as _mod_transport,
+    )
+
+
+class SubversionUnsupportedError(errors.UnsupportedFormatError):
+
+    _fmt = ('Subversion branches are not yet supported. '
+            'To convert Subversion branches to Bazaar branches or vice versa, '
+            'use the fastimport format.')
+
+
+class SvnWorkingTreeDirFormat(controldir.ControlDirFormat):
+    """Subversion directory format."""
+
+    def get_converter(self):
+        raise NotImplementedError(self.get_converter)
+
+    def get_format_description(self):
+        return "Subversion working directory"
+
+    def initialize_on_transport(self, transport):
+        raise errors.UninitializableFormat(self)
+
+    def is_supported(self):
+        return False
+
+    def supports_transport(self, transport):
+        return False
+
+    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
+                             basedir=None):
+        raise SubversionUnsupportedError()
+
+    def open(self, transport):
+        # Raise NotBranchError if there is nothing there
+        SvnWorkingTreeProber().probe_transport(transport)
+        raise NotImplementedError(self.open)
+
+
+class SvnWorkingTreeProber(controldir.Prober):
+
+    @classmethod
+    def priority(klass, transport):
+        return 100
+
+    def probe_transport(self, transport):
+        try:
+            transport.local_abspath('.')
+        except errors.NotLocalUrl:
+            raise errors.NotBranchError(path=transport.base)
+        else:
+            if transport.has(".svn"):
+                return SvnWorkingTreeDirFormat()
+            raise errors.NotBranchError(path=transport.base)
+
+    @classmethod
+    def known_formats(cls):
+        return [SvnWorkingTreeDirFormat()]
+
+
+class SvnRepositoryFormat(controldir.ControlDirFormat):
+    """Subversion directory format."""
+
+    def get_converter(self):
+        raise NotImplementedError(self.get_converter)
+
+    def get_format_description(self):
+        return "Subversion repository"
+
+    def initialize_on_transport(self, transport):
+        raise errors.UninitializableFormat(self)
+
+    def is_supported(self):
+        return False
+
+    def supports_transport(self, transport):
+        return False
+
+    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
+                             basedir=None):
+        raise SubversionUnsupportedError()
+
+    def open(self, transport):
+        # Raise NotBranchError if there is nothing there
+        SvnRepositoryProber().probe_transport(transport)
+        raise NotImplementedError(self.open)
+
+
+class SvnRepositoryProber(controldir.Prober):
+
+    _supported_schemes = ["http", "https", "file", "svn"]
+
+    @classmethod
+    def priority(klass, transport):
+        if 'svn' in transport.base:
+            return 90
+        return 100
+
+    def probe_transport(self, transport):
+        try:
+            url = transport.external_url()
+        except errors.InProcessTransport:
+            raise errors.NotBranchError(path=transport.base)
+
+        scheme = url.split(":")[0]
+        if scheme.startswith("svn+") or scheme == "svn":
+            raise SubversionUnsupportedError()
+
+        if scheme not in self._supported_schemes:
+            raise errors.NotBranchError(path=transport.base)
+
+        if scheme == 'file':
+            # Cheaper way to figure out if there is a svn repo
+            maybe = False
+            subtransport = transport
+            while subtransport:
+                try:
+                    if all([subtransport.has(name)
+                            for name in ["format", "db", "conf"]]):
+                        maybe = True
+                        break
+                except UnicodeEncodeError:
+                    pass
+                prevsubtransport = subtransport
+                subtransport = prevsubtransport.clone("..")
+                if subtransport.base == prevsubtransport.base:
+                    break
+            if not maybe:
+                raise errors.NotBranchError(path=transport.base)
+
+        # If this is a HTTP transport, use the existing connection to check
+        # that the remote end supports version control.
+        if scheme in ("http", "https"):
+            priv_transport = getattr(transport, "_decorated", transport)
+            try:
+                headers = priv_transport._options('.')
+            except (errors.InProcessTransport, errors.NoSuchFile,
+                    errors.InvalidHttpResponse):
+                raise errors.NotBranchError(path=transport.base)
+            else:
+                dav_entries = set()
+                for key, value in headers:
+                    if key.upper() == 'DAV':
+                        dav_entries.update(
+                            [x.strip() for x in value.split(',')])
+                if "version-control" not in dav_entries:
+                    raise errors.NotBranchError(path=transport.base)
+
+        return SvnRepositoryFormat()
+
+    @classmethod
+    def known_formats(cls):
+        return [SvnRepositoryFormat()]
+
+
+controldir.ControlDirFormat.register_prober(SvnWorkingTreeProber)
+controldir.ControlDirFormat.register_prober(SvnRepositoryProber)
+
+
+_mod_transport.register_transport_proto(
+    'svn+ssh://',
+    help="Access using the Subversion smart server tunneled over SSH.")
+_mod_transport.register_transport_proto(
+    'svn+http://')
+_mod_transport.register_transport_proto(
+    'svn+https://')
+_mod_transport.register_transport_proto(
+    'svn://',
+    help="Access using the Subversion smart server.")

=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2020-01-11 14:41:16 +0000
+++ breezy/transport/http/__init__.py	2020-01-13 00:27:28 +0000
@@ -2579,6 +2579,17 @@
                                         target_path)
             return transport.get_transport_from_url(new_url)
 
+    def _options(self, relpath):
+        abspath = self._remote_path(relpath)
+        resp = self.request('OPTIONS', abspath)
+        if resp.status == 404:
+            raise errors.NoSuchFile(abspath)
+        if resp.status in (403, 405):
+            raise errors.InvalidHttpResponse(
+                abspath,
+                "OPTIONS not supported or forbidden for remote URL")
+        return resp.getheaders()
+
 
 # TODO: May be better located in smart/medium.py with the other
 # SmartMedium classes

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-01-12 13:56:10 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-01-13 00:27:28 +0000
@@ -46,6 +46,9 @@
    have installed and speeds up import time since psutil brings in
    various other modules. (Jelmer Vernooij)
 
+ * Warn the user when they attempt to use Breezy in a Subversion
+   working copy. (Jelmer Vernooij)
+
  * Add a basic Mercurial plugin that mentions that .hg repositories
    are unsupported when the user attempts to access one.
    (Jelmer Vernooij)