Checkout Tools
  • last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Finish issue #3308 ("Promote 'svnmucc' tool (or functionality) into a

fully supported binary"). This change was made using semi-manual

invocations of 'svn diff' and 'svn patch' from danielsh's

^/subversion/branches/svnmucc/ branch (to account for changes made to

svnmucc.c since the branch was cut).

* Makefile.in

(check, davcheck, davautocheck, svncheck, svncheck6, svnsshcheck,

bdbcheck): Remove explicit svnmucc dependency.

(INSTALL_EXTRA_TOOLS): New.

* subversion/tests/cmdline/svntest/main.py

(svnmucc_binary): Account for relocated binary.

* tools/client-side/svnmucc,

* tools/client-side/svnmucc/svnmucc.c

Moved these from here ...

* subversion/svnmucc,

* subversion/svnmucc/svnmucc.c

... to here.

* subversion/svnmucc/svnmucc.1

New.

* tools/dev/windows-build/Makefile

(package): Remove svnmucc from list of copied binaries.

* build.conf

(svnmucc): Move this section to where other first-class binaries

live, and update to track new src/binary location.

* win-tests.py

(): Don't copy the svnmucc binary.

* notes/knobs

(SVN_TRY_THIS_AT_HOME): New placeholder.

* build/generator/gen_make.py

(Generator.write): Set 'extra_install' for the 'tools' area, too.

* build/win32/vc6-build.bat.in

Also copy svnmucc.exe.

* build/win32/make_dist.py

Track new locations for svnmucc.exe and svnmucc.pdb.

  1. … 11 more files in changeset.
Ev2 shims: Flesh out the svnmucc shim callbacks.

* tools/client-side/svnmucc/svnmucc.c

(fetch_baton): New.

(fetch_base_func, fetch_kind_func, fetch_props_func): Implement.

(get_shim_callbacks): Take additional params for the baton.

(execute): Open a second ra session for use by the shim callbacks.

Replace the allocator creation & initialization boilerplate code

with a call to our new API.

* subversion/svn/main.c

* subversion/svnadmin/main.c

(main): use new API

* subversion/svndumpfilter/main.c

(main): use new API

* subversion/svnlook/main.c

(main): use new API

* subversion/svnrdump/svnrdump.c

(main): use new API

* subversion/svnserve/main.c

(main): use new API

* subversion/svnsync/main.c

(main): use new API

* subversion/svnversion/main.c

(main): use new API

* subversion/tests/svn_test_main.c

(main): use new API, be thread-safe (just in case)

* tools/client-side/svnmucc/svnmucc.c

(init): use new API

* tools/dev/svnraisetreeconflict/main.c

(main): use new API

* tools/server-side/svn-rep-sharing-stats.c

(main): use new API

  1. … 11 more files in changeset.
Ev2 shims: Add shim callbacks for svnmucc, fixing a couple of test failures.

Current number of Ev2 test failures over RA dav: 30

* tools/client-side/svnmucc/svnmucc.c

(fetch_base_func, fetch_props_func, fetch_kind_func, get_shim_callbacks):

New.

(execute): Register the callbacks.

* build/win32/vc6-build.bat.in: Add svnrdump.

* everywhere else: accidentally-committed changes.

[ Reverted in r1295006 due to the accidental changes. ]

  1. … 4 more files in changeset.
Fix a shadowed symbol problem in svnmucc.

* tools/client-side/svnmucc/svnmucc.c

(main): Rename local variable 'getopt' to 'opts' to avoid a name clash with

the POSIX getopt() function. Resolves a compiler warning on my system.

No functional change.

* tools/client-side/svnmucc/svnmucc.c

(execute): Move a declaration to resolve a compiler warning.

Fix issue 4078, svnmucc ignoring settings in --config-dir.

* tools/client-side/svnmucc/svnmucc.c

(create_ra_callbacks): Add parameter, pass config when creating auth

baton.

(execute): Get config from hash and pass it on.

Move the svnmucc tests so they become part of the regression tests run

by 'make check'.

* subversion/tests/cmdline/svnmucc_tests.py

(test_svnmucc, xtest_svnmucc): New helpers.

(basic_svnmucc): New test.

(test_list): Add new test.

* tools/client-side/svnmucc/svnmucc-test.py: Remove.

  1. … 1 more file in changeset.
Use svn_uri_skip_ancestor() wherever svn_uri__is_child() was being used with

an extra string comparison to achieve the same effect.

* subversion/libsvn_client/commit_util.c

(svn_client__condense_commit_items): Same.

* subversion/libsvn_client/copy.c

(repos_to_repos_copy): Same.

* subversion/libsvn_ra_neon/session.c

(svn_ra_neon__get_path_relative_to_root): Same.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_path_relative_to_root): Same.

* subversion/libsvn_ra_svn/client.c

(path_relative_to_root): Same.

* tools/client-side/svnmucc/svnmucc.c

(subtract_anchor): Same.

  1. … 5 more files in changeset.
Make svnmucc honor option --config-dir for auth stuff.

* tools/client-side/svnmucc/svnmucc.c

(create_ra_callbacks) Add parameter config_dir, pass it to

svn_cmdline_create_auth_baton.

(execute) Pass config_dir to create_ra_callbacks.

Patch by: Roderich Schupp <roderich.schupp@googlemail.com>

Add --version to svnmucc, tweak licence text format to look like the

other instances.

* tools/client-side/svnmucc/svnmucc.c

(usage): Add --version.

(display_version): New.

(main): Add --version, rename config_no_auth_cache_opt to no_auth_cache_opt.

Add --no-auth-cache to svnmucc.

* tools/client-side/svnmucc/svnmucc.c

(create_ra_callbacks, execute): Add no_auth_cache parameter.

(usage): Describe new option.

(main): Add no-auth-cache option.

Fix ye olde broken build.

* tools/client-side/svnmucc/svnmucc.c

(subtract_anchor): Use new private version of svn_uri_is_child().

* tools/client-side/svnmucc/svnmucc.c

(execute): Remove an unneeded path computation.

* tools/client-side/svnmucc/svnmucc.c

(includes): Hopefully add the last missing svn_version.h to unbreak the

build.

* tools/client-side/svnmucc/svnmucc.c

(main): Allow for leading 'r' when parsing the revnum in the 'cp' action.

svnmucc: respect the 'help' subcommand aliases that our other tools do.

* tools/client-side/svnmucc/svnmucc.c

(main): Recognize 'h', '?', and 'help' as actions.

Avoid a future bug-in-the-making.

* tools/client-side/svnmucc/svnmucc.c

(main): Add a 'break' to a 'switch' statement.

Fix issue #3881 ("svnmucc - propsetf - Property files only support Unix EOLs").

* tools/client-side/svnmucc/svnmucc.c

(main): Normalize property values where Subversion demands it.

* tools/client-side/svnmucc/svnmucc.c

(main): Add a 'break' statement to the switch case 'config_inline_opt'

Patch by: Vijayaguru G <vijay{_AT_}collab.net>

Implement --config-option in the last two commandline tools that did support

--config-dir, but didn't support --config-option.

* subversion/svnadmin/main.c

(includes): Include private/svn_cmdline_private.h.

(svnadmin__cmdline_options_t): Name enum to help svn diff -x-p and my

debugger. Add new option.

(options_table): Add "config-option" with standard help text to help

localization.

(cmd_table): Enable for "config-option" for "create".

(svnadmin_opt_state): Add config_options.

(subcommand_create): Apply configuration options.

(main): Initialize and parse options. Fix utf-8 conversion for config-dir.

* tools/client-side/svnmucc/svnmucc.c

(includes): Include private/svn_cmdline_private.h.

(execute): Add config_options argument and apply configuration options.

(usage): Explains --config-option.

(main): Initialize and parse options.

  1. … 1 more file in changeset.
Get rid of a few "missing sentinel" warnings from calls to apr_pstrcat()

by explicitly casting NULL to the expected pointer type.

* subversion/libsvn_subr/dirent_uri.c

(svn_fspath__canonicalize,

svn_fspath__get_longest_ancestor): Cast to (char *).

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Same.

* tools/client-side/svnmucc/svnmucc.c

(main): Same.

  1. … 2 more files in changeset.
Update a few deprecated function calls in svnmucc.

* tools/client-side/svnmucc/svnmucc.c

(drive, execute, main): Use some updated functions.

Get back to the business of replacing deprecated svn_path_* function calls.

* tools/dev/svnraisetreeconflict/main.c

(raise_tree_conflict): Replace usages of deprecated svn_path_* functions.

* tools/server-side/svn-populate-node-origins-index.c

(main): Replace usages of deprecated svn_path_* functions.

* tools/client-side/svnmucc/svnmucc.c

(sanitize_url): New helper.

(build, main): Replace usages of deprecated svn_path_* functions.

  1. … 2 more files in changeset.
* tools/client-side/svnmucc/svnmucc-test.py

Update to expect the EXXXXXXX codes in error messages.

Reintegrate the 'uris-as-urls' branch into trunk.

(Merged /subversion/branches/uris-as-urls:r1060426-1064427.)

This should wrap up issue #2028.

  1. … 73 more files in changeset.
* tools/client-side/svnmucc/svnmucc.c

(subtract_anchor): Use svn_uri_is_child() instead of svn_path_is_child().

Name anonymous structs that my previous glob pattern verb(oversight)ed.

See r1053996 for details.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c,

subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,

subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c,

contrib/server-side/mod_dontdothat/mod_dontdothat.c,

contrib/server-side/svnstsw/src/main.c,

contrib/server-side/svnstsw/src/fso_is_changeable.c,

tools/client-side/svnmucc/svnmucc.c:

As above.

  1. … 6 more files in changeset.
Just padding my stats.

(Actually, doing my regular trailing whitespace removal, similar to r875968.)

* everywhere:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

  1. … 166 more files in changeset.