Public Git Hosting - svn/apache.git/log

Provide a way to limit the number of times svn_repos_history2() is
invoked/cancel out of it.

Expose a 'svnlook history --limit' option (with -l alias, a la 'svn log').

* subversion/include/svn_repos.h
  (svn_repos_history_func_t, svn_repos_history2): Document that this
   callback can return SVN_ERR_CEASE_INVOCATION.

* subversion/include/svn_error_codes.h
  (SVN_ERR_CEASE_INVOCATION): New error code used to indicate to a
   callback driver that invocation of the callback can cease, and that
   the driver function can (potentially) stop processing.

* subversion/libsvn_repos/rev_hunt.c
  Add import of svn_error_codes.h.
  (svn_repos_history2): Add handling for the SVN_ERR_CEASE_INVOCATION
   error code.

* subversion/svnlook/main.c
  Include stdlib.h for strtol().
  (options_table): Add a --limit option.
  (cmd_table): Support the 'history --limit' behavior.
  (svnlook_opt_state, svnlook_ctxt_t): Add a limit field.
  (print_history_baton): Add limit and count fields.
  (print_history): Handle history item limiting.
  (do_history): Drop SHOW_IDS parameter, which is available from the
   context.  Adjust implementation accordingly, passing C->limit
   parameter to the new limit field on the operation-specific baton.
   Use constant TRUE instead of magic number 1 for boolean value
   passed to svn_repos_history2().
  (get_ctxt_baton): Propogate limit parameter.
  (subcommand_history): Adjust for API change.
  (main): Add parsing for -l/--limit, cribbed from svn/main.c.

* subversion/tests/cmdline/svnlook_tests.py
  (limit_history): Add new test for 'svnlook history --limit'.
  (test_list): Add limit_history test to the list.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865917 13f79535-47bb-0310-9956-ffa450edef68

* subversion/svnlook/main.c
Include svn_error_codes.h for SVN_ERR_CANCELLED, etc.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865916 13f79535-47bb-0310-9956-ffa450edef68

Housekeeping.

* subversion/libsvn_client/merge.c
  (do_merge, do_single_file_merge): Change "!i" expression to "i ==
   0", since it is a numeric comparsion, rather than a boolean comparison.
  (single_file_merge_get_file): Add TODO item about creating temporary
   files retrieved from the repository to use in a 3-way merge in the
   .svn/tmp/ directory instead of in the working directory.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865915 13f79535-47bb-0310-9956-ffa450edef68

Tweak formatting.

* subversion/libsvn_client/merge.c
(do_single_file_merge): Add whitespace.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865914 13f79535-47bb-0310-9956-ffa450edef68

Adjust inline comment to more closely correspond to
svn_wc_notify_action_t enumeration names.

* subversion/libsvn_wc/props.c
(svn_wc__merge_props): Change the word `modified' to `changed' in
inline comment.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865913 13f79535-47bb-0310-9956-ffa450edef68

* subversion/mod_dav_svn/repos.c
(deliver): Followup to r25837 by teaching the HTML index to display
the basename just like the default XML index now does.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865912 13f79535-47bb-0310-9956-ffa450edef68

Add support for displaying the repository's basename in the
mod_dav_svn XML index view.

* subversion/mod_dav_svn/dav_svn.h
  (dav_svn_repos): Add new 'repo_basename' member.

* subversion/mod_dav_svn/repos.c
  (get_resource): Populate dav_svn_repos's new 'repo_basename' member.
  (deliver): Provide new 'repo_basename' value in XML output.

* tools/xslt/svnindex.xsl
  Update to handle display of the repository basename.

Patch by: Cliff Stanford <cliff@may.be>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865911 13f79535-47bb-0310-9956-ffa450edef68

Fix for issue #2848 - Make the svn_merge_range_t start field exclusive
of the range being described if start <= end, otherwise make the end field
exclusive.

This makes svn_merge_range_t's start and end fields analogous to the command
line's "-rX:Y" option.  Previously a command like 'svn merge %URL%
WCPATH -rX:Y' resulted in a svn_merge_range_t with start == X+1 and end == Y
(when X > Y).  With this patch start == X and end == Y.

This is immediately helpful for notifications of single revision subtractive
merges.  Where before 'svn merge %URL% WCPATH -cZ' *and*
'svn merge %URL% WCPATH -c-Z' both resulted in start == end == Z (and the
same notification), now the former results in start == Z-1, end == Z and the
latter start == Z, end == Z - 1.  This allows for more accurate merge
notifications in the single revision case.

Note that this patch in now way affects how we store svn:mergeinfo props,
those are still inclusive.

* subversion/libsvn_client/copy.c
  (get_implied_mergeinfo(): Make start rev of implied range exclusive.

* subversion/libsvn_client/merge.c
  (grok_range_info_from_opt_revisions): Leave start and end revs as-is from
   command line parsing.
  (do_merge): Stop tweaking start and end of range for calls to
  svn_client__get_diff_editor(), svn_ra_do_diff3(), and reporter->set_path(),
  the ranges from grok_range_info_from_opt_revisions() now work as-is.
  (do_single_file_merge): As above, but for calls to
  single_file_merge_get_file() and merge_file_changed().

* subversion/libsvn_repos/log.c
  (find_merge_source): Account for fact that range start is now exclusive.

* subversion/libsvn_subr/mergeinfo.c
  (combine_ranges, parse_revlist, range_intersect,
  rangelist_intersect_or_remove, svn_rangelist_count_revs,
  svn_rangelist_to_revs, svn_range_to_stringbuf): Account for fact that
  range start is now exclusive or in the case of reverse merges that the end
  range is exclusive.

* subversion/svn/notify.c
  (notify): Account for fact that range start or end is now exclusive.
  Change notification for subtractive merges.

* subversion/tests/cmdline/merge_tests.py
  (textual_merges_galore, merge_with_implicit_target_helper,
  merge_with_prev, merge_binary_with_common_ancestry, merge_dir_branches,
  mergeinfo_elision, empty_rev_range_mergeinfo): Update calls to
  svntest.main.merge_notify_line() to pass a negative number when reverse
  merging a single revision.

* subversion/tests/libsvn_subr/mergeinfo-test.c
  (mergeinfo_ranges, test_parse_combine_rangeinfo, test_diff_mergeinfo,
  test_rangelist_reverse, test_rangelist_intersect, test_merge_mergeinfo,
  test_remove_mergeinfo): Account for fact that range start is now exclusive.

* subversion/tests/cmdline/svntest/main.py
  (merge_notify_line): Adjust to expect new notifications.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865910 13f79535-47bb-0310-9956-ffa450edef68

* subversion/include/svn_fs.h:
Documentation grammar fix.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865909 13f79535-47bb-0310-9956-ffa450edef68

Reinstate an alternate incarnation of r25822, *really* fixing
administrative property file handling for prop changes to a file which
is subsequently copied/moved over another schedule-delete file, where
the original doesn't have any props (e.g. 'svn mv a b; svn ps name val
b; svn mv b a' is a 1.5-specific way to trigger this problem).

* subversion/libsvn_wc/update_editor.c
  (svn_wc_add_repos_file2): For schedule-delete files that have no
   (destination) base properties file, create an empty base props file
   with a temporary name.

Patch by: ehu

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865907 13f79535-47bb-0310-9956-ffa450edef68

A follow-up to r25829, adjusting expected help text for 'svn log'.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Add '-l' short option.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865906 13f79535-47bb-0310-9956-ffa450edef68

Perform a recursive commit, when only directories are marked

* trunk/contrib/client-side/emacs/psvn.el:
  (svn-status-only-dirs-or-nothing-marked-p): New function: Return t,
    when nothing is marked or when only directories are marked
  (svn-status-commit): Perform a recursive commit, when only
    directories are marked. As soon as some files are marked, do a non
    recursive commit

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865905 13f79535-47bb-0310-9956-ffa450edef68

Checkin latest thoughts on tree conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865904 13f79535-47bb-0310-9956-ffa450edef68

Support '-l' as a short option for 'log --limit'.

* subversion/svn/cl.h
  (svn_cl__longopt_t): Remove svn_cl__limit_opt.

* subversion/svn/main.c
  (svn_cl__options, svn_cl__cmd_table, main): Replace use of
   svn_cl__limit_opt with 'l'.

* subversion/tests/cmdline/log_tests.py
  (log_limit): Change one invocation of 'log --limit' to 'log -l'.

Suggested by: rooneg
              glasser

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865903 13f79535-47bb-0310-9956-ffa450edef68

Fix Python bindings for svn.ra.lock().

* subversion/bindings/swig/include/svn_containers.swg: Add Python
  typemap for apr_hash_t *path_revs.

* subversion/bindings/swig/svn_ra.i
  (svn_ra_lock_callback_t): Add Python typemap

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
  (svn_swig_py_path_revs_hash_from_dict): Add function for converting
  from dictionaries to apr_hash_t * mapping paths to revnums.

  (svn_swig_py_ra_lock_callback): Add Python wrapper for
  svn_ra_lock_callback_t

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
  (svn_swig_py_path_revs_hash_from_dict): Add prototype.

  (svn_swig_py_ra_lock_callback): Add prototype.

* subversion/bindings/swig/python/tests/ra.py
  (test_lock): Add test for svn.ra.lock()

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865902 13f79535-47bb-0310-9956-ffa450edef68

Revert r25822, an attempt at fixing busted administrative prop file
handling (e.g. for 'svn mv a b; svn ps name val b; svn mv b a'), which
in turn broke 'special_tests.py 7'.

Note: A solution which works for both cases was introduced in r25833.

* subversion/libsvn_wc/update_editor.c
(svn_wc_add_repos_file2): Switch back to using svn_wc__prop_base_path()
to get propfile_path.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865900 13f79535-47bb-0310-9956-ffa450edef68

Fix potential segfault from unassigned svn_wc_entry_t *, triggerable
when mergeinfo elision is attempted when the merge URLs don't match.

* subversion/libsvn_client/merge.c
  (get_wc_or_repos_mergeinfo): Change ENTRY parameter from ** to *,
   and assume that callers will provide it instead of it being
   returned by this function.  Adjust doc string and implementation
   accordingly.
  (do_merge, do_single_file_merge): Acquire an svn_wc_entry_t *
   corresponding to TARGET_WCPATH, so that one is always available.
   Adjust calls to get_wc_or_repos_mergeinfo() for API change.
  (svn_client_get_mergeinfo): Acquire an svn_wc_entry_t *
   corresponding to PATH_OR_URL (and add inline comment indicating
   that it's a WC path).  Adjust calls to get_wc_or_repos_mergeinfo()
   for API change.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865899 13f79535-47bb-0310-9956-ffa450edef68

Fix busted administrative prop file handling with
'svn mv a b; svn ps name val b; svn mv b a'.

Note: This change was reverted in r25826, because it broke
'special_tests.py 7'.  Some form of this change which works for both
cases will still be necessary.

* subversion/libsvn_wc/update_editor.c
  (svn_wc_add_repos_file2): For schedule-delete files that have no
   (destination) base properties file create an empty base props file
   in the .svn/tmp/ directory.

Patch by: ehu
          me

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865896 13f79535-47bb-0310-9956-ffa450edef68

Show a help text for the error message while commiting

* trunk/contrib/client-side/emacs/psvn.el:
  (svn-process-sentinel): Call svn-process-handle-error to handle
    error messages
  (svn-process-handle-error): New function, run svn-process-help-with-error-msg
    via electric-helpify
  (svn-process-help-with-error-msg): New function to provide help for some
    common error messages. At the moment the following message is
    handled: "Cannot non-recursively commit a directory deletion"

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865895 13f79535-47bb-0310-9956-ffa450edef68

clearly differentiate urls, directories, and repo-relative paths

* svn/trunk/contrib/client-side/svnmerge/svnmerge.py
fix comments, variable names for urls, directories, and
"repostitory-relative paths" to be more explicit and call the
repo-relative paths "path identifiers"

Reviewed by: Giovanni Bajo <rasky@develer.com>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865893 13f79535-47bb-0310-9956-ffa450edef68

Follow-up to r25810: spell new parameter name consistently (matching
the name in the actual implementation).

* subversion/include/svn_client.h
(svn_client_import3, svn_client_import2): Spell new parameter name
as "ignore_unknown_node_types".

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865892 13f79535-47bb-0310-9956-ffa450edef68

* svnmerge.py
(launch) force input to shlex.split to an ascii encoding, since
it can't handle multibyte unicode (in Python 2.4.3).

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865891 13f79535-47bb-0310-9956-ffa450edef68

* svnmerge/svnmerge.py, svnmerge/svnmerge_test.py
Comment changes accidentally omitted from r25813

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865890 13f79535-47bb-0310-9956-ffa450edef68

* contrib/client-side/svnmerge/svnmerge.py
  (block_metadata): New function
  (analyze_revs): Consider changes to blocked-prop as reflected revisions.

Patch by:  Giovanni Bajo <rasky@develer.com>
Review by: Raman Gupta <rocketraman@fastmail.fm>
           Giovanni Bajo <rasky@develer.com>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865889 13f79535-47bb-0310-9956-ffa450edef68

No logic change; a cleanup to use xml instead of regular expression
parsing.

* contrib/client-side/svnmerge/svnmerge.py
  (SvnLogParser):  New class.
  (get_copyfrom):  Use xml instead of regular expression to
  parse information from logs.

Patch by: Giovanni Bajo <rasky@develer.com> and Luke Call <lsuvkne@onemodel.org>
Review by: Giovanni Bajo <rasky@develer.com>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865888 13f79535-47bb-0310-9956-ffa450edef68

Uses new subprocess module for in launch(), when python version allows, for a
big performance benefit on some operating systems.  Faster because doesn't
try to close all (unused) file descriptors.

* svnmerge/svnmerge.py
  (launch):  Use subprocess module when possible for better performance.
* svnmerge/svnmerge_test.py
  (multilaunch):  No longer passing empty cmd strings.
  (testBlockMergeAndRollback, testMergeAndRollbackEmptyRevisionRange,
  testMergeAndRollback, testMergeWithPotentialPropertyConflict): Change
  quoting of log comment arguments for windows command parser, so they
  are kept together.

Patch by: Luke Call <lsuvkne@onemodel.org>
Review by: Dustin J. Mitchell <dustin@zmanda.com>
           Giovanni Bajo <rasky@develer.com>
(Dustin clarified comments; Dustin and Giovanni made helpful suggestions.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865887 13f79535-47bb-0310-9956-ffa450edef68

* contrib/client-side/svnmerge/svnmerge_test.py: fix testUninit,
  testBidirectionalMerges, and testBidirectionalMergesMultiBranches,
  which began failing in r22788, by forcing revisions at 'init' time
  and ignoring '--force' in the 'svn merge' commands generated by
  'svnmerge merge'.

Review by: Giovanni Bajo <rasky@develer.com>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865886 13f79535-47bb-0310-9956-ffa450edef68

* subversion/libsvn_client/commit.c (import_file): Remove dead code,
import_file() is only ever called if the node is known to be a file.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865885 13f79535-47bb-0310-9956-ffa450edef68

Implement enhancement issue #2806: 'svn import' errors on a tree with a socket

* subversion/include/svn_client.h
  subversion/libsvn_client/commit.c
  (svn_client_import3): New. Takes a ignore_unknown_node_kind parameter to
   do just that. Unknown nodes are device files, pipes, etc.
  (svn_client_import2): Document/Implement in terms of svn_client_import3,
   marking as deprecated.

* subversion/libsvn_client/commit.c
  (import_dir): Add ignore_unknown_node_types parameter. When TRUE,
   skip over unknown nodes, sending a notification.
  (import): Add ignore_unknown_node_types parameter, passing it on when
   importing directories.

* subversion/svn/main.c
  (svn_cl__cmd_table): Enable --force parameter for import, adjusting
   documentation.

* subversion/svn/import-cmd.c
  (svn_cl__import): Use svn_client_import3(), making import ignore
   svn_node_unknown nodes when --force is specified on the command line.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865884 13f79535-47bb-0310-9956-ffa450edef68

Accidental empty commit.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865879 13f79535-47bb-0310-9956-ffa450edef68

* subversion/svn/conflict-callbacks.c
  Include svn_types.h for the constant TRUE.
  (svn_cl__interactive_conflict_handler): Use constant TRUE instead of
   literal 1 for a "while" flow control loop.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865878 13f79535-47bb-0310-9956-ffa450edef68

A proposal about how to interactively deal with obstructed-addition conflicts.
Feedback desired!!

* subversion/svn/conflict-callbacks.c
(svn_cl__interactive_conflict_handler): handle obstructed-addition conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865877 13f79535-47bb-0310-9956-ffa450edef68

Fix Python bindings for svn.wc.get_prop_diffs().

* subversion/bindings/swig/include/svn_containers.swg:
  Add Python typemap for apr_array_header_t * of svn_prop_t *.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
  (svn_swig_py_proparray_to_dict): Rename from proparray_to_dict and
  make public.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
  (svn_swig_py_proparray_to_dict): Add public prototype.

* subversion/bindings/swig/python/tests/wc.py
  (test_get_prop_diffs): Add unit test for svn.wc.get_prop_diffs()

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865876 13f79535-47bb-0310-9956-ffa450edef68

French translation update.

* subversion/po/fr.po: po-update + cleaning

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865875 13f79535-47bb-0310-9956-ffa450edef68

Fix more of issue #756, making 'svn mv a b; svn mv b a' work -- or at
least, less broken -- for files.  Directories are not handled yet.

* subversion/libsvn_wc/copy.c
  (determine_copyfrom_info): Add a new DST_ENTRY parameter, use it to
   suppress copyfrom info when that of the source is identical to the
   destination.
  (copy_file_administratively, copy_dir_administratively): Update for
   API change.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865873 13f79535-47bb-0310-9956-ffa450edef68

Refactor to reduce code duplication.

* subversion/libsvn_wc/copy.c
  (determine_copyfrom_info): Add new helper function for determining
   copyfrom URL and revision.
  (copy_file_administratively, copy_dir_administratively): Factor out
   common code into determine_copyfrom_info(), and leverage this new
   routine.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865872 13f79535-47bb-0310-9956-ffa450edef68

Add a new section in tools containing the scripts used to run the buildbot
slaves.

Suggested by: ehu

* tools/buildbot/slaves/README: explains how to setup a buildbot slave.

* tools/buildbot/slaves/i686-debian-sarge1
* tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32
* tools/buildbot/slaves/win32-xp VS2005
* tools/buildbot/slaves/xp-vc60-ia32: scripts used by the debian, osx and
Windows buildbot slaves.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865871 13f79535-47bb-0310-9956-ffa450edef68

Remove reference to - now removed - sh based test scripts.

* www/build-farm.html: Remove stale reference.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865870 13f79535-47bb-0310-9956-ffa450edef68

Fix typo in doc string.

* subversion/include/svn_wc.h
(svn_wc_add_repos_file2): Change "base-text" to "text-base".

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865869 13f79535-47bb-0310-9956-ffa450edef68

Bugfix: conflict-callback should receive a 'repository normal' working-file.
(All four files it receives should be 'repository normal', in fact.)

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal):  pass the detranslated user file to callback,
                             not the original user file!  (This is the same
                             file already used by the diff3 algorithm.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865865 13f79535-47bb-0310-9956-ffa450edef68

* notes/sparse-directories.txt
Add all remaining tasks to the issue tracker, replacing them
with the query string needed to retrieve them.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865864 13f79535-47bb-0310-9956-ffa450edef68

Fix dumpfile example in notes/dump-load-format.txt.

Approved by: Daniel Rall <dlr@collab.net>

* notes/dump-load-format.txt: Fix character count for log message.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865863 13f79535-47bb-0310-9956-ffa450edef68

Handle an argument completion special case when a file is
scheduled for addition, but not committed yet.

* tools/client-side/bash_completion: comments and small fix

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865862 13f79535-47bb-0310-9956-ffa450edef68

Re-position mergeinfo-related helper routines in preparation for
implementing handling of implied merge info for WC -> WC copy
operations.

* subversion/libsvn_client/copy.c
(get_implied_mergeinfo, calculate_target_mergeinfo, extend_wc_mergeinfo):
Move routines up above the WC -> WC copy code.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865858 13f79535-47bb-0310-9956-ffa450edef68

Remove sh-based test scripts. We've been using buildbot quite successfully
over the past few months and lgo has added a nightly test functionality
too now.

The only people using these scripts now seem to use them for a one-off test
drive without taking the time to even do the most basic configuration
(fill in their e-mail address).

* tools/test-scripts/: Remove directory tree.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865855 13f79535-47bb-0310-9956-ffa450edef68

Document that the content of the files passed to conflict resolution
callback function will be in repository-normal format.

* subversion/include/svn_wc.h
(svn_wc_conflict_description_t): note the file format.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/ConflictDescriptor.java
* src/org/tigris/subversion/javahl/ConflictResolverCallback.java
Note the content of the files passed in ConflictDescriptor.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865854 13f79535-47bb-0310-9956-ffa450edef68

Sigh. Note about space-in-filename completion issue and
remove feeble attempt to solve it through IFS mangling.

* tools/client-side/bash_completion: fix + added comment

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865853 13f79535-47bb-0310-9956-ffa450edef68

Improved documentation as suggested by Karl Fogel.

* tools/client-side/bash_completion: more comments

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865852 13f79535-47bb-0310-9956-ffa450edef68

* COMMITTERS: Add myself as a full committer.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865851 13f79535-47bb-0310-9956-ffa450edef68

Fix issue #2762 by removing the ancient (pre-1.0) Subversion quickref
card.

It would be nice if someone had the time to revive this, but there is
a lot of other Subversion documentation available on the web which
serves this purpose.

* doc/user/svn-ref.tex: Remove.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865850 13f79535-47bb-0310-9956-ffa450edef68

JavaHL: Expose an "ignore externals" parameter for the 'switch' API
(issue #2189), fixing a build error introduced in r25766.

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/SVNClientInterface.java
* src/org/tigris/subversion/javahl/SVNClientSynchronized.java
* src/org/tigris/subversion/javahl/SVNClient.java
* native/SVNClient.h
* native/SVNClient.cpp
  (doSwitch): Add new ignoreExternals parameter, and propogate it as
   appropriate.

* native/org_tigris_subversion_javahl_SVNClient.cpp
  (Java_org_tigris_subversion_javahl_SVNClient_doSwitch): Same.

* tests/org/tigris/subversion/javahl/BasicTests.java
  (testObstructionTolerance): Pass ignoreExternals parameter to doSwitch().

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865848 13f79535-47bb-0310-9956-ffa450edef68

Improved bash completion based on a preliminary patch by Krzysiek Pawlik.

File arguments in the working copy are completed based on the current
subversion subcommand, by invoking 'svn status' and filtering its output.
For instance, only modified files are completed for 'revert', and so on.

The status invocation while completing may be costly, especially if
recursive or if externals are followed. However the repos is not accessed.

Full activation is achieved by setting environment variable SVN_BASH_COMPL_EXT
to 'svnstatus recurse externals'.  Both later options seem quite unadvisable
on large working copies, but the simple 'svnstatus' version is reasonable.

Completion outside a working copy results in an error message.

This addition is safe as it is not activated by default.
Basic tests are okay with bash 2.05b and 3.1.17.

* tools/client-side/bash_completion:
  - _svn_grcut and _svn_lls support functions added.
    these functions do not rely on anything but the shell.
  - better completion for file arguments in working copy.
  - more ".svn" special-directory occurences are filtered out.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865847 13f79535-47bb-0310-9956-ffa450edef68

Follow-up to r25766.

* subversion/tests/cmdline/getopt_tests_data
(svn_help_log_switch_stdout): Add the new --ignore-externals option to the
help output.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865845 13f79535-47bb-0310-9956-ffa450edef68

Follow-up to r25766.

* subversion/libsvn_client/externals.c
(switch_external): Pass ignore_externals=FALSE to
svn_client__switch_internal().

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865841 13f79535-47bb-0310-9956-ffa450edef68

Finish the last part of issue #2189: add support for --ignore-externals to
svn switch.

* subversion/include/svn_client.h
  (svn_client_switch2): Add and document a new ignore_externals argument.
  (svn_client_switch): Update docstring.

* subversion/libsvn_client/client.h
  (svn_client__switch_internal): Add and document a new ignore_externals
   argument.

* subversion/libsvn_client/switch.c
  (svn_client__switch_internal): Check ignore_externals before processing
   externals.  While we're here, also check depth, for symmetry with
   svn_client__update_internal().
  (svn_client_switch2, svn_client_switch): Update calls to
   svn_client__switch_internal().

* subversion/svn/switch-cmd.c
  (svn_cl__switch): Pass opt_state->ignore_externals to svn_client_switch2().

* subversion/svn/main.c
  (svn_cl__cmd_table): Add svn_cl__ignore_externals_opt to the list of options
   for "switch".

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865840 13f79535-47bb-0310-9956-ffa450edef68

* subversion/libsvn_client/client.h:
Remove an empty line and trim trailing whitespace.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865839 13f79535-47bb-0310-9956-ffa450edef68

* subversion/include/svn_wc.h
(svn_wc_ensure_adm3):
In the docs for the function, add a period to finish a sentence.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865838 13f79535-47bb-0310-9956-ffa450edef68

Change "revert" terminology to "rollback" throughout to differentiate
between Subversion's 'revert' subcommand and a subtractive 'merge'.

* subversion/libsvn_client/merge.c
  Rename is_revert variables to is_rollback throughout.
  (enum merge_type): Rename merge_type_revert to merge_type_rollback,
   and adjust indentation level accordingly.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865837 13f79535-47bb-0310-9956-ffa450edef68

Account for the move of the list of outstanding merge tracking tasks
into the issue tracker.

* www/merge-tracking/index.html
(internal): Improve status summary, and provide issue tracker query linkage.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865836 13f79535-47bb-0310-9956-ffa450edef68

Move the list of outstanding merge tracking tasks into the issue tracker.

* notes/merge-tracking.txt
Replace task list with pointers to new content location(s).

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865835 13f79535-47bb-0310-9956-ffa450edef68

Updated italian translation.

* subversion/po/it.po: - Fixed all fuzzy translations and translated
remaining messages.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865831 13f79535-47bb-0310-9956-ffa450edef68

* notes/dump-load-format.txt: Rearrange to be more like a format spec.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865830 13f79535-47bb-0310-9956-ffa450edef68

* notes/dump-load-format.txt: New name for fs_dumprestore.txt, which
was a counterintuitive and completion-unfriendly name.

* notes/fs_dumprestore.txt: Leave forwarding pointer here.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865829 13f79535-47bb-0310-9956-ffa450edef68

* www/mailing-list-guidelines.html
(look-first): Make this a subsection of "When to post".

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865828 13f79535-47bb-0310-9956-ffa450edef68

* www/mailing-list-guidelines.html
(bug-reports): Fix h2 vs h3 disagreement, following up to r25751.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865827 13f79535-47bb-0310-9956-ffa450edef68

* www/mailing-list-guidelines.html
(look-first): Replaces former "archives" section, rewritten.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865826 13f79535-47bb-0310-9956-ffa450edef68

* www/mailing-list-guidelines.html (bug-reports): New section.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865825 13f79535-47bb-0310-9956-ffa450edef68

There is nothing to translate in "\n\n".

* subversion/svn/conflict-callbacks.c: non-translatable string.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865823 13f79535-47bb-0310-9956-ffa450edef68

French translation update.

* subversion/po/fr.po: po-update + fixes

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865822 13f79535-47bb-0310-9956-ffa450edef68

Check results of apr_uri_parse() in libsvn_ra_serf.

* subversion/libsvn_ra_serf/commit.c
* subversion/libsvn_ra_serf/serf.c
* subversion/libsvn_ra_serf/update.c
  (add_directory, close_file, svn_ra_serf__open,
   svn_ra_serf__reparent, link_path): Check apr_uri_parse() result and
   generate an error on failure.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865821 13f79535-47bb-0310-9956-ffa450edef68

Address part of issue #2207: libsvn_ra_neon should check results from
ne_uri_parse().

* libsvn_ra_neon/commit.c
(checkout_resource): Check ne_uri_parse() result
and generate an error on failure.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865820 13f79535-47bb-0310-9956-ffa450edef68

Address part of issue #2207: libsvn_ra_neon should check results from
ne_uri_parse().

* libsvn_ra_neon/lock.c
(do_lock): Check ne_uri_parse() result.
(do_unlock): Synchronize error message with do_lock().

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865819 13f79535-47bb-0310-9956-ffa450edef68

Address part of issue #2207: libsvn_ra_neon should check results from
ne_uri_parse().

* subversion/libsvn_ra_neon/props.c
  (assign_rsrc_url): Change signature to allow returning an
   error in case the url doesn't parse.
  (end_element): Adjust caller.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865818 13f79535-47bb-0310-9956-ffa450edef68

Address part of issue #2207: libsvn_ra_neon should check results from
ne_uri_parse().

As suggested by glasser and me, anything but the URLs passed into Neon
should be parsed with apr_uri_parse(). Change svn_ra_neon__copy_href
accordingly.

* subversion/libsvn_ra_neon/ra_neon.h
* subversion/libsvn_ra_neon/util.c
  (svn_ra_neon__copy_href): Change declaration and
   implementation in order to be able to use apr_uri_parse().

* subversion/libsvn_ra_neon/merge.c (end_element)
* subversion/libsvn_ra_neon/fetch.c
  (end_element): Adjust callers.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865817 13f79535-47bb-0310-9956-ffa450edef68

Update svn_global.swg to clear the 'long long' and 'unsigned long long'
typemaps. Update SWIG build infrastructure to remove the SWIG checkout
system, which is now no longer needed.

Patch by: me
          joeswatosh

* subversion/bindings/swig/include/svn_global.swg:
  Clear the 'long long' and 'unsigned long long' typemaps.

* build.conf
  (swig-checkout-files): Remove.

* build/generator/gen_make.py
  build/generator/gen_win.py:
  (Generator.write): Remove logic for calling swig_checkout_files.

* build/generator/swig/__init__.py:
  (Generator.__init__): Remove logic for grabbing swig_checkout_files
  from build.conf.

* build/generator/swig/checkout_swig_header.py:
  Remove now-unneeded file.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865814 13f79535-47bb-0310-9956-ffa450edef68

* subversion/libsvn_wc/merge.c
(svn_wc__merge_internal): Remove unused local variables named
"conflict_err".

Found by: Senthil Kumaran S <senthil@collab.net>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865812 13f79535-47bb-0310-9956-ffa450edef68

* www/faq.html (switch-problems): Minor cleanups.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865811 13f79535-47bb-0310-9956-ffa450edef68

* www/faq.html (switch-problems): New entry.

Patch by: James Coleman <jamesc{_AT_}dspsrv.com>
(Tweaked by me.)

[Also, restore "</div>" tag wrongly removed in r25734.]

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865810 13f79535-47bb-0310-9956-ffa450edef68

* www/faq.html: Remove extra link accidentally committed in r25732.
It doesn't belong here yet.

Found by: glasser

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865809 13f79535-47bb-0310-9956-ffa450edef68

* www/faq.html (ssl-negotiation-error): Remove spurious "</div>" tag.

Patch by: James Coleman <jamesc{_AT_}dspsrv.com>
(Tweaked by me.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865808 13f79535-47bb-0310-9956-ffa450edef68

* www/faq.html (more-information): Fix target link name -- it's
"moderation" not "moderated".

Patch by: James Coleman <jamesc{_AT_}dspsrv.com>
(Tweaked by me.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865807 13f79535-47bb-0310-9956-ffa450edef68

* www/faq.html (table of contents): Add missing "#broken-subclipse" link.

Patch by: James Coleman <jamesc{_AT_}dspsrv.com>
(Tweaked by me.)

[This commit accidentally included part of another change; I reverted
that part in r25735.]

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865806 13f79535-47bb-0310-9956-ffa450edef68

* notes/merge-tracking.txt
Add todo for not updating mergeinfo when there have been no changes in
merge source.

Approved by: dlr

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865805 13f79535-47bb-0310-9956-ffa450edef68

A follow-up to r25717 adding some javah-generated JavaHL C header
files.

* build.conf
(private-built-includes): Add conflict resolution callback-related
header files.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865804 13f79535-47bb-0310-9956-ffa450edef68

JavaHL: A follow-up to r25717 removing some commented-out code.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java
(testMergeConflictResolution): Remove commented line.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865803 13f79535-47bb-0310-9956-ffa450edef68

JavaHL: A follow-up to r25717 removing a stray debugging statement.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java
(testMergeConflictResolution): Remove println().

Found by: markphip

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865802 13f79535-47bb-0310-9956-ffa450edef68

Revert my stupid commit miss. I'm so sorry.

* contrib/client-side/emacs/psvn.el: Revert r25718.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865801 13f79535-47bb-0310-9956-ffa450edef68

* COMMITTERS: add rocketraman (Raman Gupta) as partial committer for svnmerge.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865800 13f79535-47bb-0310-9956-ffa450edef68

* notes/merge-tracking.txt
Add possible merge tracking related bug in reporting property conflicts
on folders.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865799 13f79535-47bb-0310-9956-ffa450edef68

Satisfy my OCD by updating the Security Space survey for July 2007.

* www/svn-dav-securityspace-survey.html,
  www/images/svn-dav-securityspace-survey.png,
  tools/dev/graph-dav-servers.py:
  Update image and table.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865794 13f79535-47bb-0310-9956-ffa450edef68

Make conflict prompt elegantly deal with lack of $EDITOR.

* subversion/svn/conflict-callbacks.c
(svn_cl__interactive_conflict_handler): if no $EDITOR exists, catch error,
print and clear it, then re-prompt.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865793 13f79535-47bb-0310-9956-ffa450edef68

Commit miss. This change is reverted in r25727.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865792 13f79535-47bb-0310-9956-ffa450edef68

JavaHL: Complete the addition of conflict resolution bindings (based
on r25670).

[ in subversion/bindings/javahl/ ]

* src/org/tigris/subversion/javahl/ConflictResolverCallback.java
  (resolve): Change method return type from void to int (Result), and
   tweak JavaDoc accordingly.
  (Result): Add new inner class which provides a poor man's enum for
   svn_wc_conflict_result_t.

* src/org/tigris/subversion/javahl/ConflictDescriptor.java
  (action, reason, getAction, getReason): Change data type from Object
   (a placeholder) to int (see Action and Reason below).  Add JavaDoc
   @see tags.
  (ConflictDescriptor): Change corresponding parameters.
  (getNodeKind): Add JavaDoc @see tag.
  (Action, Reason): Add new inner class which provides a poor man's enum for
   svn_wc_conflict_action_t and svn_wc_conflict_reason_t.

* native/SVNClient.cpp
  (SVNClient): Null out m_conflictResolver.
  (~SVNClient): Delete m_conflictResolver.
  (getContext): Set the conflict_func and conflict_baton fields for
   the returned svn_client_ctx_t.

* native/ConflictResolverCallback.h
* native/ConflictResolverCallback.cpp
  (resolve): Tweak doc string.  Adjust for Java API changes.  Use new
   enum value conversion routines.  Convert any exception thrown by
   the Java resolve() API into an svn_error_t *.
  (javaResultToC): Add method to convert the Java conflict resolution
   result data type into the C enum value.

* native/EnumMapper.h
* native/EnumMapper.cpp
  Replace crufty VC++ include-only-once directives with something cleaner.
  (mapConflictAction, mapConflictReason): Add new functions for
   converting from C conflict enum values to Java equivalents.

* tests/org/tigris/subversion/javahl/BasicTests.java
  (testMergeConflictResolution): Add new test for automated merge
   conflict resoultion.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@865791 13f79535-47bb-0310-9956-ffa450edef68