subversion

Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1421645 is being indexed.

Make the warnings issued when building the Ruby bindings *much* less verbose.

The removed warnings are the result of swig's---ahem---interesting way of

generating code. Hopefully, this helps us find more errors, more quickly.

* build/ac-macros/swig.m4

(SVN_FIND_SWIG): Filter out a number of compiler warnings flags for the Ruby

bindings.

Add a helper configure macro for stripping values from compile-time flags,

and use it in a couple of places in configure. (More uses coming soon.)

* build/ac-macros/svn-macros.m4

(SVN_STRIP_FLAG): New.

* configure.ac:

Use the new macro when stripping flags for clang.

Allow make clean to work when svn-test-work is a mounted ramdisk.

If you follow the instructions in subversion/tests/cmdline/README then make clean

fails since it can't remove svn-test-work.

* Makefile.in

(check-clean): find nodes under svn-test-work and remove them rather than

the directory itself.

On the ev2-export branch:

Bring up-to-date with trunk.

On the ev2-export branch:

Bring up-to-date with trunk@1421408, splitting the Ev2 import implementation

to follow the change on trunk.

APR-Util won't exist if using APR 2.x+ so don't try to list it as a linked lib.

* subversion/libsvn_subr/sysinfo.c

(svn_sysinfo__linked_libs): Don't list APR-Util if APU_VERSION_STRING is not

defined.

* subversion/tests/cmdline/svnserveautocheck.sh: Cleanup some overly long lines.

Allow for time not to be available in (svnserve|dav)autocheck.

time is not installed on some platforms because it is built into the shell.

However, additionally /bin/sh may be a very limited POSIX compliant shell

like dash that doesn't have time.

* subversion/tests/cmdline/svnserveautocheck.sh,

subversion/tests/cmdline/davautocheck.sh:

Test for the availability of time and only use it if available.

* subversion/tests/cmdline/svnserveautocheck.sh

Remove unnecessary and pointless setting of LD_LIBRARY_PATH since the

server is started via the libtool wrapper.

Make davautocheck work for OS X.

rpath support on OS X doesn't help us as much as it does on other platforms,

since it's trivial to be more explicit about this for all platforms go ahead

and do so.

* subversion/tests/cmdline/davautocheck.sh

Iterate and build all the .libs paths for the DYLD_LIBRARY_PATH env variable.

Implement a new runtime configuration option ('http-max-connections')

for controlling the maximum number of parallel connections Serf uses

for a given operation. Leave the default set to 4 (as was previously

hardcoded), and maintain a hard-coded limit for the value (currently

set to 8).

* subversion/include/svn_config.h

(SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS): New #define.

(SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS): New #define.

* subversion/libsvn_subr/config_file.c

(svn_config_ensure): Describe new 'http-max-connections'

configuration item.

* subversion/libsvn_ra_serf/ra_serf.h

(SVN_RA_SERF__MAX_CONNECTIONS_LIMIT): New #define.

(MAX_NR_OF_CONNS): Removed.

(svn_ra_serf__session_t): Add 'max_connections' member.

* subversion/libsvn_ra_serf/serf.c

(load_config): Read the 'http-max-connections' option from the

runtime configuration, storing its (capped) valued in the RA session

structure.

* subversion/libsvn_ra_serf/update.c

(finish_report): Now use the session-stored max connections value as

the limit when opening new connections.

Nominate r1421541.
* get-deps.sh (get_deps): Fix infinite recursion.
* subversion/libsvn_wc/adm_ops.c

(add_from_disk): Remove unused notification parameters.

(svn_wc_add4, svn_wc_add_from_disk): Adjust callers.

Fix a bunch of latent bugs where the mere presence of a server group

in the runtime configuration would cause any global values for several

options to be ignored. While here, do a bit of related code cleanup.

* subversion/libsvn_ra_serf/serf.c

(load_config): Eliminate some local variables. Balance some braces.

Update a comment to explain a potentially confusing behavior.

But, most importantly, when overriding the global config option

values with those from a per-server group, use the global values

as the default value.

On the ev2-export branch:

Bring up-to-date with trunk@1421407.

  1. … 75 more files in changeset.
Rename the recently added 'bulk-updates' configuration option to

'http-bulk-updates'.

* subversion/libsvn_subr/config_file.c

(svn_config_ensure): Rename 'bulk-updates' option to

'http-bulk-updates', and clean up the formatting a bit.

* subversion/include/svn_config.h

(SVN_CONFIG_OPTION_HTTP_BULK_UPDATES): Rename from

SVN_CONFIG_OPTION_BULK_UPDATES, and tweak the value accordingly.

* subversion/libsvn_ra_serf/serf.c

(load_config): Track renamed #define.

* configure.ac: Update recommended version of sqlite.

* get-deps.sh: Update versions of apr-util, serf, sqlite and httpd.

* subversion/libsvn_subr/config_file.c

(svn_config_ensure): Wordsmith a teeny bit to avoid awkward line

wrapping.

* get-deps.sh: Remove debris added in r1421418.

Found by: arfrever

* tools/dist: Tweak svn:ignore for python.

* get-deps.sh

(SQLITE_VERSION): Fix filename determination by fixing printf varargs.

* subversion/tests/cmdline/prop_tests.py

(almost_known_prop_names): Test against a read-only repository.

Hide that originally commit and import shared some code by separating these

features to separate files. The current status is that they don't share

any implementation and this separation turns out to be much easier than expected.

* subversion/libsvn_client/commit.c

(includes): Remove unused includes.

(*): Remove functions that are used by import.

* subversion/libsvn_client/import.c

New file, copied from commit.c

(includes): Remove unused includes.

(*): Remove functions that are used by commit.

    • ?
    /trunk/subversion/libsvn_client/import.c
Approve r1421103.
* subversion/libsvn_wc/wc_db_update_move.c

(check_shadowed_node): Move further up in the file so we can get rid of

a forward declaration of this function. No functional change.

Make the move-update editor update properties on directories.

While doing so, factor out code for updating working props into

separate functions. Also, write conflict skels into the DB to get

conflicts flagged properly.

* subversion/libsvn_wc/wc_db_update_move.c

(working_node_version_t): New type. Replaces working_file_version_t.

(create_conflict_markers, update_working_props): New, factored out of

update_working_file().

(tc_editor_alter_directory): Update props on directories.

(working_file_version_t): Remove.

(update_working_file): Call factored-out helper functions, and install

conflicts into the DB.

(update_moved_away_dir): Call the editor's alter_directory() function

if props need to be updated. New parameter src_op_depth.

(update_moved_away_subtree): Update caller of update_moved_away_dir().

Review by: julianfoad

* docs/community-guide/conventions.part.html

(#crediting): Update for r1421383.

Inspired by: rhuijben

Move function to more sensible location.

* subversion/libsvn_wc/conflicts.c

(svn_wc_create_conflict_result): Move function here...

* subversion/libsvn_wc/merge.c

(svn_wc_create_conflict_result): ... that used to be in this file.

Switch the property merge code implementation to use explicit output arguments

instead of updating a passed apr_hash_t and state.

* subversion/libsvn_wc/props.c

(apply_single_prop_add,

apply_single_prop_delete,

apply_single_mergeinfo_prop_change,

apply_single_generic_prop_change,

apply_single_prop_change): Move updating the property hash and state from

here to ...

(svn_wc__merge_props): ... here.