diff options
Diffstat (limited to 'subversion/bindings/swig/python/svn_diff.c')
| -rw-r--r-- | subversion/bindings/swig/python/svn_diff.c | 1550 |
1 files changed, 1165 insertions, 385 deletions
diff --git a/subversion/bindings/swig/python/svn_diff.c b/subversion/bindings/swig/python/svn_diff.c index 044eef8..b22c66b 100644 --- a/subversion/bindings/swig/python/svn_diff.c +++ b/subversion/bindings/swig/python/svn_diff.c @@ -1,11 +1,11 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.9 - * - * This file is not intended to be easily readable and contains a number of + * Version 2.0.12 + * + * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. * ----------------------------------------------------------------------------- */ #define SWIGPYTHON @@ -43,28 +43,28 @@ #ifndef SWIGUNUSED # if defined(__GNUC__) # if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) -# define SWIGUNUSED __attribute__ ((__unused__)) +# define SWIGUNUSED __attribute__ ((__unused__)) # else # define SWIGUNUSED # endif # elif defined(__ICC) -# define SWIGUNUSED __attribute__ ((__unused__)) +# define SWIGUNUSED __attribute__ ((__unused__)) # else -# define SWIGUNUSED +# define SWIGUNUSED # endif #endif #ifndef SWIG_MSC_UNSUPPRESS_4505 # if defined(_MSC_VER) # pragma warning(disable : 4505) /* unreferenced local function has been removed */ -# endif +# endif #endif #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) # else -# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# define SWIGUNUSEDPARM(p) p SWIGUNUSED # endif #endif @@ -107,7 +107,7 @@ # define SWIGSTDCALL __stdcall # else # define SWIGSTDCALL -# endif +# endif #endif /* Deal with Microsoft's attempt at deprecating C standard runtime functions */ @@ -122,8 +122,14 @@ -/* Python.h has to appear first */ -#include <Python.h> +#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG) +/* Use debug wrappers with the Python release dll */ +# undef _DEBUG +# include <Python.h> +# define _DEBUG +#else +# include <Python.h> +#endif /* ----------------------------------------------------------------------------- * swigrun.swg @@ -149,7 +155,7 @@ You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for creating a static or dynamic library from the SWIG runtime code. In 99.9% of the cases, SWIG just needs to declare them as 'static'. - + But only do this if strictly necessary, ie, if you have problems with your compiler or suchlike. */ @@ -175,16 +181,16 @@ #define SWIG_POINTER_OWN 0x1 -/* +/* Flags/methods for returning states. - - The SWIG conversion methods, as ConvertPtr, return an integer + + The SWIG conversion methods, as ConvertPtr, return an integer that tells if the conversion was successful or not. And if not, an error code can be returned (see swigerrors.swg for the codes). - + Use the following macros/flags to set or process the returning states. - + In old versions of SWIG, code such as the following was usually written: if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { @@ -217,23 +223,23 @@ } else { // fail code } - + I.e., now SWIG_ConvertPtr can return new objects and you can identify the case and take care of the deallocation. Of course that also requires SWIG_ConvertPtr to return new result values, such as - int SWIG_ConvertPtr(obj, ptr,...) { - if (<obj is ok>) { - if (<need new object>) { - *ptr = <ptr to new allocated object>; - return SWIG_NEWOBJ; - } else { - *ptr = <ptr to old object>; - return SWIG_OLDOBJ; - } - } else { - return SWIG_BADOBJ; - } + int SWIG_ConvertPtr(obj, ptr,...) { + if (<obj is ok>) { + if (<need new object>) { + *ptr = <ptr to new allocated object>; + return SWIG_NEWOBJ; + } else { + *ptr = <ptr to old object>; + return SWIG_OLDOBJ; + } + } else { + return SWIG_BADOBJ; + } } Of course, returning the plain '0(success)/-1(fail)' still works, but you can be @@ -247,17 +253,17 @@ int fooi(int); and you call - + food(1) // cast rank '1' (1 -> 1.0) fooi(1) // cast rank '0' just use the SWIG_AddCast()/SWIG_CheckState() */ -#define SWIG_OK (0) +#define SWIG_OK (0) #define SWIG_ERROR (-1) #define SWIG_IsOK(r) (r >= 0) -#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) +#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) /* The CastRankLimit says how many bits are used for the cast rank */ #define SWIG_CASTRANKLIMIT (1 << 8) @@ -288,14 +294,14 @@ # endif # define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) # define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) -SWIGINTERNINLINE int SWIG_AddCast(int r) { +SWIGINTERNINLINE int SWIG_AddCast(int r) { return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; } -SWIGINTERNINLINE int SWIG_CheckState(int r) { - return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; +SWIGINTERNINLINE int SWIG_CheckState(int r) { + return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; } #else /* no cast-rank mode */ -# define SWIG_AddCast +# define SWIG_AddCast(r) (r) # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) #endif @@ -339,7 +345,7 @@ typedef struct swig_module_info { void *clientdata; /* Language specific module data */ } swig_module_info; -/* +/* Compare two type names skipping the space characters, therefore "char*" == "char *" and "Class<int>" == "Class<int >", etc. @@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1, /* Check type equivalence in a name list like <name1>|<name2>|... - Return 0 if not equal, 1 if equal + Return 0 if equal, -1 if nb < tb, 1 if nb > tb */ SWIGRUNTIME int -SWIG_TypeEquiv(const char *nb, const char *tb) { - int equiv = 0; +SWIG_TypeCmp(const char *nb, const char *tb) { + int equiv = 1; const char* te = tb + strlen(tb); const char* ne = nb; - while (!equiv && *ne) { + while (equiv != 0 && *ne) { for (nb = ne; *ne; ++ne) { if (*ne == '|') break; } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + equiv = SWIG_TypeNameComp(nb, ne, tb, te); if (*ne) ++ne; } return equiv; @@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) { /* Check type equivalence in a name list like <name1>|<name2>|... - Return 0 if equal, -1 if nb < tb, 1 if nb > tb + Return 0 if not equal, 1 if equal */ SWIGRUNTIME int -SWIG_TypeCompare(const char *nb, const char *tb) { - int equiv = 0; - const char* te = tb + strlen(tb); - const char* ne = nb; - while (!equiv && *ne) { - for (nb = ne; *ne; ++ne) { - if (*ne == '|') break; - } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; - if (*ne) ++ne; - } - return equiv; +SWIG_TypeEquiv(const char *nb, const char *tb) { + return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0; } - /* Check the typename */ @@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) { return 0; } -/* +/* Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison */ SWIGRUNTIME swig_cast_info * @@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) { return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory); } -/* +/* Dynamic pointer casting. Down an inheritance hierarchy */ SWIGRUNTIME swig_type_info * @@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) { return type->name; } -/* +/* Set the clientdata field for a type */ SWIGRUNTIME void @@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { swig_cast_info *cast = ti->cast; /* if (ti->clientdata == clientdata) return; */ ti->clientdata = clientdata; - + while (cast) { if (!cast->converter) { swig_type_info *tc = cast->type; if (!tc->clientdata) { SWIG_TypeClientData(tc, clientdata); } - } + } cast = cast->next; } } @@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { SWIG_TypeClientData(ti, clientdata); ti->owndata = 1; } - + /* Search for a swig_type_info structure only by mangled name Search is a O(log #types) - - We start searching at module start, and finish searching when start == end. + + We start searching at module start, and finish searching when start == end. Note: if start == end at the beginning of the function, we go all the way around the circular list. */ SWIGRUNTIME swig_type_info * -SWIG_MangledTypeQueryModule(swig_module_info *start, - swig_module_info *end, +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, const char *name) { swig_module_info *iter = start; do { @@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start, register size_t r = iter->size - 1; do { /* since l+r >= 0, we can (>> 1) instead (/ 2) */ - register size_t i = (l + r) >> 1; + register size_t i = (l + r) >> 1; const char *iname = iter->types[i]->name; if (iname) { register int compare = strcmp(name, iname); - if (compare == 0) { + if (compare == 0) { return iter->types[i]; } else if (compare < 0) { if (i) { @@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start, Search for a swig_type_info structure for either a mangled name or a human readable name. It first searches the mangled names of the types, which is a O(log #types) If a type is not found it then searches the human readable names, which is O(#types). - - We start searching at module start, and finish searching when start == end. + + We start searching at module start, and finish searching when start == end. Note: if start == end at the beginning of the function, we go all the way around the circular list. */ SWIGRUNTIME swig_type_info * -SWIG_TypeQueryModule(swig_module_info *start, - swig_module_info *end, +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, const char *name) { /* STEP 1: Search the name field using binary search */ swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); @@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start, iter = iter->next; } while (iter != end); } - + /* neither found a match */ return 0; } -/* +/* Pack binary data into a string */ SWIGRUNTIME char * @@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) { return c; } -/* +/* Unpack binary data from a string */ SWIGRUNTIME const char * @@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) { uu = ((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) uu = ((d - ('a'-10)) << 4); - else + else return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) uu |= (d - '0'); else if ((d >= 'a') && (d <= 'f')) uu |= (d - ('a'-10)); - else + else return (char *) 0; *u = uu; } return c; } -/* +/* Pack 'void *' into a string buffer. */ SWIGRUNTIME char * @@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #endif /* Errors in SWIG */ -#define SWIG_UnknownError -1 -#define SWIG_IOError -2 -#define SWIG_RuntimeError -3 -#define SWIG_IndexError -4 -#define SWIG_TypeError -5 -#define SWIG_DivisionByZero -6 -#define SWIG_OverflowError -7 -#define SWIG_SyntaxError -8 -#define SWIG_ValueError -9 +#define SWIG_UnknownError -1 +#define SWIG_IOError -2 +#define SWIG_RuntimeError -3 +#define SWIG_IndexError -4 +#define SWIG_TypeError -5 +#define SWIG_DivisionByZero -6 +#define SWIG_OverflowError -7 +#define SWIG_SyntaxError -8 +#define SWIG_ValueError -9 #define SWIG_SystemError -10 #define SWIG_AttributeError -11 -#define SWIG_MemoryError -12 +#define SWIG_MemoryError -12 #define SWIG_NullReferenceError -13 @@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args) } SWIGRUNTIME int -SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) -{ - char *str; -#ifdef METH_NOARGS - PyObject *repr = SwigPyObject_repr(v); -#else - PyObject *repr = SwigPyObject_repr(v, NULL); -#endif - if (repr) { - str = SWIG_Python_str_AsChar(repr); - fputs(str, fp); - SWIG_Python_str_DelForPy3(str); - Py_DECREF(repr); - return 0; - } else { - return 1; - } -} - -SWIGRUNTIME PyObject * -SwigPyObject_str(SwigPyObject *v) -{ - char result[SWIG_BUFFER_SIZE]; - return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ? - SWIG_Python_str_FromChar(result) : 0; -} - -SWIGRUNTIME int SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w) { void *i = v->ptr; @@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args) static PyMethodDef swigobject_methods[] = { {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, - {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"acquires ownership of the pointer"}, {(char *)"own", (PyCFunction)SwigPyObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, {(char *)"append", (PyCFunction)SwigPyObject_append, METH_O, (char *)"appends another 'this' object"}, {(char *)"next", (PyCFunction)SwigPyObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, @@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) { sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ - (printfunc)SwigPyObject_print, /* tp_print */ + 0, /* tp_print */ #if PY_VERSION_HEX < 0x02020000 (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ #else @@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) { 0, /* tp_as_mapping */ (hashfunc)0, /* tp_hash */ (ternaryfunc)0, /* tp_call */ - (reprfunc)SwigPyObject_str, /* tp_str */ + 0, /* tp_str */ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ @@ -2289,10 +2256,11 @@ SWIGRUNTIME int SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) { int res; SwigPyObject *sobj; + int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0; if (!obj) return SWIG_ERROR; - if (obj == Py_None) { + if (obj == Py_None && !implicit_conv) { if (ptr) *ptr = 0; return SWIG_OK; @@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } res = SWIG_OK; } else { - if (flags & SWIG_POINTER_IMPLICIT_CONV) { + if (implicit_conv) { SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; if (data && !data->implicitconv) { PyObject *klass = data->klass; @@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } } } + if (!SWIG_IsOK(res) && obj == Py_None) { + if (ptr) + *ptr = 0; + if (PyErr_Occurred()) + PyErr_Clear(); + res = SWIG_OK; + } } return res; } @@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { PyObject *descr; PyObject *encoded_name; descrsetfunc f; - int res; + int res = -1; # ifdef Py_USING_UNICODE if (PyString_Check(name)) { @@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { goto done; } - res = -1; descr = _PyType_Lookup(tp, name); f = NULL; if (descr != NULL) @@ -2950,86 +2924,88 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_char swig_types[7] #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8] #define SWIGTYPE_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[9] -#define SWIGTYPE_p_f_p_void__void swig_types[10] -#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t swig_types[11] -#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t swig_types[12] -#define SWIGTYPE_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t swig_types[13] -#define SWIGTYPE_p_f_p_void_p_void__void swig_types[14] -#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[15] -#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[16] -#define SWIGTYPE_p_int swig_types[17] -#define SWIGTYPE_p_long swig_types[18] -#define SWIGTYPE_p_p_char swig_types[19] -#define SWIGTYPE_p_p_svn_diff_t swig_types[20] -#define SWIGTYPE_p_p_svn_patch_file_t swig_types[21] -#define SWIGTYPE_p_p_svn_patch_t swig_types[22] -#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[23] -#define SWIGTYPE_p_p_void swig_types[24] -#define SWIGTYPE_p_svn_auth_baton_t swig_types[25] -#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[26] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[27] -#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[28] -#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[29] -#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[30] -#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[31] -#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[32] -#define SWIGTYPE_p_svn_auth_provider_t swig_types[33] -#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[34] -#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[35] -#define SWIGTYPE_p_svn_checksum_kind_t swig_types[36] -#define SWIGTYPE_p_svn_checksum_t swig_types[37] -#define SWIGTYPE_p_svn_commit_info_t swig_types[38] -#define SWIGTYPE_p_svn_config_t swig_types[39] -#define SWIGTYPE_p_svn_depth_t swig_types[40] -#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[41] -#define SWIGTYPE_p_svn_diff_datasource_e swig_types[42] -#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[43] -#define SWIGTYPE_p_svn_diff_file_options_t swig_types[44] -#define SWIGTYPE_p_svn_diff_fns2_t swig_types[45] -#define SWIGTYPE_p_svn_diff_fns_t swig_types[46] -#define SWIGTYPE_p_svn_diff_hunk_t swig_types[47] -#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[48] -#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[49] -#define SWIGTYPE_p_svn_diff_t swig_types[50] -#define SWIGTYPE_p_svn_dirent_t swig_types[51] -#define SWIGTYPE_p_svn_errno_t swig_types[52] -#define SWIGTYPE_p_svn_error_t swig_types[53] -#define SWIGTYPE_p_svn_io_dirent2_t swig_types[54] -#define SWIGTYPE_p_svn_io_dirent_t swig_types[55] -#define SWIGTYPE_p_svn_io_file_del_t swig_types[56] -#define SWIGTYPE_p_svn_location_segment_t swig_types[57] -#define SWIGTYPE_p_svn_lock_t swig_types[58] -#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[59] -#define SWIGTYPE_p_svn_log_changed_path_t swig_types[60] -#define SWIGTYPE_p_svn_log_entry_t swig_types[61] -#define SWIGTYPE_p_svn_merge_range_t swig_types[62] -#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[63] -#define SWIGTYPE_p_svn_node_kind_t swig_types[64] -#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[65] -#define SWIGTYPE_p_svn_opt_revision_t swig_types[66] -#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[67] -#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[68] -#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[69] -#define SWIGTYPE_p_svn_patch_file_t swig_types[70] -#define SWIGTYPE_p_svn_patch_t swig_types[71] -#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[72] -#define SWIGTYPE_p_svn_prop_kind swig_types[73] -#define SWIGTYPE_p_svn_prop_patch_t swig_types[74] -#define SWIGTYPE_p_svn_stream_mark_t swig_types[75] -#define SWIGTYPE_p_svn_stream_t swig_types[76] -#define SWIGTYPE_p_svn_string_t swig_types[77] -#define SWIGTYPE_p_svn_stringbuf_t swig_types[78] -#define SWIGTYPE_p_svn_tristate_t swig_types[79] -#define SWIGTYPE_p_svn_version_checklist_t swig_types[80] -#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[81] -#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[82] -#define SWIGTYPE_p_svn_version_extended_t swig_types[83] -#define SWIGTYPE_p_svn_version_t swig_types[84] -#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[85] -#define SWIGTYPE_p_unsigned_long swig_types[86] -#define SWIGTYPE_p_void swig_types[87] -static swig_type_info *swig_types[89]; -static swig_module_info swig_module = {swig_types, 88, 0, 0, 0, 0}; +#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[10] +#define SWIGTYPE_p_f_p_void__void swig_types[11] +#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t swig_types[12] +#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t swig_types[13] +#define SWIGTYPE_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t swig_types[14] +#define SWIGTYPE_p_f_p_void_p_void__void swig_types[15] +#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[16] +#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[17] +#define SWIGTYPE_p_int swig_types[18] +#define SWIGTYPE_p_long swig_types[19] +#define SWIGTYPE_p_p_char swig_types[20] +#define SWIGTYPE_p_p_svn_diff_t swig_types[21] +#define SWIGTYPE_p_p_svn_patch_file_t swig_types[22] +#define SWIGTYPE_p_p_svn_patch_t swig_types[23] +#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[24] +#define SWIGTYPE_p_p_void swig_types[25] +#define SWIGTYPE_p_svn_auth_baton_t swig_types[26] +#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[27] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[28] +#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[29] +#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[30] +#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[31] +#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[32] +#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[33] +#define SWIGTYPE_p_svn_auth_provider_t swig_types[34] +#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[35] +#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[36] +#define SWIGTYPE_p_svn_checksum_kind_t swig_types[37] +#define SWIGTYPE_p_svn_checksum_t swig_types[38] +#define SWIGTYPE_p_svn_commit_info_t swig_types[39] +#define SWIGTYPE_p_svn_config_t swig_types[40] +#define SWIGTYPE_p_svn_depth_t swig_types[41] +#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[42] +#define SWIGTYPE_p_svn_diff_datasource_e swig_types[43] +#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[44] +#define SWIGTYPE_p_svn_diff_file_options_t swig_types[45] +#define SWIGTYPE_p_svn_diff_fns2_t swig_types[46] +#define SWIGTYPE_p_svn_diff_fns_t swig_types[47] +#define SWIGTYPE_p_svn_diff_hunk_t swig_types[48] +#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[49] +#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[50] +#define SWIGTYPE_p_svn_diff_t swig_types[51] +#define SWIGTYPE_p_svn_dirent_t swig_types[52] +#define SWIGTYPE_p_svn_errno_t swig_types[53] +#define SWIGTYPE_p_svn_error_t swig_types[54] +#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[55] +#define SWIGTYPE_p_svn_io_dirent2_t swig_types[56] +#define SWIGTYPE_p_svn_io_dirent_t swig_types[57] +#define SWIGTYPE_p_svn_io_file_del_t swig_types[58] +#define SWIGTYPE_p_svn_location_segment_t swig_types[59] +#define SWIGTYPE_p_svn_lock_t swig_types[60] +#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[61] +#define SWIGTYPE_p_svn_log_changed_path_t swig_types[62] +#define SWIGTYPE_p_svn_log_entry_t swig_types[63] +#define SWIGTYPE_p_svn_merge_range_t swig_types[64] +#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[65] +#define SWIGTYPE_p_svn_node_kind_t swig_types[66] +#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[67] +#define SWIGTYPE_p_svn_opt_revision_t swig_types[68] +#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[69] +#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[70] +#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[71] +#define SWIGTYPE_p_svn_patch_file_t swig_types[72] +#define SWIGTYPE_p_svn_patch_t swig_types[73] +#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[74] +#define SWIGTYPE_p_svn_prop_kind swig_types[75] +#define SWIGTYPE_p_svn_prop_patch_t swig_types[76] +#define SWIGTYPE_p_svn_stream_mark_t swig_types[77] +#define SWIGTYPE_p_svn_stream_t swig_types[78] +#define SWIGTYPE_p_svn_string_t swig_types[79] +#define SWIGTYPE_p_svn_stringbuf_t swig_types[80] +#define SWIGTYPE_p_svn_tristate_t swig_types[81] +#define SWIGTYPE_p_svn_version_checklist_t swig_types[82] +#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[83] +#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[84] +#define SWIGTYPE_p_svn_version_extended_t swig_types[85] +#define SWIGTYPE_p_svn_version_t swig_types[86] +#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[87] +#define SWIGTYPE_p_unsigned_long swig_types[88] +#define SWIGTYPE_p_void swig_types[89] +static swig_type_info *swig_types[91]; +static swig_module_info swig_module = {swig_types, 90, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3053,7 +3029,7 @@ static swig_module_info swig_module = {swig_types, 88, 0, 0, 0, 0}; #endif #define SWIG_name "_diff" -#define SWIGVERSION 0x020009 +#define SWIGVERSION 0x020012 #define SWIG_VERSION SWIGVERSION @@ -3497,6 +3473,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) return SWIG_OK; } else { PyErr_Clear(); +#if PY_VERSION_HEX >= 0x03000000 + { + long v = PyLong_AsLong(obj); + if (!PyErr_Occurred()) { + if (v < 0) { + return SWIG_OverflowError; + } + } else { + PyErr_Clear(); + } + } +#endif } } #ifdef SWIG_PYTHON_CAST_MODE @@ -3554,7 +3542,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_version(PyObject *SWIGUNUSEDPARM(self), PyOb svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t, _global_py_pool, args); return resultobj; fail: @@ -3571,7 +3559,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasources_open_set(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasources_open_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3598,7 +3586,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasources_open_get(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasources_open_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3620,7 +3608,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_close_set(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasource_close_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3647,7 +3635,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_close_get(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasource_close_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3669,7 +3657,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_get_next_token_set(PyObjec if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasource_get_next_token_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3696,7 +3684,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_get_next_token_get(PyObjec if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasource_get_next_token_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3718,7 +3706,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_compare_set(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_compare_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3745,7 +3733,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_compare_get(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_compare_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3767,7 +3755,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_set(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_discard_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3794,7 +3782,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_get(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_discard_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3816,7 +3804,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_all_set(PyObject *SWIGU if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_discard_all_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3843,7 +3831,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_all_get(PyObject *SWIGU if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_discard_all_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3869,7 +3857,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_fns2_t(PyObject *SWIGUNUSEDPARM(self), P svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_fns2_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_fns2_t, _global_py_pool, args); return resultobj; fail: @@ -3884,7 +3872,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_fns2_t(PyObject *SWIGUNUSEDPARM(self) if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_fns2_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3920,7 +3908,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_open_set(PyObject *SWIGUNUS if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_open_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3947,7 +3935,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_open_get(PyObject *SWIGUNUS if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_open_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3969,7 +3957,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_close_set(PyObject *SWIGUNU if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_close_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -3996,7 +3984,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_close_get(PyObject *SWIGUNU if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_close_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4018,7 +4006,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_get_next_token_set(PyObject if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_get_next_token_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4045,7 +4033,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_get_next_token_get(PyObject if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_get_next_token_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4067,7 +4055,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_compare_set(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_compare_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4094,7 +4082,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_compare_get(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_compare_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4116,7 +4104,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_set(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_discard_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4143,7 +4131,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_get(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_discard_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4165,7 +4153,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_all_set(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_discard_all_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4192,7 +4180,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_all_get(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_discard_all_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4218,7 +4206,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_fns_t(PyObject *SWIGUNUSEDPARM(self), Py svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_fns_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_fns_t, _global_py_pool, args); return resultobj; fail: @@ -4233,7 +4221,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_fns_t(PyObject *SWIGUNUSEDPARM(self), if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_fns_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4289,7 +4277,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff_2(PyObject *SWIGUNUSEDPARM(self), PyObj } } { - arg3 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1); + arg3 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -4322,7 +4310,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff_2(PyObject *SWIGUNUSEDPARM(self), PyObj resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -4368,7 +4356,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff(PyObject *SWIGUNUSEDPARM(self), PyObjec } } { - arg3 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1); + arg3 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -4401,7 +4389,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff(PyObject *SWIGUNUSEDPARM(self), PyObjec resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -4447,7 +4435,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3_2(PyObject *SWIGUNUSEDPARM(self), PyOb } } { - arg3 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1); + arg3 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -4480,7 +4468,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3_2(PyObject *SWIGUNUSEDPARM(self), PyOb resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -4526,7 +4514,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3(PyObject *SWIGUNUSEDPARM(self), PyObje } } { - arg3 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1); + arg3 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -4559,7 +4547,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3(PyObject *SWIGUNUSEDPARM(self), PyObje resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -4605,7 +4593,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4_2(PyObject *SWIGUNUSEDPARM(self), PyOb } } { - arg3 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1); + arg3 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -4638,7 +4626,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4_2(PyObject *SWIGUNUSEDPARM(self), PyOb resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -4684,7 +4672,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4(PyObject *SWIGUNUSEDPARM(self), PyObje } } { - arg3 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1); + arg3 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -4717,7 +4705,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4(PyObject *SWIGUNUSEDPARM(self), PyObje resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -4742,7 +4730,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_contains_conflicts(PyObject *SWIGUNUSEDPARM( if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_contains_conflicts",&obj0)) SWIG_fail; { - arg1 = (svn_diff_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); + arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4770,7 +4758,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_contains_diffs(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_contains_diffs",&obj0)) SWIG_fail; { - arg1 = (svn_diff_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); + arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4799,7 +4787,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_common_set(PyObject *SWI if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_common_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4826,7 +4814,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_common_get(PyObject *SWI if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_common_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4848,7 +4836,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_modified_set(PyObje if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_modified_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4875,7 +4863,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_modified_get(PyObje if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_modified_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4897,7 +4885,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_latest_set(PyObject if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_latest_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4924,7 +4912,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_latest_get(PyObject if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_latest_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4946,7 +4934,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_common_set(PyObject if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_common_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4973,7 +4961,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_common_get(PyObject if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_common_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -4995,7 +4983,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_conflict_set(PyObject *S if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_conflict_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5022,7 +5010,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_conflict_get(PyObject *S if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_conflict_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5048,7 +5036,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_output_fns_t(PyObject *SWIGUNUSEDPARM(se svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_output_fns_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_output_fns_t, _global_py_pool, args); return resultobj; fail: @@ -5063,7 +5051,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_output_fns_t(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_output_fns_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5090,6 +5078,69 @@ SWIGINTERN PyObject *svn_diff_output_fns_t_swigregister(PyObject *SWIGUNUSEDPARM return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_svn_diff_output2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_diff_t *arg1 = (svn_diff_t *) 0 ; + void *arg2 = (void *) 0 ; + svn_diff_output_fns_t *arg3 = (svn_diff_output_fns_t *) 0 ; + svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ; + void *arg5 = (void *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + svn_error_t *result = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_output2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + { + arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj1 == Py_None) { + arg2 = NULL; + } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) { + arg2 = (void *) obj1; + PyErr_Clear(); + } + } + { + arg3 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj2); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg5 = obj3; + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_diff_output2(arg1,arg2,(struct svn_diff_output_fns_t const *)arg3,arg4,arg5); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_diff_t *arg1 = (svn_diff_t *) 0 ; @@ -5102,7 +5153,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObj if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_output",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); + arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5116,7 +5167,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObj } } { - arg3 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj2); + arg3 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } @@ -5155,7 +5206,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_space_set(PyObject *SW if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_ignore_space_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5182,7 +5233,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_space_get(PyObject *SW if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_ignore_space_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5204,7 +5255,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_eol_style_set(PyObject if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_ignore_eol_style_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5231,7 +5282,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_eol_style_get(PyObject if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_ignore_eol_style_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5253,7 +5304,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_show_c_function_set(PyObject if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_show_c_function_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5280,7 +5331,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_show_c_function_get(PyObject if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_show_c_function_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5293,6 +5344,55 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_context_size_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_context_size_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (int)SWIG_As_long (obj1); + if (SWIG_arg_fail(svn_argnum_obj1)) { + SWIG_fail; + } + } + if (arg1) (arg1)->context_size = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_context_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ; + PyObject * obj0 = 0 ; + int result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_context_size_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (int) ((arg1)->context_size); + resultobj = SWIG_From_long((long)(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_svn_diff_file_options_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; struct svn_diff_file_options_t *result = 0 ; @@ -5306,7 +5406,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_file_options_t(PyObject *SWIGUNUSEDPARM( svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t, _global_py_pool, args); return resultobj; fail: @@ -5321,7 +5421,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_file_options_t(PyObject *SWIGUNUSEDPA if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_file_options_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5377,7 +5477,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_create(PyObject *SWIGUNUSEDPARM svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t, _global_py_pool, args); { Py_XDECREF(_global_py_pool); @@ -5409,7 +5509,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_parse(PyObject *SWIGUNUSEDPARM( arg3 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_file_options_parse",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); + arg1 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -5483,7 +5583,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff_2(PyObject *SWIGUNUSEDPARM(self), arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_diff_file_diff_2",&arg2,&arg3,&obj2,&obj3)) SWIG_fail; { - arg4 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2); + arg4 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } @@ -5516,7 +5616,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff_2(PyObject *SWIGUNUSEDPARM(self), resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -5579,7 +5679,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff(PyObject *SWIGUNUSEDPARM(self), Py resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -5618,7 +5718,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3_2(PyObject *SWIGUNUSEDPARM(self), arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"sssO|O:svn_diff_file_diff3_2",&arg2,&arg3,&arg4,&obj3,&obj4)) SWIG_fail; { - arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3); + arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3); if (PyErr_Occurred()) { SWIG_fail; } @@ -5651,7 +5751,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3_2(PyObject *SWIGUNUSEDPARM(self), resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -5715,7 +5815,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3(PyObject *SWIGUNUSEDPARM(self), P resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -5755,7 +5855,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4_2(PyObject *SWIGUNUSEDPARM(self), arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"ssssO|O:svn_diff_file_diff4_2",&arg2,&arg3,&arg4,&arg5,&obj4,&obj5)) SWIG_fail; { - arg6 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4); + arg6 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4); if (PyErr_Occurred()) { SWIG_fail; } @@ -5788,7 +5888,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4_2(PyObject *SWIGUNUSEDPARM(self), resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -5853,7 +5953,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4(PyObject *SWIGUNUSEDPARM(self), P resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -5870,6 +5970,100 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_stream_t *arg1 = (svn_stream_t *) 0 ; + svn_diff_t *arg2 = (svn_diff_t *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + char *arg5 = (char *) 0 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + char *arg8 = (char *) 0 ; + svn_boolean_t arg9 ; + int arg10 ; + svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg13 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOsszzzzOOO|O:svn_diff_file_output_unified4",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&obj9,&obj10,&obj11)) SWIG_fail; + { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + } + { + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg9 = (svn_boolean_t)SWIG_As_long (obj8); + if (SWIG_arg_fail(svn_argnum_obj8)) { + SWIG_fail; + } + } + { + arg10 = (int)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg12 = obj10; + } + if (obj11) { + /* Verify that the user supplied a valid pool */ + if (obj11 != Py_None && obj11 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11); + SWIG_arg_fail(svn_argnum_obj11); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_diff_file_output_unified4(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_stream_t *arg1 = (svn_stream_t *) 0 ; @@ -5899,7 +6093,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPAR arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -5975,7 +6169,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified2(PyObject *SWIGUNUSEDPAR arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6044,7 +6238,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified(PyObject *SWIGUNUSEDPARM arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6088,6 +6282,93 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_stream_t *arg1 = (svn_stream_t *) 0 ; + svn_diff_t *arg2 = (svn_diff_t *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + char *arg5 = (char *) 0 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + char *arg8 = (char *) 0 ; + char *arg9 = (char *) 0 ; + svn_diff_conflict_display_style_t arg10 ; + svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg13 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOssszzzzOO|O:svn_diff_file_output_merge3",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail; + { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + } + { + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg10 = (svn_diff_conflict_display_style_t)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg12 = obj10; + } + if (obj11) { + /* Verify that the user supplied a valid pool */ + if (obj11 != Py_None && obj11 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11); + SWIG_arg_fail(svn_argnum_obj11); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_diff_file_output_merge3(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_stream_t *arg1 = (svn_stream_t *) 0 ; @@ -6118,7 +6399,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM( arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6200,7 +6481,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge(PyObject *SWIGUNUSEDPARM(s arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6256,6 +6537,80 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_diff_output_binary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_stream_t *arg1 = (svn_stream_t *) 0 ; + svn_stream_t *arg2 = (svn_stream_t *) 0 ; + svn_stream_t *arg3 = (svn_stream_t *) 0 ; + svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ; + void *arg5 = (void *) 0 ; + apr_pool_t *arg6 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg6 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_diff_output_binary",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + } + { + arg2 = svn_swig_py_make_stream (obj1, _global_pool); + } + { + arg3 = svn_swig_py_make_stream (obj2, _global_pool); + } + { + arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg5 = obj3; + } + if (obj4) { + /* Verify that the user supplied a valid pool */ + if (obj4 != Py_None && obj4 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4); + SWIG_arg_fail(svn_argnum_obj4); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_diff_output_binary(arg1,arg2,arg3,arg4,arg5,arg6); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_diff_t **arg1 = (svn_diff_t **) 0 ; @@ -6307,7 +6662,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(sel } } { - arg4 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2); + arg4 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } @@ -6340,7 +6695,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(sel resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -6424,7 +6779,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se } } { - arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3); + arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3); if (PyErr_Occurred()) { SWIG_fail; } @@ -6457,7 +6812,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -6557,7 +6912,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se } } { - arg6 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4); + arg6 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4); if (PyErr_Occurred()) { SWIG_fail; } @@ -6590,7 +6945,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t, _global_py_pool, args)) ; @@ -6607,6 +6962,130 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_stream_t *arg1 = (svn_stream_t *) 0 ; + svn_diff_t *arg2 = (svn_diff_t *) 0 ; + svn_boolean_t arg3 ; + char *arg4 = (char *) 0 ; + char *arg5 = (char *) 0 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + svn_string_t *arg8 = (svn_string_t *) 0 ; + svn_string_t *arg9 = (svn_string_t *) 0 ; + int arg10 ; + svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_string_t value8 ; + svn_string_t value9 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg13 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOszzzOOOO|O:svn_diff_mem_string_output_unified3",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail; + { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + } + { + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg3 = (svn_boolean_t)SWIG_As_long (obj2); + if (SWIG_arg_fail(svn_argnum_obj2)) { + SWIG_fail; + } + } + { + if (obj7 == Py_None) + arg8 = NULL; + else { + if (!PyString_Check(obj7)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value8.data = PyString_AS_STRING(obj7); + value8.len = PyString_GET_SIZE(obj7); + arg8 = &value8; + } + } + { + if (obj8 == Py_None) + arg9 = NULL; + else { + if (!PyString_Check(obj8)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value9.data = PyString_AS_STRING(obj8); + value9.len = PyString_GET_SIZE(obj8); + arg9 = &value9; + } + } + { + arg10 = (int)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg12 = obj10; + } + if (obj11) { + /* Verify that the user supplied a valid pool */ + if (obj11 != Py_None && obj11 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11); + SWIG_arg_fail(svn_argnum_obj11); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_diff_mem_string_output_unified3(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(struct svn_string_t const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11,arg12,arg13); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_stream_t *arg1 = (svn_stream_t *) 0 ; @@ -6640,7 +7119,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6746,7 +7225,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6816,6 +7295,138 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + svn_stream_t *arg1 = (svn_stream_t *) 0 ; + svn_diff_t *arg2 = (svn_diff_t *) 0 ; + svn_string_t *arg3 = (svn_string_t *) 0 ; + svn_string_t *arg4 = (svn_string_t *) 0 ; + svn_string_t *arg5 = (svn_string_t *) 0 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + char *arg8 = (char *) 0 ; + char *arg9 = (char *) 0 ; + svn_diff_conflict_display_style_t arg10 ; + svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ; + void *arg12 = (void *) 0 ; + apr_pool_t *arg13 = (apr_pool_t *) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + svn_string_t value3 ; + svn_string_t value4 ; + svn_string_t value5 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + svn_error_t *result = 0 ; + + if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + arg13 = _global_pool; + if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzOO|O:svn_diff_mem_string_output_merge3",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail; + { + arg1 = svn_swig_py_make_stream (obj0, _global_pool); + } + { + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (obj2 == Py_None) + arg3 = NULL; + else { + if (!PyString_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value3.data = PyString_AS_STRING(obj2); + value3.len = PyString_GET_SIZE(obj2); + arg3 = &value3; + } + } + { + if (obj3 == Py_None) + arg4 = NULL; + else { + if (!PyString_Check(obj3)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value4.data = PyString_AS_STRING(obj3); + value4.len = PyString_GET_SIZE(obj3); + arg4 = &value4; + } + } + { + if (obj4 == Py_None) + arg5 = NULL; + else { + if (!PyString_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "not a string"); + SWIG_fail; + } + value5.data = PyString_AS_STRING(obj4); + value5.len = PyString_GET_SIZE(obj4); + arg5 = &value5; + } + } + { + arg10 = (svn_diff_conflict_display_style_t)SWIG_As_long (obj9); + if (SWIG_arg_fail(svn_argnum_obj9)) { + SWIG_fail; + } + } + { + arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func; + arg12 = obj10; + } + if (obj11) { + /* Verify that the user supplied a valid pool */ + if (obj11 != Py_None && obj11 != _global_py_pool) { + SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11); + SWIG_arg_fail(svn_argnum_obj11); + SWIG_fail; + } + } + { + svn_swig_py_release_py_lock(); + + result = (svn_error_t *)svn_diff_mem_string_output_merge3(arg1,arg2,(struct svn_string_t const *)arg3,(struct svn_string_t const *)arg4,(struct svn_string_t const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13); + + svn_swig_py_acquire_py_lock(); + + } + { + if (result != NULL) { + if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET) + svn_swig_py_svn_exception(result); + else + svn_error_clear(result); + SWIG_fail; + } + Py_INCREF(Py_None); + resultobj = Py_None; + } + { + Py_XDECREF(_global_py_pool); + } + return resultobj; +fail: + { + Py_XDECREF(_global_py_pool); + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; svn_stream_t *arg1 = (svn_stream_t *) 0 ; @@ -6852,7 +7463,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -6979,7 +7590,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED arg1 = svn_swig_py_make_stream (obj0, _global_pool); } { - arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); + arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -7106,7 +7717,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_diff_text(PyObject *SWIGUNUSED arg4 = &temp4; if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_diff_text",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7228,7 +7839,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_original_text(PyObject *SWIGUN arg4 = &temp4; if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_original_text",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7350,7 +7961,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_modified_text(PyObject *SWIGUN arg4 = &temp4; if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_modified_text",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7447,7 +8058,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_diff_text(PyObject *SWIGUNUSEDPAR if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_diff_text",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7474,7 +8085,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_original_text(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_original_text",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7501,7 +8112,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_modified_text(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_modified_text",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7529,7 +8140,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_original_start(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_original_start",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7557,7 +8168,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_original_length(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_original_length",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7585,7 +8196,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_modified_start(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_modified_start",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7613,7 +8224,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_modified_length(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_modified_length",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7641,7 +8252,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_leading_context(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_leading_context",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7669,7 +8280,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_trailing_context(PyObject *SWIGUNUS if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_trailing_context",&obj0)) SWIG_fail; { - arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); + arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7697,7 +8308,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_set(PyObject *SWIGUNUSEDPARM(se if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_patch_t_name_set",&obj0,&arg2)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7725,7 +8336,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_get(PyObject *SWIGUNUSEDPARM(se if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_name_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7747,7 +8358,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_operation_set(PyObject *SWIGUNUSEDPA if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_patch_t_operation_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7774,7 +8385,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_operation_get(PyObject *SWIGUNUSEDPA if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_operation_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7796,13 +8407,13 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_hunks_set(PyObject *SWIGUNUSEDPARM(s if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_patch_t_hunks_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } { - arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1); + arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -7823,14 +8434,21 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_hunks_get(PyObject *SWIGUNUSEDPARM(s if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_hunks_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } result = (apr_array_header_t *) ((arg1)->hunks); - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t, - _global_py_pool, args); + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(result, SWIGTYPE_p_svn_diff_hunk_t, + _global_py_pool)) + + ; + if (PyErr_Occurred()) { + SWIG_fail; + } + } return resultobj; fail: return NULL; @@ -7850,7 +8468,7 @@ SWIGINTERN PyObject *_wrap_new_svn_prop_patch_t(PyObject *SWIGUNUSEDPARM(self), svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_prop_patch_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_prop_patch_t, _global_py_pool, args); return resultobj; fail: @@ -7865,7 +8483,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_prop_patch_t(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_prop_patch_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); + arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7900,7 +8518,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_set(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"Os:svn_patch_t_old_filename_set",&obj0,&arg2)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7928,7 +8546,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_get(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_old_filename_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7949,7 +8567,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_set(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"Os:svn_patch_t_new_filename_set",&obj0,&arg2)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7977,7 +8595,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_get(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_new_filename_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -7999,13 +8617,13 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_hunks_set(PyObject *SWIGUNUSEDPARM(self), if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_hunks_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } { - arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1); + arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -8026,14 +8644,21 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_hunks_get(PyObject *SWIGUNUSEDPARM(self), if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_hunks_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } result = (apr_array_header_t *) ((arg1)->hunks); - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t, - _global_py_pool, args); + { + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(result, SWIGTYPE_p_svn_diff_hunk_t, + _global_py_pool)) + + ; + if (PyErr_Occurred()) { + SWIG_fail; + } + } return resultobj; fail: return NULL; @@ -8049,13 +8674,13 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_prop_patches_set(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_prop_patches_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } { - arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1); + arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1); if (PyErr_Occurred()) { SWIG_fail; } @@ -8076,13 +8701,13 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_prop_patches_get(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_prop_patches_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } } result = (apr_hash_t *) ((arg1)->prop_patches); - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t, _global_py_pool, args); return resultobj; fail: @@ -8099,7 +8724,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_operation_set(PyObject *SWIGUNUSEDPARM(se if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_operation_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8126,7 +8751,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_operation_get(PyObject *SWIGUNUSEDPARM(se if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_operation_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8148,7 +8773,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_set(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_reverse_set",&obj0,&obj1)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8175,7 +8800,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_get(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_reverse_get",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8188,6 +8813,115 @@ fail: } +SWIGINTERN PyObject *_wrap_svn_patch_t_mergeinfo_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ; + svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ; + apr_pool_t *_global_pool = NULL ; + PyObject *_global_py_pool = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_mergeinfo_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + if (_global_pool == NULL) + { + if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t, + &_global_py_pool, &_global_pool)) + SWIG_fail; + } + + arg2 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (arg1) (arg1)->mergeinfo = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_patch_t_mergeinfo_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ; + PyObject * obj0 = 0 ; + svn_mergeinfo_t result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_mergeinfo_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (svn_mergeinfo_t) ((arg1)->mergeinfo); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_mergeinfo_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ; + svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_reverse_mergeinfo_set",&obj0,&obj1)) SWIG_fail; + { + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + { + arg2 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + if (arg1) (arg1)->reverse_mergeinfo = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_mergeinfo_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ; + PyObject * obj0 = 0 ; + svn_mergeinfo_t result; + + if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_reverse_mergeinfo_get",&obj0)) SWIG_fail; + { + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + if (PyErr_Occurred()) { + SWIG_fail; + } + } + result = (svn_mergeinfo_t) ((arg1)->reverse_mergeinfo); + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t, + _global_py_pool, args); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; struct svn_patch_t *result = 0 ; @@ -8201,7 +8935,7 @@ SWIGINTERN PyObject *_wrap_new_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), PyObj svn_swig_py_acquire_py_lock(); } - resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_patch_t, + resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_patch_t, _global_py_pool, args); return resultobj; fail: @@ -8216,7 +8950,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), Py if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_patch_t",&obj0)) SWIG_fail; { - arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); + arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8288,7 +9022,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_open_patch_file(PyObject *SWIGUNUSEDPARM(sel resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_patch_file_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_patch_file_t, _global_py_pool, args)) ; @@ -8334,7 +9068,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_parse_next_patch(PyObject *SWIGUNUSEDPARM(se arg1 = &temp1; if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_diff_parse_next_patch",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; { - arg2 = (svn_patch_file_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0); + arg2 = (svn_patch_file_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8387,7 +9121,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_parse_next_patch(PyObject *SWIGUNUSEDPARM(se resultobj = Py_None; } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_patch_t, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_patch_t, _global_py_pool, args)) ; @@ -8426,7 +9160,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_close_patch_file(PyObject *SWIGUNUSEDPARM(se arg2 = _global_pool; if (!PyArg_ParseTuple(args,(char *)"O|O:svn_diff_close_patch_file",&obj0,&obj1)) SWIG_fail; { - arg1 = (svn_patch_file_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0); + arg1 = (svn_patch_file_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8509,7 +9243,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasources_open(PyObject *SWIGU if (!PyArg_ParseTuple(args,(char *)"OOOOOO:svn_diff_fns2_invoke_datasources_open",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; { - arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8523,19 +9257,19 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasources_open(PyObject *SWIGU } } { - arg3 = (apr_off_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_off_t, svn_argnum_obj2); + arg3 = (apr_off_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_off_t, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } } { - arg4 = (apr_off_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_off_t, svn_argnum_obj3); + arg4 = (apr_off_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_off_t, svn_argnum_obj3); if (PyErr_Occurred()) { SWIG_fail; } } { - arg5 = (svn_diff_datasource_e *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_datasource_e, svn_argnum_obj4); + arg5 = (svn_diff_datasource_e *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_datasource_e, svn_argnum_obj4); if (PyErr_Occurred()) { SWIG_fail; } @@ -8583,7 +9317,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_close(PyObject *SWIGU if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_datasource_close",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8646,7 +9380,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_get_next_token(PyObje arg3 = &temp3; if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_datasource_get_next_token",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8691,7 +9425,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_get_next_token(PyObje resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_apr_uint32_t, new_flags)); } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void, _global_py_pool, args)) ; @@ -8720,7 +9454,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_compare(PyObject *SWIGUNUS arg5 = &temp5; if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_fns2_invoke_token_compare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; { - arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8734,13 +9468,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_compare(PyObject *SWIGUNUS } } { - arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); + arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } } { - arg4 = (void *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_void, svn_argnum_obj3); + arg4 = (void *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_void, svn_argnum_obj3); if (PyErr_Occurred()) { SWIG_fail; } @@ -8787,7 +9521,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard(PyObject *SWIGUNUS if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_token_discard",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8801,7 +9535,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard(PyObject *SWIGUNUS } } { - arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); + arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } @@ -8830,7 +9564,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard_all(PyObject *SWIG if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_invoke_token_discard_all",&obj0,&obj1)) SWIG_fail; { - arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); + arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8870,7 +9604,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_open(PyObject *SWIGUNU if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_open",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8926,7 +9660,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_close(PyObject *SWIGUN if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_close",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -8989,7 +9723,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_get_next_token(PyObjec arg3 = &temp3; if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_get_next_token",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9034,7 +9768,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_get_next_token(PyObjec resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_apr_uint32_t, new_flags)); } { - resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void, + resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void, _global_py_pool, args)) ; @@ -9063,7 +9797,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_compare(PyObject *SWIGUNUSE arg5 = &temp5; if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_fns_invoke_token_compare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; { - arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9077,13 +9811,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_compare(PyObject *SWIGUNUSE } } { - arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); + arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } } { - arg4 = (void *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_void, svn_argnum_obj3); + arg4 = (void *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_void, svn_argnum_obj3); if (PyErr_Occurred()) { SWIG_fail; } @@ -9130,7 +9864,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard(PyObject *SWIGUNUSE if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_token_discard",&obj0,&obj1,&obj2)) SWIG_fail; { - arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9144,7 +9878,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard(PyObject *SWIGUNUSE } } { - arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); + arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2); if (PyErr_Occurred()) { SWIG_fail; } @@ -9173,7 +9907,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard_all(PyObject *SWIGU if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_invoke_token_discard_all",&obj0,&obj1)) SWIG_fail; { - arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9223,7 +9957,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_common(PyObject *SW if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_common",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { - arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9289,7 +10023,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_modified(PyObj if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_modified",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { - arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9355,7 +10089,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_latest(PyObjec if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_latest",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { - arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9421,7 +10155,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_common(PyObjec if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_common",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; { - arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9489,7 +10223,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_conflict(PyObject * if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:svn_diff_output_fns_invoke_output_conflict",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; { - arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); + arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0); if (PyErr_Occurred()) { SWIG_fail; } @@ -9509,7 +10243,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_conflict(PyObject * arg7 = (apr_off_t) PyLong_AsLongLong(obj6); arg8 = (apr_off_t) PyLong_AsLongLong(obj7); { - arg9 = (svn_diff_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_diff_t, svn_argnum_obj8); + arg9 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_diff_t, svn_argnum_obj8); if (PyErr_Occurred()) { SWIG_fail; } @@ -9593,6 +10327,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_svn_diff_output_fns_t", _wrap_new_svn_diff_output_fns_t, METH_VARARGS, (char *)"new_svn_diff_output_fns_t() -> svn_diff_output_fns_t"}, { (char *)"delete_svn_diff_output_fns_t", _wrap_delete_svn_diff_output_fns_t, METH_VARARGS, (char *)"delete_svn_diff_output_fns_t(svn_diff_output_fns_t self)"}, { (char *)"svn_diff_output_fns_t_swigregister", svn_diff_output_fns_t_swigregister, METH_VARARGS, NULL}, + { (char *)"svn_diff_output2", _wrap_svn_diff_output2, METH_VARARGS, (char *)"svn_diff_output2(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns, svn_cancel_func_t cancel_func) -> svn_error_t"}, { (char *)"svn_diff_output", _wrap_svn_diff_output, METH_VARARGS, (char *)"svn_diff_output(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns) -> svn_error_t"}, { (char *)"svn_diff_file_options_t_ignore_space_set", _wrap_svn_diff_file_options_t_ignore_space_set, METH_VARARGS, (char *)"svn_diff_file_options_t_ignore_space_set(svn_diff_file_options_t self, svn_diff_file_ignore_space_t ignore_space)"}, { (char *)"svn_diff_file_options_t_ignore_space_get", _wrap_svn_diff_file_options_t_ignore_space_get, METH_VARARGS, (char *)"svn_diff_file_options_t_ignore_space_get(svn_diff_file_options_t self) -> svn_diff_file_ignore_space_t"}, @@ -9600,6 +10335,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_diff_file_options_t_ignore_eol_style_get", _wrap_svn_diff_file_options_t_ignore_eol_style_get, METH_VARARGS, (char *)"svn_diff_file_options_t_ignore_eol_style_get(svn_diff_file_options_t self) -> svn_boolean_t"}, { (char *)"svn_diff_file_options_t_show_c_function_set", _wrap_svn_diff_file_options_t_show_c_function_set, METH_VARARGS, (char *)"svn_diff_file_options_t_show_c_function_set(svn_diff_file_options_t self, svn_boolean_t show_c_function)"}, { (char *)"svn_diff_file_options_t_show_c_function_get", _wrap_svn_diff_file_options_t_show_c_function_get, METH_VARARGS, (char *)"svn_diff_file_options_t_show_c_function_get(svn_diff_file_options_t self) -> svn_boolean_t"}, + { (char *)"svn_diff_file_options_t_context_size_set", _wrap_svn_diff_file_options_t_context_size_set, METH_VARARGS, (char *)"svn_diff_file_options_t_context_size_set(svn_diff_file_options_t self, int context_size)"}, + { (char *)"svn_diff_file_options_t_context_size_get", _wrap_svn_diff_file_options_t_context_size_get, METH_VARARGS, (char *)"svn_diff_file_options_t_context_size_get(svn_diff_file_options_t self) -> int"}, { (char *)"new_svn_diff_file_options_t", _wrap_new_svn_diff_file_options_t, METH_VARARGS, (char *)"new_svn_diff_file_options_t() -> svn_diff_file_options_t"}, { (char *)"delete_svn_diff_file_options_t", _wrap_delete_svn_diff_file_options_t, METH_VARARGS, (char *)"delete_svn_diff_file_options_t(svn_diff_file_options_t self)"}, { (char *)"svn_diff_file_options_t_swigregister", svn_diff_file_options_t_swigregister, METH_VARARGS, NULL}, @@ -9620,6 +10357,12 @@ static PyMethodDef SwigMethods[] = { "svn_diff_file_diff4(char const * original, char const * modified, char const * latest, char const * ancestor, \n" " apr_pool_t pool) -> svn_error_t\n" ""}, + { (char *)"svn_diff_file_output_unified4", _wrap_svn_diff_file_output_unified4, METH_VARARGS, (char *)"\n" + "svn_diff_file_output_unified4(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n" + " char const * original_header, char const * modified_header, \n" + " char const * header_encoding, char const * relative_to_dir, svn_boolean_t show_c_function, \n" + " int context_size, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n" + ""}, { (char *)"svn_diff_file_output_unified3", _wrap_svn_diff_file_output_unified3, METH_VARARGS, (char *)"\n" "svn_diff_file_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n" " char const * original_header, char const * modified_header, \n" @@ -9636,6 +10379,13 @@ static PyMethodDef SwigMethods[] = { " char const * original_header, char const * modified_header, \n" " apr_pool_t pool) -> svn_error_t\n" ""}, + { (char *)"svn_diff_file_output_merge3", _wrap_svn_diff_file_output_merge3, METH_VARARGS, (char *)"\n" + "svn_diff_file_output_merge3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n" + " char const * latest_path, char const * conflict_original, \n" + " char const * conflict_modified, char const * conflict_latest, char const * conflict_separator, \n" + " svn_diff_conflict_display_style_t conflict_style, \n" + " svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n" + ""}, { (char *)"svn_diff_file_output_merge2", _wrap_svn_diff_file_output_merge2, METH_VARARGS, (char *)"\n" "svn_diff_file_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n" " char const * latest_path, char const * conflict_original, \n" @@ -9650,6 +10400,10 @@ static PyMethodDef SwigMethods[] = { " svn_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, \n" " apr_pool_t pool) -> svn_error_t\n" ""}, + { (char *)"svn_diff_output_binary", _wrap_svn_diff_output_binary, METH_VARARGS, (char *)"\n" + "svn_diff_output_binary(svn_stream_t * output_stream, svn_stream_t * original, svn_stream_t * latest, svn_cancel_func_t cancel_func, \n" + " apr_pool_t scratch_pool) -> svn_error_t\n" + ""}, { (char *)"svn_diff_mem_string_diff", _wrap_svn_diff_mem_string_diff, METH_VARARGS, (char *)"\n" "svn_diff_mem_string_diff(svn_string_t const * original, svn_string_t const * modified, svn_diff_file_options_t options, \n" " apr_pool_t pool) -> svn_error_t\n" @@ -9662,6 +10416,13 @@ static PyMethodDef SwigMethods[] = { "svn_diff_mem_string_diff4(svn_string_t const * original, svn_string_t const * modified, svn_string_t const * latest, \n" " svn_string_t const * ancestor, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t\n" ""}, + { (char *)"svn_diff_mem_string_output_unified3", _wrap_svn_diff_mem_string_output_unified3, METH_VARARGS, (char *)"\n" + "svn_diff_mem_string_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, \n" + " char const * hunk_delimiter, char const * original_header, char const * modified_header, \n" + " char const * header_encoding, svn_string_t const * original, \n" + " svn_string_t const * modified, int context_size, svn_cancel_func_t cancel_func, \n" + " apr_pool_t scratch_pool) -> svn_error_t\n" + ""}, { (char *)"svn_diff_mem_string_output_unified2", _wrap_svn_diff_mem_string_output_unified2, METH_VARARGS, (char *)"\n" "svn_diff_mem_string_output_unified2(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, \n" " char const * hunk_delimiter, char const * original_header, char const * modified_header, \n" @@ -9673,6 +10434,13 @@ static PyMethodDef SwigMethods[] = { " char const * header_encoding, svn_string_t const * original, \n" " svn_string_t const * modified, apr_pool_t pool) -> svn_error_t\n" ""}, + { (char *)"svn_diff_mem_string_output_merge3", _wrap_svn_diff_mem_string_output_merge3, METH_VARARGS, (char *)"\n" + "svn_diff_mem_string_output_merge3(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, \n" + " svn_string_t const * latest, char const * conflict_original, \n" + " char const * conflict_modified, char const * conflict_latest, \n" + " char const * conflict_separator, svn_diff_conflict_display_style_t style, \n" + " svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n" + ""}, { (char *)"svn_diff_mem_string_output_merge2", _wrap_svn_diff_mem_string_output_merge2, METH_VARARGS, (char *)"\n" "svn_diff_mem_string_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, \n" " svn_string_t const * latest, char const * conflict_original, \n" @@ -9720,6 +10488,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"svn_patch_t_operation_get", _wrap_svn_patch_t_operation_get, METH_VARARGS, (char *)"svn_patch_t_operation_get(svn_patch_t self) -> svn_diff_operation_kind_t"}, { (char *)"svn_patch_t_reverse_set", _wrap_svn_patch_t_reverse_set, METH_VARARGS, (char *)"svn_patch_t_reverse_set(svn_patch_t self, svn_boolean_t reverse)"}, { (char *)"svn_patch_t_reverse_get", _wrap_svn_patch_t_reverse_get, METH_VARARGS, (char *)"svn_patch_t_reverse_get(svn_patch_t self) -> svn_boolean_t"}, + { (char *)"svn_patch_t_mergeinfo_set", _wrap_svn_patch_t_mergeinfo_set, METH_VARARGS, (char *)"svn_patch_t_mergeinfo_set(svn_patch_t self, apr_hash_t mergeinfo)"}, + { (char *)"svn_patch_t_mergeinfo_get", _wrap_svn_patch_t_mergeinfo_get, METH_VARARGS, (char *)"svn_patch_t_mergeinfo_get(svn_patch_t self) -> apr_hash_t"}, + { (char *)"svn_patch_t_reverse_mergeinfo_set", _wrap_svn_patch_t_reverse_mergeinfo_set, METH_VARARGS, (char *)"svn_patch_t_reverse_mergeinfo_set(svn_patch_t self, apr_hash_t reverse_mergeinfo)"}, + { (char *)"svn_patch_t_reverse_mergeinfo_get", _wrap_svn_patch_t_reverse_mergeinfo_get, METH_VARARGS, (char *)"svn_patch_t_reverse_mergeinfo_get(svn_patch_t self) -> apr_hash_t"}, { (char *)"new_svn_patch_t", _wrap_new_svn_patch_t, METH_VARARGS, (char *)"new_svn_patch_t() -> svn_patch_t"}, { (char *)"delete_svn_patch_t", _wrap_delete_svn_patch_t, METH_VARARGS, (char *)"delete_svn_patch_t(svn_patch_t self)"}, { (char *)"svn_patch_t_swigregister", svn_patch_t_swigregister, METH_VARARGS, NULL}, @@ -9779,7 +10551,7 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ static swig_type_info _swigt__p_apr_array_header_t = {"_p_apr_array_header_t", "apr_array_header_t *|svn_rangelist_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "apr_hash_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "svn_mergeinfo_t|apr_hash_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0, (void*)0, 0}; @@ -9788,6 +10560,7 @@ static swig_type_info _swigt__p_apr_uint32_t = {"_p_apr_uint32_t", "apr_uint32_t static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)|svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0}; @@ -9832,6 +10605,7 @@ static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_ static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0}; @@ -9878,6 +10652,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_char, &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, &_swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t, + &_swigt__p_f_p_void__p_svn_error_t, &_swigt__p_f_p_void__void, &_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t, &_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t, @@ -9922,6 +10697,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_svn_dirent_t, &_swigt__p_svn_errno_t, &_swigt__p_svn_error_t, + &_swigt__p_svn_fs_lock_target_t, &_swigt__p_svn_io_dirent2_t, &_swigt__p_svn_io_dirent_t, &_swigt__p_svn_io_file_del_t, @@ -9968,6 +10744,7 @@ static swig_cast_info _swigc__p_apr_uint32_t[] = { {&_swigt__p_apr_uint32_t, 0, static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = { {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t[] = { {&_swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = { {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void__void[] = { {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t[] = { {&_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -10012,6 +10789,7 @@ static swig_cast_info _swigc__p_svn_diff_t[] = { {&_swigt__p_svn_diff_t, 0, 0, static swig_cast_info _swigc__p_svn_dirent_t[] = { {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_errno_t[] = { {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_error_t[] = { {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = { {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_io_dirent2_t[] = { {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_io_dirent_t[] = { {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_svn_io_file_del_t[] = { {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -10058,6 +10836,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_char, _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, _swigc__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t, + _swigc__p_f_p_void__p_svn_error_t, _swigc__p_f_p_void__void, _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t, _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t, @@ -10102,6 +10881,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_svn_dirent_t, _swigc__p_svn_errno_t, _swigc__p_svn_error_t, + _swigc__p_svn_fs_lock_target_t, _swigc__p_svn_io_dirent2_t, _swigc__p_svn_io_dirent_t, _swigc__p_svn_io_file_del_t, @@ -10149,18 +10929,18 @@ static swig_const_info swig_const_table[] = { #endif /* ----------------------------------------------------------------------------- * Type initialization: - * This problem is tough by the requirement that no dynamic - * memory is used. Also, since swig_type_info structures store pointers to + * This problem is tough by the requirement that no dynamic + * memory is used. Also, since swig_type_info structures store pointers to * swig_cast_info structures and swig_cast_info structures store pointers back - * to swig_type_info structures, we need some lookup code at initialization. - * The idea is that swig generates all the structures that are needed. - * The runtime then collects these partially filled structures. - * The SWIG_InitializeModule function takes these initial arrays out of + * to swig_type_info structures, we need some lookup code at initialization. + * The idea is that swig generates all the structures that are needed. + * The runtime then collects these partially filled structures. + * The SWIG_InitializeModule function takes these initial arrays out of * swig_module, and does all the lookup, filling in the swig_module.types * array with the correct data and linking the correct swig_cast_info * structures together. * - * The generated swig_type_info structures are assigned staticly to an initial + * The generated swig_type_info structures are assigned staticly to an initial * array. We just loop through that array, and handle each type individually. * First we lookup if this type has been already loaded, and if so, use the * loaded structure instead of the generated one. Then we have to fill in the @@ -10170,17 +10950,17 @@ static swig_const_info swig_const_table[] = { * a column is one of the swig_cast_info structures for that type. * The cast_initial array is actually an array of arrays, because each row has * a variable number of columns. So to actually build the cast linked list, - * we find the array of casts associated with the type, and loop through it + * we find the array of casts associated with the type, and loop through it * adding the casts to the list. The one last trick we need to do is making * sure the type pointer in the swig_cast_info struct is correct. * - * First off, we lookup the cast->type name to see if it is already loaded. + * First off, we lookup the cast->type name to see if it is already loaded. * There are three cases to handle: * 1) If the cast->type has already been loaded AND the type we are adding * casting info to has not been loaded (it is in this module), THEN we * replace the cast->type pointer with the type pointer that has already * been loaded. - * 2) If BOTH types (the one we are adding casting info to, and the + * 2) If BOTH types (the one we are adding casting info to, and the * cast->type) are loaded, THEN the cast info has already been loaded by * the previous module so we just ignore it. * 3) Finally, if cast->type has not already been loaded, then we add that @@ -10243,7 +11023,7 @@ SWIG_InitializeModule(void *clientdata) { module_head->next = &swig_module; } - /* When multiple interpeters are used, a module could have already been initialized in + /* When multiple interpreters are used, a module could have already been initialized in a different interpreter, but not yet have a pointer in this interpreter. In this case, we do not want to continue adding types... everything should be set up already */ |