1 files changed, 32 insertions, 2 deletions

diff --git a/subversion/bindings/swig/proxy/svn_fs_h.swg b/subversion/bindings/swig/proxy/svn_fs_h.swg
index 0775f98..effabf8 100644
--- a/subversion/bindings/swig/proxy/svn_fs_h.swg
+++ b/subversion/bindings/swig/proxy/svn_fs_h.swg
@@ -10,23 +10,30 @@
 %nodefault svn_fs_txn_t;
 %nodefault svn_fs_root_t;
 %nodefault svn_fs_history_t;
+%nodefault svn_fs_lock_target_t;
 #endif
 
 /* Callback typemaps */
 #ifdef SWIGPYTHON
 %apply CALLABLE_CALLBACK {
   svn_fs_warning_callback_t,
+  svn_fs_upgrade_notify_t,
   svn_fs_progress_notify_func_t,
+  svn_fs_hotcopy_notify_t,
   svn_fs_freeze_func_t,
   svn_fs_process_contents_func_t,
+  svn_fs_lock_callback_t,
   svn_fs_get_locks_callback_t,
   svn_fs_pack_notify_t
 };
 %apply CALLABLE_CALLBACK * {
   svn_fs_warning_callback_t *,
+  svn_fs_upgrade_notify_t *,
   svn_fs_progress_notify_func_t *,
+  svn_fs_hotcopy_notify_t *,
   svn_fs_freeze_func_t *,
   svn_fs_process_contents_func_t *,
+  svn_fs_lock_callback_t *,
   svn_fs_get_locks_callback_t *,
   svn_fs_pack_notify_t *
 };
@@ -37,10 +44,11 @@
 %apply void *PY_AS_VOID {
   void *baton,
   void *warning_baton,
+  void *notify_baton,
   void *cancel_baton,
   void *freeze_baton,
-  void *get_locks_baton,
-  void *notify_baton
+  void *lock_baton,
+  void *get_locks_baton
 };
 #endif
 
@@ -61,6 +69,10 @@
 %proxy(svn_fs_path_change_t);
 %opaque_proxy(svn_fs_history_t);
 %proxy(svn_fs_dirent_t);
+%opaque_proxy(svn_fs_lock_target_t);
+%proxy(svn_fs_fsfs_info_t);
+%proxy(svn_fs_fsx_info_t);
+%proxy(svn_fs_info_placeholder_t);
 #endif
 
 /* Callbacks */
@@ -71,11 +83,21 @@ static void svn_fs_invoke_warning_callback(
   _obj(baton, err);
 }
 
+static svn_error_t * svn_fs_invoke_upgrade_notify(
+  svn_fs_upgrade_notify_t _obj, void *baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, apr_pool_t *scratch_pool) {
+  return _obj(baton, number, action, scratch_pool);
+}
+
 static void svn_fs_invoke_progress_notify_func(
   svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void *baton, apr_pool_t *pool) {
   _obj(revision, baton, pool);
 }
 
+static void svn_fs_invoke_hotcopy_notify(
+  svn_fs_hotcopy_notify_t _obj, void *baton, svn_revnum_t start_revision, svn_revnum_t end_revision, apr_pool_t *scratch_pool) {
+  _obj(baton, start_revision, end_revision, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_freeze_func(
   svn_fs_freeze_func_t _obj, void *baton, apr_pool_t *pool) {
   return _obj(baton, pool);
@@ -86,6 +108,11 @@ static svn_error_t * svn_fs_invoke_process_contents_func(
   return _obj(contents, len, baton, scratch_pool);
 }
 
+static svn_error_t * svn_fs_invoke_lock_callback(
+  svn_fs_lock_callback_t _obj, void *baton, const char *path, const svn_lock_t *lock, svn_error_t *fs_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, path, lock, fs_err, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_get_locks_callback(
   svn_fs_get_locks_callback_t _obj, void *baton, svn_lock_t *lock, apr_pool_t *pool) {
   return _obj(baton, lock, pool);
@@ -100,9 +127,12 @@ static svn_error_t * svn_fs_invoke_pack_notify(
 
 #ifdef SWIGPYTHON
 %funcptr_proxy(svn_fs_warning_callback_t, svn_fs_invoke_warning_callback);
+%funcptr_proxy(svn_fs_upgrade_notify_t, svn_fs_invoke_upgrade_notify);
 %funcptr_proxy(svn_fs_progress_notify_func_t, svn_fs_invoke_progress_notify_func);
+%funcptr_proxy(svn_fs_hotcopy_notify_t, svn_fs_invoke_hotcopy_notify);
 %funcptr_proxy(svn_fs_freeze_func_t, svn_fs_invoke_freeze_func);
 %funcptr_proxy(svn_fs_process_contents_func_t, svn_fs_invoke_process_contents_func);
+%funcptr_proxy(svn_fs_lock_callback_t, svn_fs_invoke_lock_callback);
 %funcptr_proxy(svn_fs_get_locks_callback_t, svn_fs_invoke_get_locks_callback);
 %funcptr_proxy(svn_fs_pack_notify_t, svn_fs_invoke_pack_notify);