Rev 1096: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1096
revision-id: jelmer at samba.org-20080615013159-d71s4ev62yxkl3av
parent: jelmer at samba.org-20080615011347-k1czevnk4ha5bvys
parent: jelmer at samba.org-20080615012938-r19j03lxuer6yvzr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Sun 2008-06-15 03:31:59 +0200
message:
  Merge 0.4.
modified:
  auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
  ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 950.3.165
    revision-id: jelmer at samba.org-20080615012938-r19j03lxuer6yvzr
    parent: jelmer at samba.org-20080615012152-9mw5elwogazk0y49
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-06-15 03:29:38 +0200
    message:
      Abstract away auth code.
    modified:
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
    ------------------------------------------------------------
    revno: 950.3.164
    revision-id: jelmer at samba.org-20080615012152-9mw5elwogazk0y49
    parent: jelmer at samba.org-20080615011807-cm2uiflaxkvdtads
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-06-15 03:21:52 +0200
    message:
      Import constant for dirent.
    modified:
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 950.3.163
    revision-id: jelmer at samba.org-20080615011807-cm2uiflaxkvdtads
    parent: jelmer at samba.org-20080615010806-ez5xru2zepz7rtv9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-06-15 03:18:07 +0200
    message:
      Fix auth.
    modified:
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
=== modified file 'auth.py'
--- a/auth.py	2008-06-15 01:13:47 +0000
+++ b/auth.py	2008-06-15 01:31:59 +0000
@@ -20,7 +20,7 @@
 from bzrlib.plugins.svn.ra import (get_username_prompt_provider, 
                                    get_simple_prompt_provider,
                                    get_ssl_server_trust_prompt_provider,
-                                   get_ssl_client_cert_pw_prompt_provider)
+                                   get_ssl_client_cert_pw_prompt_provider,
                                    get_simple_provider, get_username_provider, 
                                    get_ssl_client_cert_file_provider, 
                                    get_ssl_client_cert_pw_file_provider,
@@ -34,6 +34,12 @@
 AUTH_PARAM_DEFAULT_USERNAME = 'svn:auth:username'
 AUTH_PARAM_DEFAULT_PASSWORD = 'svn:auth:password'
 
+SSL_NOTYETVALID = 0x00000001
+SSL_EXPIRED     = 0x00000002
+SSL_CNMISMATCH  = 0x00000004
+SSL_UNKNOWNCA   = 0x00000008
+SSL_OTHER       = 0x40000000
+
 class SubversionAuthenticationConfig(AuthenticationConfig):
     """Simple extended version of AuthenticationConfig that can provide 
     the information Subversion requires.
@@ -84,11 +90,11 @@
             credentials.has_key("verify_certificates") and 
             credentials["verify_certificates"] == False):
             accepted_failures = (
-                    AUTH_SSL_NOTYETVALID + 
-                    AUTH_SSL_EXPIRED +
-                    AUTH_SSL_CNMISMATCH +
-                    AUTH_SSL_UNKNOWNCA +
-                    AUTH_SSL_OTHER)
+                    SSL_NOTYETVALID + 
+                    SSL_EXPIRED +
+                    SSL_CNMISMATCH +
+                    SSL_UNKNOWNCA +
+                    SSL_OTHER)
         else:
             accepted_failures = 0
         return (accepted_failures, False)

=== modified file 'ra.py'
--- a/ra.py	2008-06-15 01:01:27 +0000
+++ b/ra.py	2008-06-15 01:29:38 +0000
@@ -19,3 +19,19 @@
 get_simple_prompt_provider = svn.core.svn_auth_get_simple_prompt_provider
 get_ssl_client_cert_pw_prompt_provider = svn.core.svn_auth_get_ssl_client_cert_pw_prompt_provider
 get_ssl_server_trust_prompt_provider = svn.core.svn_auth_get_ssl_server_trust_prompt_provider
+
+DIRENT_KIND = 0x0001
+
+class Auth:
+    def __init__(self, providers=[]):
+        self.providers = providers
+        self.auth_baton = svn.core.svn_auth_open(self.providers)
+        self.parameters = {}
+        self.auth_baton._base = self.auth_baton # evil hack
+
+    def set_parameter(self, name, value):
+        self.parameters[name] = value
+        svn.core.svn_auth_set_parameter(self.auth_baton, name, value)
+
+    def get_parameter(self, name):
+        return svn.core.svn_auth_get_parameter(self.auth_baton, name)

=== modified file 'transport.py'
--- a/transport.py	2008-06-15 00:41:08 +0000
+++ b/transport.py	2008-06-15 01:31:59 +0000
@@ -26,6 +26,7 @@
 
 from bzrlib.plugins.svn import core, properties, ra
 from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY
+from bzrlib.plugins.svn.ra import DIRENT_KIND
 import urlparse
 import urllib