← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to subversion/bindings/swig/svn_wc.i

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2006-12-13 17:57:16 UTC
  • mfrom: (1.1.6 upstream) (0.1.3 etch)
  • Revision ID: james.westby@ubuntu.com-20061213175716-2ysv6z4w5dpa2r2f
Tags: 1.4.2dfsg1-2ubuntu1
* Merge with Debian unstable; remaining changes:
  - Create pot file on build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/bindings/swig/svn_wc.i
51
51
    svn_wc_entry_t **,
52
52
    svn_wc_adm_access_t **,
53
53
    svn_wc_status_t **,
54
 
    svn_wc_status2_t **
 
54
    svn_wc_status2_t **,
 
55
    svn_wc_revision_status_t **
55
56
};
56
57
 
57
 
/* svn_wc_check_wc(wc_format) */
58
 
%apply int *OUTPUT { int * };
 
58
/*
 
59
   svn_wc_check_wc(wc_format)
 
60
   svn_wc_merge(wc_format)
 
61
*/
 
62
%apply int *OUTPUT {
 
63
  int *,
 
64
  enum svn_wc_merge_outcome_t *
 
65
};
59
66
 
60
67
/*
61
68
   svn_wc_prop_list()
73
80
 
74
81
%apply apr_hash_t *PROPHASH {
75
82
  apr_hash_t *baseprops,
 
83
  apr_hash_t *new_base_props,
76
84
  apr_hash_t *new_props
77
85
};
78
86
 
82
90
    const char *diff3_cmd,
83
91
    const char *uuid,
84
92
    const char *repos,
 
93
    const char *new_text_path,
85
94
    const char *copyfrom_url,
86
95
    const char *rev_date,
87
 
    const char *rev_author
88
 
}
 
96
    const char *rev_author,
 
97
    const char *trail_url
 
98
}
 
99
 
 
100
/* svn_wc_transmit_text_deltas2() */
 
101
%apply (const svn_delta_editor_t *EDITOR, void *BATON)
 
102
{
 
103
  (const svn_delta_editor_t *editor, void *file_baton),
 
104
  (const svn_delta_editor_t *editor, void *baton)
 
105
}
 
106
 
89
107
 
90
108
%apply const char **OUTPUT { char **url };
91
109
 
192
210
}
193
211
 
194
212
/* -----------------------------------------------------------------------
 
213
   apr_array_header_t *merge_options
 
214
   svn_wc_merge2()
 
215
*/
 
216
%typemap(ruby, in) apr_array_header_t *merge_options
 
217
{
 
218
  if (NIL_P($input)) {
 
219
    $1 = NULL;
 
220
  } else {
 
221
    VALUE rb_pool;
 
222
    apr_pool_t *pool;
 
223
 
 
224
    svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &pool);
 
225
    $1 = svn_swig_rb_array_to_apr_array_prop($input, pool);
 
226
  }
 
227
}
 
228
 
 
229
/* -----------------------------------------------------------------------
195
230
   Callback: svn_wc_notify_func_t
196
231
   svn_client_ctx_t
197
232
   svn_wc many
268
303
}
269
304
 
270
305
/* -----------------------------------------------------------------------
271
 
   Callback: svn_wc_relocation_validator_t
272
 
   svn_wc_relocate()
 
306
   Callback: svn_wc_relocation_validator2_t
 
307
   svn_wc_relocate2()
273
308
*/
274
309
 
275
 
%typemap(ruby, in) (svn_wc_relocation_validator_t validator,
 
310
%typemap(ruby, in) (svn_wc_relocation_validator2_t validator,
276
311
                    void *validator_baton)
277
312
{
278
 
  $1 = svn_swig_rb_wc_relocation_validator;
 
313
  $1 = svn_swig_rb_wc_relocation_validator2;
279
314
  $2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
280
315
}
281
316
 
282
317
/* ----------------------------------------------------------------------- */
283
318
 
284
319
%{
 
320
#include "svn_md5.h"
 
321
 
285
322
#ifdef SWIGPYTHON
286
323
#include "swigutil_py.h"
287
324
#endif