Rev 388: Warn about incompatible svn versions in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 388
revision-id: jelmer at samba.org-20070108173906-mgxopkju9itltfsb
parent: jelmer at samba.org-20070108163623-wutkgf1ul9ef0kg1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 18:39:06 +0100
message:
  Warn about incompatible svn versions
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'NEWS'
--- a/NEWS	2007-01-07 00:48:00 +0000
+++ b/NEWS	2007-01-08 17:39:06 +0000
@@ -57,6 +57,8 @@
    * Upgrade command can be used to upgrade branches created with 
      older versions of the plugin.
 
+   * Fail early when unpatched python Subversion bindings are installed.
+
   PERFORMANCE IMPROVEMENTS
 
    * More efficient implementation of follow_history().

=== modified file 'TODO'
--- a/TODO	2007-01-08 02:48:56 +0000
+++ b/TODO	2007-01-08 17:39:06 +0000
@@ -3,6 +3,9 @@
 - fix autorealm repository
 - handle parent directories of branches being moved correctly
 - faster "bzr status" in lightweight checkouts
+- when committing specific files in a lightweight checkout, make sure to 
+  commit the right file id changes for "."
+- custom implementation of WorkingTree.revert()
 - don't update to the same revnum when opening working tree
 - avoid extra connect in logwalker?
 - get rid of use of `svn ls' in logwalker

=== modified file '__init__.py'
--- a/__init__.py	2007-01-06 22:56:30 +0000
+++ b/__init__.py	2007-01-08 17:39:06 +0000
@@ -22,7 +22,7 @@
 import unittest
 import bzrlib
 
-__version__ = '0.2.0'
+__version__ = '0.3.0'
 required_bzr_version = (0,14)
 
 def check_bzrlib_version(desired):
@@ -54,7 +54,19 @@
         if bzrlib_version != desired_plus:
             raise Exception, 'Version mismatch'
 
+def check_subversion_version():
+    """Check that Subversion is compatible.
+
+    """
+    from bzrlib.trace import warning
+    try:
+        from svn.delta import svn_delta_invoke_txdelta_window_handler
+    except:
+        warning('Installed Subversion version does not have updated Python bindings. See the bzr-svn README for details.')
+        raise BzrError("incompatible python subversion bindings")
+
 check_bzrlib_version(required_bzr_version)
+check_subversion_version()
 
 import branch
 import convert

=== modified file 'checkout.py'
--- a/checkout.py	2007-01-08 16:36:23 +0000
+++ b/checkout.py	2007-01-08 17:39:06 +0000
@@ -403,6 +403,7 @@
 
         self.client_ctx.log_msg_baton2 = log_message_func
         commit_info = svn.client.commit3(specific_files, True, False, self.client_ctx)
+        self.client_ctx.log_msg_baton2 = None
 
         revid = self.branch.repository.generate_revision_id(
                 commit_info.revision, self.branch.branch_path)