Public Git Hosting - svn/apache.git/log

Work on issue #1230:  a dedicated 'svn export' editor.

This change adds keyword-expansion support to the export editor, but
it isn't working properly yet.  Can someone enable the export editor
and take a look at the problem?  I'm mystified here.

[ If a file has the svn:keywords property, it's being created as a
  0-byte file for some unexplainable reason.  If you comment out the
  registration of change_file_prop in svn_client__get_export_editor,
  the problem goes away.  And in gdb, it seems that the tmpfile is
  *already* 0 bytes right before we call svn_subst_copy_and_translate! ]

* export.c (struct edit_baton, svn_client__get_export_editor): grow
  new 'root url' field.

  (svn_client_export):  update caller.

  (struct file_baton): lose the props hash, and grow specific
  property fields, as well as a keywords structure.

  (add_file): don't initialize the props hash.

  (change_file_prop): look for six specific properties, and store them
  in the new file_baton fields.

  (build_final_keyword_struct): new helper function.

  (close_file): if there's no eol-style or keywords property, then do
  a rename.  if either prop exists, then do a cp_and_translate... and
  use the fb keyword structure too, after finalizing it with the
  helper function.

* client.h (svn_client__get_export_editor):  update declaration, new
  'root url' field.

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

* subversion/mod_dav_svn/repos.c
  (dav_svn_getetag): Add a little comment explaining the reason for
    using weak etags for collections.  This is a follow-up to revision
    5705.

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

Finish issue #1251 - ETag of directory is weaker than it claims.

* subversion/mod_dav_svn/repos.c
(dav_svn_getetag): Add the 'W/' weak etag prefix when providing the
etag of a collection.

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

Thanks to Jeffrey C. Ollie for pointing this out in issue #1253:

* tools/client-side/vc-svn.el
(vc-svn-parse-status): Return nil for ignored files, don't error.

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

Add stub perl5 typemap entries.  This doesn't generate useable perl5
bindings, but it paves the way for their further development.

Patch by: Philip W. Dalrymple III <pwd@mdtsoft.com>

* apr.i, svn_client.i, svn_fs.i, svn_repos.i, svn_string.i,
  svn_types.i, util.i:
  (various typemaps) Added stub typemaps for perl5.

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

Apply Jeffrey C. Ollie's patch from issue #1252:

* Makefile.in
(dav_libdir): Define this, to finish what revision 5695 started.

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

* subversion/tests/clients/cmdline/basic_tests.py
(basic_ls): Add test cases for wc_root directory, nested directory,
and implicit current directory.

Suggested by: Chris Stork <cstork@ics.uci.edu>
(See his patch in issue #1235.)

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

Finish issue #977:  "support 'svn diff -rBASE:N'"

Make propdiffs work, too.  Time to close this issue.

* libsvn_wc/diff.c (close_file, close_directory): if the
  'reverse_order' flag is set, don't forcibly reverse the propchanges array.

  (file_diff, directory_elements_diff): if 'use_text_base' flag is
  set, avoid ever showing local prop mods.

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

More work on issue #977:  "support 'svn diff -rBASE:N'"

Various cases of diffing -rBASE:N and -rN:BASE seem to work now; that
is, diff_tests.py #14, which tests a whole lot of things, is now
passing correctly.  However, we still need to get prop-diffs working
correctly.  Almost there.

* svn_wc.h (svn_wc_get_diff_editor): grow two new boolean arguments:
  one indicating we want to use text-base (instead of working files)
  for comparisons, and one indicating we want the diff run backwards.

* libsvn_wc/diff.c (struct edit_baton, make_editor_baton): take two
  new boolean args.

  (svn_wc_get_diff_editor): take two new boolean args, pass to
  make_editor_baton().

  (svn_wc_diff): update caller of make_editor_baton.

  (close_file, delete_entry): make use of the new args; possibly use
  text-base instead of working file, and possibly diff backwards.

  (file_diff):  for files not mentioned in the server's tree delta,
  honor the flags as well.  this means (possibly) showing an addition
  of the text-base rather than the working file, and (possibly) not
  showing purely local mods at all.

* libsvn_client/diff.c (do_diff): add a new use-case for using the
  libsvn_wc diff editor -- compare BASE against some repository
  revision.  this code is essentially copied and tweaked from the
  previous "WORKING vs. repos" use-case.

* diff_tests.py (diff_base_to_repos):  add final comparison between
  -rBASE:2 and -r3:2.  This tests passes now, so remove the XFail().

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

Turns out the new export editor doesn't yet do keyword expansion:

* subversion/libsvn_client/export.c
(svn_client_export): Toggle the #if back to the old editor,
reversing that portion of revision 5694.

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

**** NOTE:  This patch will be needed to build an RPM of subversion-0.21.0.
   I goofed and didn't get it into the repository before 0.21 came out.
   This patch is included in the RPMs on summersoft.fay.ar.us.

* packages/rpm/redhat-7.x/subversion.spec : Added libsvn_diff library.
     Added automake >= 1.6.3 requirement. It won't build correctly without it.
     Added libtool >= 1.4.2-12 requirement. It won't build correctly without it.
     Added needed swig-runtime requirement.

* packages/rpm/redhat-8.x/subversion.spec : Added libsvn_diff library.

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

Take Philip Martin's advice about a dangling baton:

* subversion/libsvn_wc/log.c
  (log_do_committed): Close the access baton for the parent
    directory when done, but only if that baton is not associated with
    the log context's access baton set.

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

Make ra_dav optional, removing the dependency on neon for users who don't
need it.  This fixes issue 617.  I don't think this will hurt the windows
build, as it appears those parts of gen-make.py are hardcoding the ra libs
they link against, but if someone with an available windows box could test
this i would appreciate it.

* Makefile.in
  (INSTALL_DAV_LIB): new macro definition.
* build.conf
  (libsvn_ra_dav): move from base-lib to dav-lib.
* configure.in:
  check for $svn_lib_neon and if it's "yes" add dav-lib to BUILD_RULES,
  and install-dav-lib to INSTALL_STATIC_RULES and INSTALL_RULES.  only
  define SVN_LIBSVN_CLIENT_LINKS_RA_DAV when $svn_lib_neon is "yes".
* build/ac-macros/neon.m4
  (SVN_LIB_NEON): set $svn_lib_neon to "yes" when we find an in-tree neon.
   document new behavior.
  (SVN_NEON_CONFIG): set $svn_lib_neon to "yes" when we find neon.  check
   that $neon_config is a file before we try to run it.  when we can't find
   neon, set $svn_lib_neon to "no" and print instructions on how to find it
   instead of erroring out.

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

Add checksums and cancellation ability to the new export editor, and
start using the editor:

* subversion/libsvn_client/export.c: Include apr_md5.h and svn_md5.h.
  (struct file_baton): New field text_digest.
  (apply_textdelta): Pass digest address to svn_txdelta_apply.
  (close_file): Compare checksums, error if they mismatch.
  (svn_client__get_export_editor): Wrap a cancellation editor around
    the returned editor.
  (svn_client_export): Enable the new editor, but leave the #else
    code, just in case.

This could close issue #1230, but Ben should make the call (we
should remove the #else code when we close the issue, I guess).

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

* build/buildcheck.sh
  (NEON_LATEST_WORKING_VER): version 0.23.9 of neon seems to work just fine,
   so bump the latest working version up to it.  people should be using at
   least version 0.23.8 anyway, since it has a security fix.

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

* configure.in: Require Berkeley DB 4.1.25 or later on OS X.

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

Incorporate some of Philip Martin's review of revision 5687:

* subversion/libsvn_wc/log.c
(log_do_committed): Clear the ignored error.

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

Apply Rafael Garcia-Suarez's patch from issue #1205.

* subversion/libsvn_subr/config_file.c
(svn_config_ensure): Improve documentation of diff-cmd and
diff3-cmd.

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

Get rid of that annoying trigraph warning:

* subversion/libsvn_wc/log.c
(log_do_delete_entry): Remove extra question mark from comment.

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

* tools/client-side/vc-svn.el
(vc-svn-diff): Don't quote the error condition, and pass nil
instead of `ignored' for the unused error data variable.

Suggested by: Kalle Olavi Niemitalo <kon@iki.fi>

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

Fix issue #1239: 'svn ci -N DIR' would commit files directly inside
DIR, and then error during post-commit.

* subversion/libsvn_client/commit_util.c
  (harvest_committables): Don't recurse on any entries in the
    nonrecursive case.

* subversion/libsvn_wc/log.c
  (log_do_committed): Fix the broken logic for updating the parent's
    entries file.

* subversion/tests/clients/cmdline/commit_tests.py
  (commit_nonrecursive): Test for this bug too.

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

* diff_tests.py (diff_base_to_repos): vastly expand this test's coverage.

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

* tools/client-side/vc-svn.el
(vc-svn-diff): Fix a comment.

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

More robust fix for issue #1250, replacing revision 5682:

* tools/client-side/vc-svn.el
(vc-svn-diff): Don't bother to check the Emacs version, just handle
the exception if it arises.

Review by: Kalle Olavi Niemitalo <kon@iki.fi>
(He tested and discovered some intermediate versions of Emacs where
the previous code would still fail.)

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

Fix bugs.debian.org/cgi-bin/bugreport.cgi?bug=188706, reported
by Kalle Olavi Niemitalo <kon@iki.fi> and forwarded to the Subversion
dev list by David Kimdon.

* tools/client-side/psvn/psvn.el
(svn-status-mode): Suppress view mode when setting buffer read-only,
since we want the buffer to be in svn status mode.

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

Fix issue #1250: The calling discipline for `vc-svn-diff-switches'
changed in Emacs 21.2, adjust accordingly:

* tools/client-side/vc-svn.el
(vc-svn-diff): Call vc-svn-diff-switches with the quoted symbol for
the backend if this is Emacs 21.2 or higher.

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

* tools/client-side/svn.vim : Fix example usage of svn.vim.  The first log
  message tempfile will be called svn-commit.tmp  (it isn't until after we have
  filed to open svn-commit.tmp that we start trying files with names like
  svn-commit.N.tmp).

Suggested by: Jean-Michel Kelbert <kelbert@debian.org>
(Noticed and proposed fix.)

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

doxygen police cleanup sweep. this corrects the doubled up first sentences
we still had in many comments from when REPEAT_BRIEF was set to NO in our
doxygen config, and fixes a bunch of markup errors i found at the same time.

* subversion/include/svn_fs.h
* subversion/include/svn_diff.h
* subversion/include/svn_sorts.h
* subversion/include/svn_test.h
* subversion/include/svn_base64.h
* subversion/include/svn_ra_svn.h
* subversion/include/svn_repos.h
* subversion/include/svn_delta.h
* subversion/include/svn_path.h
* subversion/include/svn_subst.h
* subversion/include/svn_props.h
* subversion/include/svn_types.h
* subversion/include/svn_config.h
* subversion/include/svn_string.h
* subversion/include/svn_io.h
* subversion/include/svn_wc.h
* subversion/include/svn_client.h
* subversion/include/svn_quoprint.h
* subversion/include/svn_hash.h
* subversion/include/svn_md5.h
* subversion/include/svn_error.h
* subversion/include/svn_pools.h
* subversion/include/svn_time.h
* subversion/include/svn_utf.h
* subversion/include/svn_ra.h
clean up doxygen comments.

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

Changed svn_ra_dav__convert_error to print also scheme and host when
connection fails. This will also print the port after host, if it is
different than "defaultport".

* subversion/libsvn_ra_dav/util.c:
(svn_ra_dav__convert_error) include also scheme and host in error
string.

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

Thanks to Mike Pilato for the mid-court doxygen assist:

* subversion/include/svn_wc.h
(svn_wc_adm_probe_try): Start doc string with "/** ", give a summary
line, and fix a slight inaccuracy in the body.

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

Factorize the access baton retrieval changes from revision 5663, and
make the code smarter about when to error and when not.  Thanks to
Greg Stein and Mike Pilato for review and discussion:

* subversion/include/svn_wc.h, subversion/libsvn_wc/lock.c
  (svn_wc_adm_probe_try): New function, tries various ways to get an
    access baton while still playing nice with a pre-existing
    associated set, and gives up only if it must.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc_add, svn_wc_delete): Use above new function instead of
    inline code.

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

Patch from Francois Beausoleil:

* doc/book/book/ch06.xml: Use `license' instead of `foo' property.

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

Update the docs for the config file format.

* subversion/libsvn_subr/config_file.c (svn_config_ensure): Turn on the part
of README.txt that talks about variable expansion, and note where the
config files reside on Windows.

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

* subversion/libsvn_wc/status_editor.c
(struct edit_baton): Document the report_root field.

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

* subversion/tests/clients/cmdline/stat_tests.py
(test_list): Remove the XFail from status_uninvited_parent_directory().
I fixed this bug in revision 5672.

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

Fix for a bug spotted by Martin Pool <mbp@sourcefrog.net>.  Our status
editor should have been paying attention to whether or not it was
supposed to report about the root node of the editor drive.  For
example, 'svn st -uv' on a file should never return information about
that file's parent directory (which would have been the "anchor", or
root of the editor drive).

Suggested by: Martin Pool <mbp@sourcefrog.net>

* subversion/libsvn_wc/status_editor.c
  (struct edit_baton): New 'report_root' member.
  (close_directory, delete_entry): Only tweak the statushash for the
    root directory if our baton tells us to.
  (svn_wc_get_status_editor): Populate the 'report_root' baton member.

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

Fix some gcc 3.4 compiler warnings.

* subversion/libsvn_diff/lcs.c (svn_diff__lcs): Use a void* cast to avoid
  a strict-aliasing warning.

* subversion/tests/libsvn_fs/fs-test.c
  (merging_commit, canonicalize_abspath): Use an apr_size_t loop index to
  avoid a signed/unsigned warning.

* subversion/tests/libsvn_fs/skel-test.c (unparse_list): Use an apr_size_t
  loop index to avoid a signed/unsigned warning.

* subversion/tests/libsvn_subr/path-test.c (test_path_split): Use an
  apr_size_t loop index to avoid a signed/unsigned warning.

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

* project_status.html: We added a bunch of big items to the 0.23
release, so let's move the release out one more week.

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

* tools/client-side/svn_load_dirs.pl.in:
  When checking if a directory exists and it is actually a directory,
  do not stat() it twice, use the cached stat information for the
  second test.

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

More work on Issue 1192: Continue converting the Python tests to raise
an exception on test failure rather than returning an error code.

* subversion/tests/clients/cmdline/svnadmin_tests.py: Don't check
return of sbox.build()

* subversion/tests/clients/cmdline/log_tests.py: Convert to the
exception model.

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

* subversion/libsvn_client/diff.c
(svn_client_diff): No longer need to automatically error with "unsupported
feature" for 'svn diff URL WC-PATH'.

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

* COMMITTERS: Add Jani Averbach.

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

With Mike Pilato, fix issue #1245: Some operations were obtaining a
full tree lock when they only needed a local lock, and some were
chmod'ing administrative files more often than necessary.  Together,
these meant that we were doing many more syscalls than necessary.

* subversion/libsvn_client/add.c
  (svn_client_add): Don't request a tree_lock when svn_wc_adm_open'ing
    the parent directory -- we're only adding an entry at the top
    level, so there's no need to lock recursively.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc_add, svn_wc_delete): Be more resourceful in obtaining access
    batons, but only acquire a tree lock if it's actually needed.

* subversion/libsvn_client/delete.c
  (svn_client__can_delete): Be more resourceful in obtaining an access
    baton.
  (svn_client__delete): Don't tree lock the parent of the target.

* subversion/libsvn_client/diff.c
  (do_diff): Don't take out a tree lock unless necessary.

* subversion/libsvn_subr/io.c
  (svn_io_remove_file): Don't chmod the path; instead, depend on
    callers to know what they're about.

* subversion/include/svn_wc.h
  (svn_wc_statuses): Doc fix.

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

Some .dsp generator tweaks: Add the __config__ target, fix the
apriconv target. Also added a mechanism to use a different project
file name than the section name.

* build/win32/svn_config.dsp: Moved here from the top of the source
    tree, and modified relative paths.

* build.conf (__config__, apriconv_ccs_modules, apriconv_ces_modules):
    New targets.
  (aprutil): Depend on apriconv_ccs_modules and apriconv_ces_modules.
  (__ALL__): Depend on __config__, and add svnversion and svndumpfilter.

* build/generator/gen_base.py (GeneratorBase.__init__, _cfg_defaults):
    Check for the 'project_name' target parameter.

* build/generator/gen_msvc_dsp.py (Generator.write): If the
    projec_name parameter exists, use it instead of the section name
    to find an external project file name.

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

Fix a client memory leak identified by valgrind.

* subversion/libsvn_ra_dav/props.c (end_element): Free neon allocated
memory.

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

Issue #1101 - updates should receive checksums via a live prop, like
checkouts.

This is the first of two phases in the solution of this issue.  In
this phase, we teach servers to transmit result checksum as both XML
attributes and as a liveprop, and we teach clients to look for result
checksums first as a liveprop, and then in the XML as a fallback.

In the second phase, we will remove the code delimited by the
compatibility #define SVN_DAV_OLD_UPDATE_CHECKSUMS, which will cause
the server to only transmit result checksums as liveprops, and the
client to only look for result checksums in the liveprops.

* svn-debug/subversion/include/svn_dav.h
  (SVN_DAV_OLD_UPDATE_CHECKSUMS): Temporary #define to denote
    compatibility code.

* svn-debug/subversion/mod_dav_svn/update.c
  (insert_checksum_attributes): Remove.
  (item_baton_t): Add 'text_checksum' param.
  (upd_set_target_revision): Add SVN_DAV_PROP_NS_DAV to the set of
    XML namespaces defined in the response.
  (add_helper): Populate the new child baton's 'text_checksum'.
  (upd_apply_textdelta): Fix space-before-paren thing.
  (upd_close_file): Dup the text_checksum into the file baton.  Only
    add result checksum attributes if using the old checksum
    transmission code.
  (close_helper): Send the result checksum as a prop.

* svn-debug/subversion/libsvn_ra_dav/fetch.c
  (start_element): Make conditional on our compatibility #define the
    code that looks for result checksums as an XML attribute.
  (end_element): Catch the <md5-checksum> tag which now contains the
    result checksum.

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

Add a regression test for not-yet-resolved Issue #1249 - svn merge
between similar-but-ancestrally-unrelated dirs into a third similar
dir fails.

* subversion/tests/clients/cmdline/merge_tests.py
  (merge_similar_unrelated_trees): New test for the merge bug I
    recently found -- and which goes away if you use merge's new
    '--ignore-ancestry' flag!
  (test_list): Add XFail reference for new test.

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

Teach svn_repos_dir_delta() that sometimes it's okay to just do pure
diffs, ignorant of ancestry.  This is something I've wanted to do for
a long time, but I decided it was worthwhile once I started looking at
some of the outstanding diff and merge issues in our database.  And it
turns out to fix at least one unreported merge bug that I ran across
while testing.  'Make check' still passes on all three RA layers, too.

This change adds a new --ignore-ancestry flag to both 'svn diff' and
'svn merge'.  The discussion about defaultness of that state can be
held elsewhere -- I'm leaning towards 'default to ancestry ignorance',
but didn't want to change existing behaviors without list discussion.

Oh, and it also changes the ra-svn protocol.  Am I recalling correctly
that ghudson doesn't care about compatibility concerns at this stage?

Oh, and some Python scripts changed, too, so folks using mailer.py
will need to remember to upgrade their bindings and installations of
that script.

Enjoy. :-)

* subversion/include/svn_repos.h
  (svn_repos_dir_delta, svn_repos_begin_report): Add 'ignore_ancestry'
    parameter.

* subversion/include/svn_ra.h
  (svn_ra_plugin_t): Add 'ignore_ancestry' to the do_diff() vtable entry.

* subversion/include/svn_client.h
  (svn_client_merge, svn_client_diff): Add 'ignore_ancestry' parameter.

* subversion/libsvn_repos/delta.c
  (struct context): Add 'ignore_ancestry' member.
  (svn_repos_dir_delta): Add and use 'ignore_ancestry' parameter.
  (delta_dirs): Use new 'ignore_ancestry' parameter.

* subversion/libsvn_repos/dump.c
  (svn_repos_dump_fs): Update call to svn_repos_dir_delta().

* subversion/libsvn_repos/reporter.c
  (svn_repos_report_baton_t): Add 'ignore_ancestry' member.
  (svn_repos_finish_report): Update call to svn_repos_dir_delta().
  (svn_repos_begin_report): Add and use 'ignore_ancestry' parameter.

* subversion/mod_dav_svn/merge.c
  (dav_svn__merge_response): Update call to svn_repos_dir_delta().

* subversion/mod_dav_svn/update.c
  (dav_svn__update_report): Parse a new 'ignore-ancestry' XML item,
    and update calls to svn_repos_dir_delta() and svn_repos_begin_report().

* subversion/libsvn_ra_local/ra_plugin.c
  (make_reporter): Add 'ignore_ancestry' parameter, and update call to
    svn_repos_begin_report()
  (svn_ra_local__do_update, svn_ra_local__do_switch,
   svn_ra_local__do_status): Update call to make_reporter().
  (svn_ra_local__do_diff): Add 'ignore_ancestry' parameter, and update
    call to make_reporter().

* subversion/svnserve/serve.c
  (update, switch_cmd, status): Update call to svn_repos_begin_report()
  (diff): Parse new ignore_ancestry param, and update call to
    svn_repos_begin_report()

* subversion/libsvn_ra_dav/ra_dav.h
  (svn_ra_dav__do_diff): Add 'ignore_ancestry' parameter.

* subversion/libsvn_ra_dav/fetch.c
  (make_reporter): Add 'ignore_ancestry' parameter, and use it to
    optionally add the '<S:ignore-ancestry> XML element to the REPORT body.
  (svn_ra_dav__do_update, svn_ra_dav__do_status, svn_ra_dav__do_switch,
   svn_ra_dav__do_diff): Update call to make_reporter().

* subversion/libsvn_ra_svn/client.c
  (ra_svn_diff): Add 'ignore_ancestry' parameter.

* subversion/libsvn_client/diff.c
  (do_merge, do_diff): Add 'ignore_ancestry' parameter, and update
    call to RA->do_diff().
  (svn_client_diff): Add 'ignore_ancestry' parameter, and update call
    to do_diff().
  (svn_client_merge): Add 'ignore_ancestry' parameter, and update call
    to do_merge().

* subversion/svnlook/main.c
  (generate_delta_tree): Update call to svn_repos_dir_delta().

* subversion/tests/libsvn_repos/repos-test.c
  (dir_deltas): Update call to svn_repos_dir_delta().

* subversion/clients/cmdline/diff-cmd.c
  (svn_cl__diff): Update calls to svn_client_diff().

* subversion/clients/cmdline/merge-cmd.c
  (svn_cl__merge): Update call to svn_client_merge().

* subversion/clients/cmdline/cl.h
  (svn_cl__ignore_ancestry_opt): New.
  (svn_cl__opt_state_t): Add 'ignore_ancestry' member.

* subversion/clients/cmdline/main.c
  (svn_cl__options): Add a definition for the new "--ignore-ancestry" option.
  (svn_cl__cmd_table): Bless the 'diff' and 'merge' subcommands with
    the new "--ignore-ancestry" option.

* tools/examples/svnlook.py
  Update uses of the repos.svn_repos_dir_delta() binding interface.
  (DiffEditor.add_file): Make a use of 'pool' into the more
    ... available 'file_pool'.
  (DiffEditor._do_diff): Sheesh.  Catch up on a rather old interface
    change to our fs.FileDiff object.

* tools/hook-scripts/mailer.py
  Update uses of the repos.svn_repos_dir_delta() binding interface.

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

Fix a little buglet in ra-svn (using the wrong protocol command token
for diffs).  Probably a copy-n-past-o, but fixed now, regardless.

* subversion/svnserve/serve.c
  (diff): Pass TRUE for the text_deltas parameter of svn_repos_begin_report().

* subversion/libsvn_ra_svn/client.c
  (ra_svn_diff): Use the "diff" command for diffs (not "switch").

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

Hopefully, this should fix mod_dav_svn. The "foreign" code goes into
different subdirectories.

* build/generator/gen_win.py:
  (WinGeneratorBase.get_win_sources): take a new prefix which is used
    to later the relative directory. this parameter is used for the
    mod_dav_svn's inclusion of foreign code, resulting in their
    objects going into unique directories. this method now returns
    source files and relative dirs as a list of tuples.

* build/generator/gen_vcnet_vcproj.py:
  (Generator.writeProject): deal with the tuples returned by
    .get_win_sources() and no more need to str() the source file.

* build/generator/gen_msvc_dsp.py:
  (Generator.write_project): toss out all the reldir computatoin and
    just use the values returned by .get_win_sources().

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

* build/generator/gen_vcnet_vcproj.py:
(Generator.writeProject): apply str() to the sources to ensure that
we get a filename rather than a SourceFile instance.

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

Do some work to put subdir-based source files into subdir-based object
directories. Specifically, this appears to help out libsvn_fs and is a
precursor to some fixes for mod_dav_svn.

* build/generator/gen_base.py:
  (GeneratorBase.__init__): add some comments to the target_dirs
    computation. switch to looking for '/' rather than os.sep.
  (GeneratorBase.compute_hdr_deps): use the fname attribute now that
    the source files are SourceFile instances.
  (class SourceFile): new class to represent a source file (for
    compilation, then linking). note that, in many cases, this can be
    used in the place of a filename string (which is actually a
    feature of the DependencyNode classes).
  (TargetLinked.add_dependencies): _get_sources() (by virtue of a
    modified _collect_paths) now returns source files and where they
    occur relative to the target's path. unpack the tuples, and also
    use this information for instantiating SourceFile objects.
  (TargetSWIG.add_dependencies): unpack the source file tuple from
    _collect_paths().
  (_collect_paths): if a path is provided, then return information
    about where the sources were found relative to that path.

* build/generator/gen_make.py:
  (Generator.write): map the str() function across the dependencies of
    DT_OBJECT. this will turn SourceFile instances into filenames, and
    leave plain filename strings alone. also use str() before passing
    a source to os.path.join().

* build/generator/gen_msvc_dsp.py:
  (Generator.write_project): if the source is a SourceFile, then
    extract its relative-dir for passing along to the template. revamp
    the sorting of the sources to account for _item instances rather
    than plain strings.

* build/generatoe/msvc_dsp.ezt:
  - insert custom Intermediate_dir directives for files which don't
    reside in a target's base path (those sources with a reldir).

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

* generator/gen_vcnet_vcproj.py:
  (Generator.writeProject): use self.get_win_sources() to make this
    code similar to gen_msvc.py. this resulted in more inputs to
    mod_dav_svn, which is actually (somewhat) desirable, but no
    changes for other build targets.

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

Add / to the 'svn help' output, and (unrelatedly) fix a Forte compiler warning
about mismatched types.

* subversion/clients/cmdline/help-cmd.c (svn_cl__help_footer): Add / to
  the 'additional information' URL.
* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout,
  subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout:
  Adjust help output accordingly.
* subversion/libsvn_ra_dav/props.c (end_element): Use the correct apr_ssize_t
  type instead of apr_size_t.

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

Reenable linking in apr-iconv. However, this also implies that
apr-iconv must be present in the root dir when dist.sh is run, yet
dist.sh does not fetch it (the library is only needed for Windows
right now). Some dev list followup is needed to find the proper answer.

* build.conf:
- uncomment the [apriconv] target
- link apriconv into aprutil

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

Some historical tweaks.

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

* subversion/bindings/java/jni/hashtable.c,
* subversion/bindings/java/jni/string.c,
* subversion/bindings/java/jni/vector.c:
Fix a spelling mistakes in comments: s/wether/whether/.

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

Found one spelling mistake in svn_version.h that led to a spelling
mistake bug hunt.

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

* COMMITTERS: change my email address

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

* www/project_status.html: update for release 0.21.0

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

* CHANGES: merge changes from 0.21 release branch

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

Feedback from the list indicates that the auto-generated .dsp files
seem to work okay. There still needs to be a bit of polish around
Windows builds using the generated .dsp files, but this puts us nearly
there. Indications are that mod_dav_svn doesn't build with the
currently-generated .dsp file.

* INSTALL: add a comment about the (new) installation/build changes

* autogen.sh:
  - rename the VERSION_CHECK var to RELEASE_MODE (since that is what
    it is really about)
  - add SKIP_DEPS for processing the -s switch (functionality which
    got lost a ways back)
  - add additional gen-make steps for the dsp files to replace the
    ones which we blew away. for now, this only runs during the
    release process when we are guaranteed to have apr(-util) as a
    subdirectory
  - tweak the gen-make error detection logic a bit since we now run it
    a couple times

* everywhere/*.dsp: removed

* subversion.dsw: removed

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

* tools/client-side/svn_load_dirs.pl.in:
(determine_native_eol): Read the test file in binary mode to
determine the system's native EOL.

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

Issue #1015, continued.  In order to support our choice of an XML
scheme for binary properties, we had to abandon neon's built-in
PROPFIND-handling code.  It either didn't give us the necessary status
codes, or it didn't give us the element attributes we needed.

So, we now do more of the PROPFIND parsing ourselves.  Note that we
still use Neon's XML code (which conveniently, and brilliantly, takes
care of namespace mappings and such).

### This change should *not* be included in any release prior to 0.22.

* subversion/libsvn_ra_dav/props.c
  (elem_definitions): Add "DAV:response" -- we need to handle its
    <href> tag.
  (propfind_elements): Was neon_descriptions, and now includes the
    elements that neon use to handle for us.
  (propfind_ctx_t, assign_rsrc_url): New.
  (prop_ctx_t, create_private, add_to_hash, process_results): Remove.
  (validate_element, start_element, end_element): Rework these
    functions to handle the portions of the XML parsing that neon used
    to do for us.  Also, no longer dup static property name strings
    into pools.
  (svn_ra_dav__get_props): Rewrite this function to do our own
    PROPFIND handling.

* subversion/libsvn_ra_dav/util.c
  (svn_ra_dav__parsed_request): Check for 207 return codes on
    PROPFIND, 200 otherwise.

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

Follow up to r5387.

* subversion/libsvn_client/diff.c
(do_single_file_merge): Really pass the mime types to merge_file_changed.

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

* tools/client-side/svn_load_dirs.pl.in:
  Resolve issue #1223.  Add a -wc command line option that specifies
    an existing working copy to work in instead of checking out a
    fresh working copy.  Patch submitted by John Goerzen
    <jgoerzen@tigris.org>.
  When running 'svn log' on the repository to find out the root URL,
    use -r HEAD.  There's no need to see all the log messages, which
    just wastes bandwidth.

Patch by: John Goerzen <jgoerzen@tigris.org>
(First change only.)

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

New regression test for issue #977: "make 'svn diff -r BASE:N' compare
a repository tree against the wc's text-bases, rather than the wc's
working files."

* diff_tests.py (diff_base_to_repos): new test, currently XFail().

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

Reorganise the file and session opening in single file merge to fix a
regression test failure using ra_svn over ssh.  In particular, avoid
having an open file with unflushed writes when opening an RA session,
as the process forked to run ssh will cause an additional file flush.

* subversion/libsvn_client/diff.c
  (single_file_merge_get_file): New function containing the file
  and session code from do_single_file_merge.
  (do_single_file_merge): Call single_file_merge_get_file twice,
  don't create unnecessary hash tables.

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

Remove support for old namespace code from the libsvn_ra_dav, which is
the last compability transition phase of issue #840.

### This change should *not* be included in any release prior to 0.22.

* subversion/include/svn_dav.h
  (SVN_DAV_FEATURE_USE_OLD_NAMESPACES): Buh-bye.

* subversion/libsvn_ra_dav/fetch.c
  Remove all code rendered dead by the removal of the
  SVN_DAV_FEATURE_USE_OLD_NAMESPACES #define.

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

* subversion/libsvn_diff/diff_file.c

Convert the tabs I just committed... Remove trailing whitespace.

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

* tools/client-side/svn_load_dirs.pl.in:
  Resolve issue #1215.  Patch submitted by Vladimir Prus
  <ghost@cs.msu.su>.  This works around a problem where 'svn add' or
  'svn rm' commands are longer than the maximum command line length
  supported by the OS.
  (make_targets_file): New subroutine.  Take a list of files and
    directories to 'svn add' or 'svn rm' and create a temp file in the
    svn_load_dirs.pl temporary directory with that list.
  (main): Use make_targets_file and take its returned filename as the
    --targets command line option value.

Patch by: Vladimir Prus <ghost@cs.msu.su>
(First change only.)

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

Fix the failures we've been seeing on HP-UX due to over aggressive
mmap'ing.  This fix is greatly inspired by Branko Cibej.

* subversion/libsvn_diff/diff_file.c

  (map_or_read_file): New helper function (with accompagnying macros).

  (svn_diff__file_datasource_open, svn_diff_file_output_merge): Call
    map_or_read_file instead of implementing same logic in both functions.

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

* tools/client-side/svn_load_dirs.pl.in:
  When running any svn command that connects to the repository, use
  the supplied username and password, otherwise the initial 'svn log'
  commands would repeatedly ask for the proper username and password.
  This happens on repositories that have restricted read permissions.
  (set_svn_use_repos_cmd_opts): Renamed from set_commit_options.

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

* subversion/include/svn_version.h: bump version number for 0.21

* CHANGES: update release date

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

Make the Windows tests pass again after the libsvn_diff split.

* subversion.dsw, subversion/svnversion/svnversion.dsp: Make svnversion
depend on libsvn_diff.
* win-tests.py: diff-diff3-test moved.

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

Split the diff library in logical chunks.  First pass at cleaning up the API.
Update all callers.

* subversion/include/svn_diff.h

  Remove all spaces before the opening paren to gain consistency.

  (svn_diff_diff): Renamed from svn_diff.

  (svn_diff_diff3): Renamed from svn_diff3.

  (svn_diff_diff4): Renamed from svn_diff4.

  (svn_diff_file_diff): Renamed from svn_diff_file.

  (svn_diff_file_diff3): Renamed from svn_diff3_file.

  (svn_diff_file_diff4): Renamed from svn_diff4_file.

  (svn_diff_file_output_merge): Renamed from svn_diff3_file_output.

* subversion/libsvn_diff/token.c

  New file to contain all token tree helper functions.

  (svn_diff__tree_create, svn_diff__tree_insert_token, svn_diff__get_tokens):
    Moved from subversion/libsvn_diff/diff.c.

* subversion/libsvn_diff/lcs.c

  New file to contain the LCS implementation, which is the core of the
  entire library.

  (svn_diff__snake, svn_diff__lcs_reverse, svn_diff__lcs):
    Moved from subversion/libsvn_diff/diff.c.

* subversion/libsvn_diff/diff_file.c

  Update all calls to the renamed functions.

  (svn_diff_file_diff): Renamed from svn_diff_file.

  (svn_diff_file_diff3): Renamed from svn_diff3_file.

  (svn_diff_file_diff4): Renamed from svn_diff4_file.

  (svn_diff_file_output_merge): Renamed from svn_diff3_file_output.

* subversion/libsvn_diff/diff.c

  (svn_diff__tree_create, svn_diff__tree_insert_token, svn_diff__get_tokens):
    Moved to subversion/libsvn_diff/token.c.

  (svn_diff__snake, svn_diff__lcs_reverse, svn_diff__lcs):
    Moved to subversion/libsvn_diff/lcs.c.

  (svn_diff__diff): Export.

  (svn_diff_diff): Renamed from svn_diff.

  (svn_diff__resolve_conflict, svn_diff3):
    Moved to subversion/libsvn_diff/diff3.c.

  (svn_diff__adjust_hunk, svn_diff__adjust, svn_diff4):
    Moved to subversion/libsvn_diff/diff4.c.

  (svn_diff_contains_conflicts, svn_diff_contains_diffs, svn_diff_output):
    Moved to subversion/libsvn_diff/util.c.

* subversion/libsvn_diff/libsvn_diff.dsp

  Add lcs.c, token.c, util.c, diff3.c, diff4.c and diff.h.

* subversion/libsvn_diff/diff3.c

  (svn_diff__resolve_conflict): Moved from subversion/libsvn_diff/diff.c.

  (svn_diff_diff3): Same.  Renamed from svn_diff3.

* subversion/libsvn_diff/diff4.c

  (svn_diff__adjust_hunk, svn_diff__adjust):
    Moved from subversion/libsvn_diff/diff.c.

  (svn_diff_diff4): Same.  Renamed from svn_diff4.

* subversion/libsvn_diff/diff.h

  New private header file that declares all structs and functions needed
  internally by the diff library.

* subversion/libsvn_diff/util.c

  New file to contain all (public) utility functions.

  (svn_diff_contains_conflicts, svn_diff_contains_diffs, svn_diff_output):
    Moved from subversion/libsvn_diff/diff.c.

* subversion/libsvn_wc/merge.c

  (svn_wc_merge): Update calls to svn_diff_file_diff3 and
    svn_diff_output_merge.

* subversion/libsvn_client/diff.c

  (diff_file_changed): Update calls to svn_diff_file_diff.

* subversion/tests/libsvn_diff/diff-diff3-test.c

  (three_way_merge): Update calls to svn_diff_file_diff3 and
    svn_diff_file_output_merge.

  (two_way_diff): Update calls to svn_diff_file_diff.

* subversion/tests/libsvn_diff/diff-test.c

  (do_diff): Update calls to svn_diff_file_diff.

* subversion/tests/libsvn_diff/diff3-test.c

  (do_diff3): Update calls to svn_diff_file_diff3 and
    svn_diff_file_output_merge.

* subversion/tests/libsvn_diff/diff4-test.c

  (do_diff4): Update calls to svn_diff_file_diff4 and
    svn_diff_file_output_merge.

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