← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/svn/diff-cmd.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/svn/diff-cmd.c
37
37
#include "svn_types.h"
38
38
#include "svn_cmdline.h"
39
39
#include "svn_xml.h"
 
40
#include "svn_hash.h"
40
41
#include "cl.h"
41
42
 
42
43
#include "svn_private_config.h"
117
118
                        "kind", svn_cl__node_kind_str_xml(summary->node_kind),
118
119
                        "item", kind_to_word(summary->summarize_kind),
119
120
                        "props", summary->prop_changed ? "modified" : "none",
120
 
                        NULL);
 
121
                        SVN_VA_NULL);
121
122
 
122
123
  svn_xml_escape_cdata_cstring(&sb, path, pool);
123
124
  svn_xml_make_close_tag(&sb, pool, "path");
179
180
  const char *old_target, *new_target;
180
181
  apr_pool_t *iterpool;
181
182
  svn_boolean_t pegged_diff = FALSE;
 
183
  svn_boolean_t ignore_content_type;
182
184
  svn_boolean_t show_copies_as_adds =
183
185
    opt_state->diff.patch_compatible || opt_state->diff.show_copies_as_adds;
184
186
  svn_boolean_t ignore_properties =
211
213
      SVN_ERR(svn_cl__xml_print_header("diff", pool));
212
214
 
213
215
      sb = svn_stringbuf_create_empty(pool);
214
 
      svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "paths", NULL);
 
216
      svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "paths", SVN_VA_NULL);
215
217
      SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
216
218
    }
217
219
 
337
339
 
338
340
    }
339
341
 
 
342
  /* Should we ignore the content-type when deciding what to diff? */
 
343
  if (opt_state->force)
 
344
    {
 
345
      ignore_content_type = TRUE;
 
346
    }
 
347
  else if (ctx->config)
 
348
    {
 
349
      SVN_ERR(svn_config_get_bool(svn_hash_gets(ctx->config,
 
350
                                                SVN_CONFIG_CATEGORY_CONFIG),
 
351
                                  &ignore_content_type,
 
352
                                  SVN_CONFIG_SECTION_MISCELLANY,
 
353
                                  SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE,
 
354
                                  FALSE));
 
355
    }
 
356
  else
 
357
    {
 
358
      ignore_content_type = FALSE;
 
359
    }
 
360
 
340
361
  svn_opt_push_implicit_dot_target(targets, pool);
341
362
 
342
363
  iterpool = svn_pool_create(pool);
399
420
                     opt_state->diff.no_diff_added,
400
421
                     opt_state->diff.no_diff_deleted,
401
422
                     show_copies_as_adds,
402
 
                     opt_state->force,
 
423
                     ignore_content_type,
403
424
                     ignore_properties,
404
425
                     opt_state->diff.properties_only,
405
426
                     opt_state->diff.use_git_diff_format,
450
471
                     opt_state->diff.no_diff_added,
451
472
                     opt_state->diff.no_diff_deleted,
452
473
                     show_copies_as_adds,
453
 
                     opt_state->force,
 
474
                     ignore_content_type,
454
475
                     ignore_properties,
455
476
                     opt_state->diff.properties_only,
456
477
                     opt_state->diff.use_git_diff_format,