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

------------------------------------------------------------
revno: 1914
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Sun 2008-09-21 15:31:05 +0200
message:
  Merge 0.4
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.1.46
    revision-id: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: Jelmer Vernooij <[EMAIL PROTECTED]>
    branch nick: 0.4
    timestamp: Sun 2008-09-21 15:05:29 +0200
    message:
      Use define names consistent with header file.
    modified:
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
    ------------------------------------------------------------
    revno: 1669.1.45
    revision-id: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: Jelmer Vernooij <[EMAIL PROTECTED]>
    branch nick: 0.4
    timestamp: Sun 2008-09-21 15:05:08 +0200
    message:
      Merge support for using keychain on Mac OS X.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
        ------------------------------------------------------------
        revno: 1669.4.1
        revision-id: [EMAIL PROTECTED]
        parent: [EMAIL PROTECTED]
        committer: Jean-Francois Roy <[EMAIL PROTECTED]>
        branch nick: 0.4
        timestamp: Fri 2008-09-19 17:57:42 -0700
        message:
          - Patched ra.c to add a keychain simple provider on Mac OS X.
        modified:
          ra.c                           
ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
    ------------------------------------------------------------
    revno: 1669.1.44
    revision-id: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: Jelmer Vernooij <[EMAIL PROTECTED]>
    branch nick: 0.4
    timestamp: Fri 2008-09-19 02:25:19 +0200
    message:
      Merge svn 1.5 on Windows patch from Mark.
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
        ------------------------------------------------------------
        revno: 1669.3.1
        revision-id: [EMAIL PROTECTED]
        parent: [EMAIL PROTECTED]
        committer: Mark Hammond <[EMAIL PROTECTED]>
        branch nick: bzr-svn-0.4
        timestamp: Tue 2008-09-16 15:48:54 +1000
        message:
          include libsasl.dll in windows binary builds for svn 1.5.x
        modified:
          setup.py                       
setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.1.43
    revision-id: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: Jelmer Vernooij <[EMAIL PROTECTED]>
    branch nick: 0.4
    timestamp: Fri 2008-09-19 02:24:49 +0200
    message:
      Fix version data.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file 'NEWS'
--- a/NEWS      2008-09-15 04:26:21 +0000
+++ b/NEWS      2008-09-21 13:31:05 +0000
@@ -72,6 +72,10 @@
 
    * Properly convert errors raised when starting a commit. (#267899)
 
+  FEATURES
+
+   * Add support for using Apple keychain.
+
 bzr-svn 0.4.12 2008-09-01
 
   BUG FIXES

=== modified file 'ra.c'
--- a/ra.c      2008-09-09 01:03:45 +0000
+++ b/ra.c      2008-09-21 13:31:05 +0000
@@ -2785,6 +2785,18 @@
 #endif
 #endif
 
+#if defined(DARWIN)
+static PyObject *get_keychain_simple_provider(PyObject* self)
+{
+       AuthProviderObject *auth = PyObject_New(AuthProviderObject, 
&AuthProvider_Type);
+       auth->pool = Pool(NULL);
+       if (auth->pool == NULL)
+               return NULL;
+       svn_auth_get_keychain_simple_provider(&auth->provider, auth->pool);
+       return (PyObject *)auth;
+}
+#endif
+
 static PyMethodDef ra_module_methods[] = {
        { "version", (PyCFunction)version, METH_NOARGS, NULL },
        { "get_ssl_client_cert_pw_file_provider", 
(PyCFunction)get_ssl_client_cert_pw_file_provider, METH_NOARGS, NULL },
@@ -2797,6 +2809,9 @@
        { "get_windows_ssl_server_trust_provider", 
(PyCFunction)get_windows_ssl_server_trust_provider, METH_NOARGS, NULL },
 #endif
 #endif
+#if defined(DARWIN)
+       { "get_keychain_simple_provider", 
(PyCFunction)get_keychain_simple_provider, METH_NOARGS, NULL },
+#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 'setup.py'
--- a/setup.py  2008-09-06 19:33:59 +0000
+++ b/setup.py  2008-09-21 13:31:05 +0000
@@ -231,7 +231,7 @@
             # Since 1.5.0 these libraries became shared
             apr_bins += """libsvn_client-1.dll libsvn_delta-1.dll 
libsvn_diff-1.dll
                            libsvn_fs-1.dll libsvn_ra-1.dll libsvn_repos-1.dll
-                           libsvn_subr-1.dll libsvn_wc-1.dll""".split()
+                           libsvn_subr-1.dll libsvn_wc-1.dll 
libsasl.dll""".split()
         apr_bins += """intl3_svn.dll libdb44.dll libeay32.dll 
ssleay32.dll""".split()
         look_dirs = os.environ.get("PATH","").split(os.pathsep)
         look_dirs.insert(0, os.path.join(os.environ["SVN_DEV"], "bin"))


-- 
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits

Reply via email to