Rev 6513: Remove version compatibility code, cleanup some bits in file:///home/vila/src/bzr/experimental/webdav/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/webdav/

------------------------------------------------------------
revno: 6513
revision-id: v.ladeuil+lp at free.fr-20120326154839-qayoxyq15vyhnge0
parent: v.ladeuil+lp at free.fr-20120326154018-dk5h88h4g3gfucfd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: webdav
timestamp: Mon 2012-03-26 17:48:39 +0200
message:
  Remove version compatibility code, cleanup some bits
-------------- next part --------------
=== modified file 'bzrlib/plugins/webdav/NOTES'
--- a/bzrlib/plugins/webdav/NOTES	2012-03-26 15:31:31 +0000
+++ b/bzrlib/plugins/webdav/NOTES	2012-03-26 15:48:39 +0000
@@ -1,19 +1,3 @@
-Performances:
-
-- Without any optimizations:
-
-time bzr push http+webdav://<user>:<pass>@<host>/pub/bzr.dev
-
-1948 revision(s) pushed.
-
-real	9m54.487s
-user	1m15.280s
-sys	0m20.060s
-
-The above measure is imprecise and certainly out-of-date.
-
-Tests:
-
 Installation example:
 
 <IfModule mod_dav.c>

=== modified file 'bzrlib/plugins/webdav/__init__.py'
--- a/bzrlib/plugins/webdav/__init__.py	2012-03-26 15:31:31 +0000
+++ b/bzrlib/plugins/webdav/__init__.py	2012-03-26 15:48:39 +0000
@@ -14,41 +14,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-"""An http transport, using webdav to allow pushing.
+from __future__ import absolute_import
+
+__doc__ = """An http transport, using webdav to allow pushing.
 
 This defines the HttpWebDAV transport, which implement the necessary
 handling of WebDAV to allow pushing on an http server.
 """
 
 import bzrlib
-import bzrlib.api
-
-from info import (
-    bzr_plugin_version as version_info,
-    bzr_compatible_versions,
+# Since we are a built-in plugin we share the bzrlib version
+from bzrlib import (
+    transport,
+    version_info,
     )
 
-if version_info[3] == 'final':
-    version_string = '%d.%d.%d' % version_info[:3]
-else:
-    version_string = '%d.%d.%d%s%d' % version_info
-__version__ = version_string
-
-if bzrlib.version_info < (2, 5):
-    # We need bzr >= 2.5
-    from bzrlib import (
-        errors,
-        trace,
-        )
-    raise errors.BzrError("not installing http[s]+webdav://."
-                          " It requires bzr >= 2.5, you're using %s"
-                          % (bzrlib.version_info,))
-
-
-bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
-
-from bzrlib import transport
-
 transport.register_urlparse_netloc_protocol('http+webdav')
 transport.register_urlparse_netloc_protocol('https+webdav')
 
@@ -65,4 +45,3 @@
     basic_tests.addTest(loader.loadTestsFromModuleNames(
             ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
     return basic_tests
-

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-03-16 15:05:05 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-03-26 15:48:39 +0000
@@ -20,6 +20,8 @@
 
 .. New commands, options, etc that users may wish to try out.
 
+* The webdav plugin is now a core plugin. (Vincent Ladeuil)
+
 Improvements
 ************
 

=== modified file 'doc/en/whats-new/whats-new-in-2.6.txt'
--- a/doc/en/whats-new/whats-new-in-2.6.txt	2012-01-16 13:49:34 +0000
+++ b/doc/en/whats-new/whats-new-in-2.6.txt	2012-03-26 15:48:39 +0000
@@ -16,7 +16,12 @@
 2.1, 2.2, 2.3, 2.4 and 2.5, and can read and write repositories generated by
 all previous versions.
 
-<topics of interest here>
+webdav support
+**************
+
+The bzr-webdav plugin has been merged into core allowing branches to be
+pushed to WebDAV-enabled http servers.
+
 
 Further information
 *******************