Kannan R <kannanr@collab.net>

Found	Patch	Suggested
r887187, r884394	r907615, r906897, r901797, r899272, r896068, r887476, r887469, r887205, r887187, r885507, r884792, r884126, r881223, r880751, r880578, r880517, r880333, r880297, r880276, r880146, r879234	r884576

r907615 | julianfoad | 2010-02-08 04:55:56 -0600 (Mon, 08 Feb 2010)

Upgrade from calling svn_path_url_add_component() to calling
svn_path_url_add_component2(), and so resolve some deprecation warnings.

* subversion/libsvn_ra_neon/commit.c
  (get_version_url, create_activity, commit_add_dir, commit_add_file
   commit_close_file, add_child, commit_delete_entry): Use
    'svn_path_url_add_component2()'.

Patch by: Kannan R <kannanr{_AT_}collab.net>

r906897 | julianfoad | 2010-02-05 05:00:37 -0600 (Fri, 05 Feb 2010)

Follow-up r901797: ensure the URLs in libsvn_ra_neon are always canonical.

* subversion/libsvn_ra_neon/props.c
  (end_element): Canonicalize the URL read from an "href" element in the
    other code path. (One code path was fixed in r901797.)

Patch by: Kannan R <kannanr{_AT_}collab.net>
Suggested by: julianfoad

r901797 | julianfoad | 2010-01-21 11:40:50 -0600 (Thu, 21 Jan 2010)

Ensure the URLs in libsvn_ra_neon are always canonical.

* subversion/libsvn_ra_neon/ra_neon.h
  (svn_ra_neon__request_get_location): Update doc string to reflect that
   it returns a canonicalized URL.

* subversion/libsvn_ra_neon/util.c
  (svn_ra_neon__request_get_location): Canonicalize the 'BASE URL' as
   per the rule.

* subversion/libsvn_ra_neon/props.c
  (end_element): Same.

* subversion/libsvn_ra_neon/options.c
  (end_element): Same.

Found by: stsp
Suggested by: stsp
              julianfoad
Patch by: Kannan R <kannanr{_AT_}collab.net>

r899272 | cmpilato | 2010-01-14 10:25:08 -0600 (Thu, 14 Jan 2010)

Make `--set-depth (empty|files|immediates) DIR' work, where DIR's depth
had already been set as `exclude'.  Only `infinity' works as of now.
Adding a test for the same.

* subversion/libsvn_wc/crop.c
  (svn_wc_crop_tree2): Check the 'base status' of the node here and
    remove the check done using `svn_wc__db_node_hidden()' as it
    marks  a node as 'hidden' if status is set as
    `svn_wc__db_status_excluded'.

* subversion/libsvn_wc/update_editor.c
  (complete_directory): Call `svn_wc__set_depth' with the requested
    depth rather than `infinity' by default.

* subversion/tests/cmdline/depth_tests.py
  (update_excluded_path_sticky_depths): New test.
  (info_excluded): Remove the locally imported module `re' and make it
    globally available.
  (test_list): Add `update_excluded_path_sticky_depths'.

Suggested by: rhuijben
Patch by: Kannan R <kannanr@collab.net>
          (Tweaked by me.)

r896068 | julianfoad | 2010-01-05 08:41:41 -0600 (Tue, 05 Jan 2010)

Fix a typo and perform minor formatting tweaks.

* notes/tree-conflicts/use-cases.txt
  Add some clarity by including the 'Developer' info and a minor
  formatting tweak.

* subversion/libsvn_wc/adm_crawler.c
  (report_revisions_and_depths): s/treate/treat/

Patch by: Kannan R <kannanr{_AT_}collab.net>

r887476 | julianfoad | 2009-12-04 19:02:48 -0600 (Fri, 04 Dec 2009)

A minor code simplification: eliminate a variable.

* subversion/libsvn_client/log.c
  (svn_client_log5): Remove the bool variable `is_url' which is used only
    once, and move the `svn_path_is_url(path)' call to the point of use.

Patch by: Kannan R <kannanr{_AT_}collab.net>

r887469 | julianfoad | 2009-12-04 18:38:37 -0600 (Fri, 04 Dec 2009)

Fix some more instances of calling svn_dirent_get_absolute() on a URL,
following up on [1].

* subversion/libsvn_client/log.c
  (svn_client_log5): Check the type of the path and invoke
    'svn_dirent_get_absolute()' only if it is a WC path. Rename the
    variable `local_abspath' to `local_abspath_or_url' as it holds either
    a WC abs-path or a URL.

Patch by: Kannan R <kannanr{_AT_}collab.net>

[1]-http://svn.apache.org/viewvc?rev=887187&view=rev

r887205 | julianfoad | 2009-12-04 08:14:17 -0600 (Fri, 04 Dec 2009)

Make svn error out gracefully when invalid revision keywords
(BASE|PREV|COMMITTED) are used with a URL, hereby extending to all
subcommands. Previously it was handled gracefully only for merge, diff,
copy, log.

* subversion/libsvn_client/revisions.c
  (svn_client__get_revision_number): If the incoming path is a URL
    demanding a wc revision argument, error out gracefully.

* subversion/libsvn_client/merge.c
  (normalize_merge_sources): Remove the redundant checking code.

* subversion/libsvn_client/diff.c
  (check_paths): Same.

* subversion/libsvn_client/log.c
  (svn_client_log5): Same.

* subversion/libsvn_client/copy.c
  (try_copy): Same.

Patch by: Kannan R <kannanr{_AT_}collab.net>

r887187 | julianfoad | 2009-12-04 07:35:15 -0600 (Fri, 04 Dec 2009)

Fix some instances of calling svn_dirent_get_absolute() on a URL, that were
introduced recently. (No test failures were observed from this bug.)

* subversion/libsvn_client/merge.c
  (normalize_merge_sources): Check the type of the path and invoke
    svn_dirent_get_absolute() only if it is a WC path. Rename the
    variable `source_abspath' to `source_abspath_or_url' as it holds either
    a WC abs-path or a URL.

* subversion/libsvn_client/ra.c
  (svn_client__repos_locations): As above.

* subversion/libsvn_client/blame.c
  (svn_client_blame5): As above.

Found by: Kannan R <kannanr{_AT_}collab.net>
          me
Patch by: Kannan R <kannanr{_AT_}collab.net>
          me

r885507 | stylesen | 2009-11-30 11:17:40 -0600 (Mon, 30 Nov 2009)

Resolve a deprecation warning using the new dirent/URI/path functions.

* subversion/svn/checkout-cmd.c
 (svn_cl__checkout): Use `svn_dirent_join()'.

Patch by: Kannan R <kannanr@collab.net>

r884792 | stylesen | 2009-11-27 03:26:48 -0600 (Fri, 27 Nov 2009)

Resolve deprecation warnings in 'svnadmin', using the new
dirent/URI/path functions.

* subversion/svnadmin/main.c
 (main): Use `svn_dirent_canonicalize()'.
 (list_dblogs): Use `svn_dirent_join()'.

Patch by: Kannan R <kannanr@collab.net>
(Tweaked by me, formatting only)

r884576 | julianfoad | 2009-11-26 09:23:44 -0600 (Thu, 26 Nov 2009)

Make "diff" fail gracefully if a revision kind COMMITTED or PREVIOUS or BASE
is used with a URL. Previously only BASE was handled gracefully, and only in
the non-summarizing diff; any other case resulted in a cryptic error message.
Also make the error message the same as the one in "merge" (see:
<http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2417716>).

Suggested by: Kannan R <kannanr{_AT_}collab.net>

* subversion/libsvn_client/diff.c
  (check_paths): If a URL is used with a revision kind that requires a WC,
    throw an error with an appropriate message.
  (svn_client_diff_peg5): Remove the check for the revision kind BASE, as
    it is now included in check_paths().

r884394 | bhuvan | 2009-11-25 21:40:37 -0600 (Wed, 25 Nov 2009)

Follow-up for r884002.

* subversion/libsvn_subr/utf.c
  (fuzzy_escape): Fix a comment to denote NUL character.

Found by: Kannan R <kannanr@collab.net>
Suggested by: stsp

r884126 | julianfoad | 2009-11-25 08:56:36 -0600 (Wed, 25 Nov 2009)

* subversion/libsvn_fs_fs/structure
  Fix typos.

Patch by: Kannan R <kannanr{_AT_}collab.net>

r881223 | stsp | 2009-11-17 03:56:29 -0600 (Tue, 17 Nov 2009)

Resolve some deprecation warnings in svnlook, using the new dirent/URI
path functions.

* subversion/svnlook/main.c
 (print_dirs_changed_tree, print_changed_tree, print_diff_tree): Use
  `svn_dirent_join()'.

Patch by: Kannan R <kannanr@collab.net>

r880751 | julianfoad | 2009-11-16 07:52:54 -0600 (Mon, 16 Nov 2009)

Use the new dirent/URI/path functions to resolve some deprecation warnings.

* subversion/svn/checkout-cmd.c
  (svn_cl__checkout): Use 'svn_uri_canonicalize()'.

Patch by: Kannan R <kannanr@collab.net>

r880578 | pburba | 2009-11-13 13:36:17 -0600 (Fri, 13 Nov 2009)

Improve error message for invalid revision keywords from a URL merge source.

* subversion/libsvn_client/merge.c
  (normalize_merge_sources): Error out early when invalid revision keywords
   are specified with a URL merge source rather than proceeding and
   eventually returning a decidedly cryptic error -- see
   http://svn.haxx.se/dev/archive-2009-11/0603.shtml.

Patch by: Kannan R <kannanr{_AT_}collab.net>
Tweaked by: me

r880517 | julianfoad | 2009-11-10 10:00:31 -0600 (Tue, 10 Nov 2009)

Resolve some deprecation warnings.

* subversion/libsvn_client/list.c
 (get_dir_contents): Use `svn_relpath_join()' and `svn_uri_join()'.

Patch by: Kannan R <kannanr{_AT_}collab.net>

r880333 | blair | 2009-10-28 14:15:13 -0500 (Wed, 28 Oct 2009)

* subversion/bindings/javahl/native/SVNAdmin.cpp,
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c,
* subversion/libsvn_client/mergeinfo.c,
* subversion/libsvn_client/status.c,
* subversion/libsvn_subr/dirent_uri.c,
* subversion/libsvn_wc/ambient_depth_filter_editor.c,
* subversion/libsvn_wc/context.c,
* subversion/tests/libsvn_delta/window-test.c:
  Remove an extra semicolon.

Patch by: Kannan R <kannanr@collab.net>
          me

r880297 | stsp | 2009-10-26 07:36:15 -0500 (Mon, 26 Oct 2009)

Resolve "format not a string literal and no format arguments found" warning.

* subversion/libsvn_subr/io.c
 (do_io_file_wrapper_cleanup): Add the format specifier "%s", which
  fixes the warning.

Patch by: Kannan R <kannanr@collab.net>
Review by: brane

r880276 | julianfoad | 2009-10-23 10:59:03 -0500 (Fri, 23 Oct 2009)

Use new dirent/URI/path functions to resolve some deprecation warnings.
Also fix a bit of indentation.

* subversion/libsvn_ra_neon/commit.c
  (get_version_url, create_activity, commit_delete_entry, commit_add_dir,
   commit_add_file, commit_close_file): Use `svn_path_url_add_component2()'.
  (add_child): Use `svn_path_url_add_component2()' and `svn_uri_join()'.
  (checkout_resource): Use `svn_relpath_local_style()'.
  (get_child_tokens): Use `svn_uri_is_child()'.

Patch by: Kannan R <kannanr@collab.net>

r880146 | julianfoad | 2009-10-16 05:24:48 -0500 (Fri, 16 Oct 2009)

When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Pass `dry_run' parameter to the required
    methods.
  (apply_single_prop_add, apply_single_prop_delete,
   apply_single_prop_change, apply_single_generic_prop_change,
   apply_single_mergeinfo_prop_change): Pass `dry_run' to
    `maybe_generate_propconflict'
  (maybe_generate_propconflict): Check for `--dry-run' mode and set the
    boolean `conflict_remains', instead of invoking the interactive
    callback.

Patch by: Kannan R <kannanr@collab.net>

r879234 | stylesen | 2009-09-07 03:11:07 -0500 (Mon, 07 Sep 2009)

Fix typos.

* subversion/libsvn_wc/README
  (): s/is/it/

* subversion/libsvn_client/client.h
  (svn_client__checkout_internal): In the comment s/of/on/

* notes/wc-ng-design
  (): s/working/working copy/

Patch by: Kannan R <kannanr@collab.net>