Rev 1808: Merge 0.4 in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1808
revision-id: jelmer at samba.org-20080904175525-z87agtlx6ad7atgj
parent: jelmer at samba.org-20080904173309-rjw4hwrcnxcdpvas
parent: jelmer at samba.org-20080904173039-v3y93qr83eczj55e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-09-04 19:55:25 +0200
message:
  Merge 0.4
modified:
  INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
  Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1669.1.34
    revision-id: jelmer at samba.org-20080904173039-v3y93qr83eczj55e
    parent: jelmer at samba.org-20080904172409-timg2bab7aof4w5u
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-09-04 19:30:39 +0200
    message:
      Add rule for making homepage.
    modified:
      Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
    ------------------------------------------------------------
    revno: 1669.1.33
    revision-id: jelmer at samba.org-20080904172409-timg2bab7aof4w5u
    parent: jelmer at samba.org-20080904170226-c6ygcz8mbk2rqpnw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-09-04 19:24:09 +0200
    message:
      Update Mac OS X wiki page.
    modified:
      INSTALL                        install-20080708203223-nbfwz4aneslpdz5g-1
    ------------------------------------------------------------
    revno: 1669.1.32
    revision-id: jelmer at samba.org-20080904170226-c6ygcz8mbk2rqpnw
    parent: jelmer at samba.org-20080902195347-vk4v1f05ktfc9spt
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-09-04 19:02:26 +0200
    message:
      Fix compatibility with svn 1.4 on Windows.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
    ------------------------------------------------------------
    revno: 1669.1.31
    revision-id: jelmer at samba.org-20080902195347-vk4v1f05ktfc9spt
    parent: jelmer at samba.org-20080902002539-zdjx73dzcob87a5h
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-09-02 21:53:47 +0200
    message:
      Raise explicit error if redirect error message can't be parsed.
    modified:
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'INSTALL'
--- a/INSTALL	2008-08-31 23:40:20 +0000
+++ b/INSTALL	2008-09-04 17:55:25 +0000
@@ -77,5 +77,9 @@
 
 bzr-svn DMGs can be found on the bzr-svn download page on Launchpad.
 
+bzr-svn is now also available in MacPorts, and can be installed with::
+
+  $ sudo port install bzr-svn
+
 ..
 	vim: ft=rest

=== modified file 'Makefile'
--- a/Makefile	2008-08-25 01:58:11 +0000
+++ b/Makefile	2008-09-04 17:55:25 +0000
@@ -100,3 +100,6 @@
 	$(CTAGS) -R .
 
 ctags:: tags
+
+homepage.html: wiki.py README INSTALL
+	python wiki.py | tail -n +2 | rst2html > $@

=== modified file 'NEWS'
--- a/NEWS	2008-09-04 14:57:34 +0000
+++ b/NEWS	2008-09-04 17:55:25 +0000
@@ -41,6 +41,10 @@
 
 bzr-svn 0.4.13	UNRELEASED
 
+  BUG FIXES
+
+   * Fix compatibility with Subversion 1.4 on Windows.
+
 bzr-svn 0.4.12	2008-09-01
 
   BUG FIXES

=== modified file 'ra.c'
--- a/ra.c	2008-08-31 13:44:01 +0000
+++ b/ra.c	2008-09-04 17:55:25 +0000
@@ -2764,6 +2764,7 @@
 	return (PyObject *)auth;
 }
 
+#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5
 static PyObject *get_windows_ssl_server_trust_provider(PyObject *self)
 {
 	AuthProviderObject *auth = PyObject_New(AuthProviderObject, &AuthProvider_Type);
@@ -2774,6 +2775,7 @@
 	return (PyObject *)auth;
 }
 #endif
+#endif
 
 static PyMethodDef ra_module_methods[] = {
 	{ "version", (PyCFunction)version, METH_NOARGS, NULL },
@@ -2783,8 +2785,10 @@
 	{ "get_simple_provider", (PyCFunction)get_simple_provider, METH_NOARGS, NULL },
 #if defined(WIN32)
 	{ "get_windows_simple_provider", (PyCFunction)get_windows_simple_provider, METH_NOARGS, NULL },
+#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5
 	{ "get_windows_ssl_server_trust_provider", (PyCFunction)get_windows_ssl_server_trust_provider, METH_NOARGS, NULL },
 #endif
+#endif
 	{ "get_username_prompt_provider", (PyCFunction)get_username_prompt_provider, METH_VARARGS, NULL },
 	{ "get_simple_prompt_provider", (PyCFunction)get_simple_prompt_provider, METH_VARARGS, NULL },
 	{ "get_ssl_server_trust_prompt_provider", (PyCFunction)get_ssl_server_trust_prompt_provider, METH_VARARGS, NULL },

=== modified file 'transport.py'
--- a/transport.py	2008-09-01 23:30:56 +0000
+++ b/transport.py	2008-09-04 17:55:25 +0000
@@ -125,7 +125,7 @@
             elif "«" in msg:
                 new_url = msg[msg.index("»")+2:msg.index("«")]
             else:
-                new_url = None
+                raise AssertionError("Unable to parse error message: %s" % msg)
             raise RedirectRequested(source=url, target=new_url, 
                                     is_permanent=True)
         raise