You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@subversion.apache.org by Apache Hudson Server <hu...@hudson.zones.apache.org> on 2010/03/05 18:01:11 UTC
Build failed in Hudson: subversion-trunk-ubuntu #444
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/444/changes>
Changes:
[julianfoad] Revert r919413 and r919436. There is a problem which I cannot fix right
now, in that workqueue.c:install_committed_file() looks on disk at the
special text-base temp path, to see if there is a file there. After r919413,
there probably won't ever be.
* libsvn_wc/adm_files.c,
libsvn_wc/adm_files.h,
libsvn_wc/update_editor.c
Revert.
[stsp] * subversion/include/svn_client.h
(svn_client_patch): Fix another typo in docstring.
[stsp] * subversion/include/svn_client.h
(svn_client_patch): Fix typo in docstring.
[stsp] * subversion/include/svn_client.h
(svn_client_patch): Document of what type elements in the FILTER_GLOBS
array parameter should be.
[stsp] Fix issue #3434, "svn patch API should have a patch target filter"
In addition to the requirements listed in issue #3434, allow the
filter list to contain glob patterns, and make the 'svn patch' command
capable of filtering patch targets.
* subversion/include/svn_client.h
(svn_client_patch): Add FILTER_GLOBS parameter.
* subversion/libsvn_client/patch.c
(): Include apr_fnmatch.h.
(patch_target_t): New field FILTERED.
(resolve_target_path, apply_one_patch): New paramter FILTER_GLOBS.
If a target matches a glob in FILTER_GLOBS, mark it as filtered
and return immediately.
(apply_patches_baton_t): New field FILTER_GLOBS.
(apply_patches): Ignore filtered targets.
(svn_client_patch): Add FILTER_GLOBS parameter, stuff it into the
apply_patches baton.
* subversion/svn/cl.h
(svn_cl__opt_state_t): New field EXCLUDE_PATTERNS.
* subversion/svn/main.c
(svn_cl__longopt_t): New field EXCLUDE_PATTERN.
(svn_cl__options): Add --exclude-pattern option.
(svn_cl__cmd_table): Make 'svn patch' accept the --exclude-pattern option.
(main): Handle --exclude-pattern option.
* subversion/svn/patch-cmd.c
(svn_cl__patch): Pass OPT_STATE->exclude_patterns on to svn_client_patch().
* subversion/tests/cmdline/patch_tests.py
(patch_with_exclude_patterns): New test.
(test_list): Add new test.
------------------------------------------
Started by an SCM change
Started by an SCM change
Building remotely on minerva.apache.org (Ubuntu)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U subversion/include/svn_client.h
U subversion/libsvn_wc/adm_files.c
U subversion/libsvn_wc/update_editor.c
U subversion/libsvn_wc/adm_files.h
U subversion/libsvn_client/patch.c
U subversion/tests/cmdline/patch_tests.py
U subversion/svn/patch-cmd.c
U subversion/svn/cl.h
U subversion/svn/main.c
At revision 919494
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/hudson9158616331379219135.sh
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'. Stop.
Recording test results
Hudson build is back to normal : subversion-trunk-ubuntu #447
Posted by Apache Hudson Server <hu...@hudson.zones.apache.org>.
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/447/>
Build failed in Hudson: subversion-trunk-ubuntu #446
Posted by Apache Hudson Server <hu...@hudson.zones.apache.org>.
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/446/changes>
Changes:
[hwright] JavaHL: Const-ify a couple of functions.
Suggested by: blair
* subversion/bindings/javahl/native/StringArray.h,
subversion/bindings/javahl/native/StringArray.cpp,
subversion/bindings/javahl/native/Array.h,
subversion/bindings/javahl/native/Array.cpp
(vector): Make const.
------------------------------------------
Started by an SCM change
Building remotely on minerva.apache.org (Ubuntu)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U subversion/bindings/javahl/native/StringArray.h
U subversion/bindings/javahl/native/StringArray.cpp
U subversion/bindings/javahl/native/Array.cpp
U subversion/bindings/javahl/native/Array.h
At revision 921222
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/hudson878989485226314083.sh
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'. Stop.
Recording test results
Build failed in Hudson: subversion-trunk-ubuntu #445
Posted by Apache Hudson Server <hu...@hudson.zones.apache.org>.
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/445/changes>
Changes:
[hwright] JavaHL: Take advantage of the new Array class within another function.
* subversion/bindings/javahl/native/RevpropTable.cpp
(RevpropTable): Use the Array class to create an array of keys.
[hwright] JavaHL: Fix a few header files to avoid a redundant declaration of SVN::Pool.
Instead of declaring the class (when it might also be declared previously by
some other header file), just include the header if needed. The header already
has the required #ifdef protection, and it doesn't cost much to parse it
again anyway.
* subversion/bindings/javahl/native/JNIThreadData.h,
subversion/bindings/javahl/native/RevisionRange.h,
subversion/bindings/javahl/native/RevpropTable.h,
subversion/bindings/javahl/native/CopySources.h:
Remove Pool class declaration and just include the Pool header.
[cmpilato] Do a partial wc-ng function converstion, and abstract some common
functionality for the purposes of eventual revisitation with an eye on
total wc-ng-ness.
* subversion/libsvn_wc/adm_ops.c
(mark_item_copied): New helper function which abstracts and
encapsulates uses of svn_wc_entry_t from ...
(mark_tree_copied): ...here (which now uses mark_item_copied(). Add
'dir_status' parameter. Also, use wc_db functionality to detect
node kind and status instead of entry_t-based APIs.
(svn_wc_add4): Update call to mark_tree_copied().
[hwright] JavaHL: Create a new C++ class which represents a generic array of Java
objects. Move the various collection parsing duties to this class, and make
the StringArray class inherit from it.
[ in subversion/bindings/javahl/ ]
* native/StringArray.h,
native/StringArray.cpp
(~StringArray): Don't destruct anything explicitly.
(init): New.
(StringArray): Use the parent constructor and then call the init function.
* native/Array.h,
native/Array.cpp:
New, copied and modified from StringArray.
[gstein] Fix two potential uses of an uninitialized variable, which caused sporadic
test failures. I also reorganized and commented the code, for clarity.
This fixes several test failures found by Matthew Bentham.
* subversion/libsvn_wc/update_editor.c:
(svn_wc_add_repos_file4): expand lead-in comment for the revert file
juggling. if base_get_info throws an error, then DO NOT attempt to
look at the STATUS variable -- it is likely uninitialized. rejigger
the if blocks to avoid the need for a REPLACED and WAS_REPLACED
variables. code flow is simple enough. rather than calling the
svn_wc__internal_is_replaced function to get the "old concept" of
"replaced", just directly use wc-ng functions and terms to detect if
we have possibly done an add (and this move before). there was a
similar uninitialized-use problem with WAS_REPLACED, but that variable
no longer exists.
[hwright] JavaHL: More native Set handling, this time with the two methods which took
revprop arrays.
[ in subversion/bindings/javahl/ ]
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_logMesssages,
Java_org_apache_subversion_javahl_SVNClient_getMergeinfoLog):
Update the param type.
* src/org/apache/subversion/javahl/SVNClient.java
(logMessages, getMergeinfoLog): Use revprops Sets in place of arrays, and
remove wrappers as needed.
[hwright] JavaHL: Pass path Sets directly to the native library, and remove any
temporary intermediate wrappers for same.
[ in subversion/bindings/javahl/ ]
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_remove,
Java_org_apache_subversion_javahl_SVNClient_update,
Java_org_apache_subversion_javahl_SVNClient_commit,
Java_org_apache_subversion_javahl_SVNClient_move,
Java_org_apache_subversion_javahl_SVNClient_mkdir,
Java_org_apache_subversion_javahl_SVNClient_addToChangelist,
Java_org_apache_subversion_javahl_SVNClient_removeFromChangelists,
Java_org_apache_subversion_javahl_SVNClient_lock,
Java_org_apache_subversion_javahl_SVNClient_unlock):
Change the jtarget params to jobjects from jobjectArrays.
* src/org/apache/subversion/javahl/SVNClient.java
(remove, update, commit, move, mkdir, addToChangelist, lock, unlock,
removeFromChangelists): Update the native version of these methods, and
remove wrappers as required.
[hwright] JavaHL: Remove some duplicate functionality from the Targets JNI class, and
allow it to take a StringArray in the constructor.
[ subversion/bindings/javahl/ ]
* native/SVNAdmin.h,
native/SVNAdmin.cpp
(rmtxns, rmlocks): Take StringArray parameters, since that's really what
is being used.
* native/StringArray.h,
native/StringArray.cpp
(vector): Add a function to return a reference to the underlying vector.
* native/Targets.h,
native/Targets.cpp
(Targets): Take a StringArray as the constructor argument.
(array): Update to use the underlying StringArray.
(setDoesNotContainsPath): Remove.
* native/org_apache_subversion_javahl_SVNAdmin.cpp
(Java_org_apache_subversion_javahl_SVNAdmin_rmtxns,
Java_org_apache_subversion_javahl_SVNAdmin_rmlocks):
Use a StringArray instead of Targets to process the incoming (not-path)
arguments.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_remove,
Java_org_apache_subversion_javahl_SVNClient_add,
Java_org_apache_subversion_javahl_SVNClient_update,
Java_org_apache_subversion_javahl_SVNClient_commit,
Java_org_apache_subversion_javahl_SVNClient_move,
Java_org_apache_subversion_javahl_SVNClient_mkdir,
Java_org_apache_subversion_javahl_SVNClient_addToChangelist,
Java_org_apache_subversion_javahl_SVNClient_remove,
Java_org_apache_subversion_javahl_SVNClient_lock,
Java_org_apache_subversion_javahl_SVNClient_unlock):
Create a StringArray to then create the Targets.
[hwright] JavaHL: Following up to r921058, allow the JNI code to natively handle *all*
changelist String collections.
[ in subversion/bindings/javahl/ ]
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_status,
Java_org_apache_subversion_javahl_SVNClient_revert,
Java_org_apache_subversion_javahl_SVNClient_commit,
Java_org_apache_subversion_javahl_SVNClient_properties,
Java_org_apache_subversion_javahl_SVNClient_propertySet,
Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2ILjava_util_Collection_2ZZZZ,
Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2ILjava_util_Collection_2ZZZZ,
Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2ILjava_util_Collection_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2,
Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2ILjava_util_Collection_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2,
Java_org_apache_subversion_javahl_SVNClient_addToChangelist,
Java_org_apache_subversion_javahl_SVNClient_removeFromChangelists,
Java_org_apache_subversion_javahl_SVNClient_info2):
Change the jchangelist arguments to simply jobject from jobjectArray.
* src/org/apache/subversion/javahl/SVNClient.java
(status, revert, commit, diff, diff, diffSummarize, diffSummarize,
properties, propertySet, propertyRemove, propertyCreate,
addToChangelist, removeFromChangelists, info2):
Make the native methods take the String collectiof of changelists, and,
in some cases, remove the now-defunct wrapper.
[hwright] JavaHL: Convert String collections to native string vectors in the JNI
code, eliminating the need to do so in the SVNClient Java class.
[ in subversion/bindings/javahl/ ]
* native/StringArray.h,
native/StringArray.cpp
(StringArray): New constructor which takes a collection of strings.
(~StringArray): Properly destroy the referenced collection.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_getChangelists):
Update function parameter list.
* src/org/apache/subversion/javahl/SVNClient.java
(getChangelists): Remove wrapper around the native method, since the native
version can now handle String collections.
[julianfoad] Speed up input stream processing in config parser and others that read
single bytes from a stream.
* subversion/libsvn_subr/subst.c
(translated_stream_read): Add an optimized code path for single byte read
requests.
Patch by: Stefan Fuhrmann <stefanfuhrmann{_AT_}alice-dsl.de>
[julianfoad] * subversion/libsvn_subr/subst.c
(translated_stream_read, translated_stream_write, translated_stream_close,
translated_stream_reset, translated_stream_mark, translated_stream_seek):
Add simple doc strings.
[hwright] [ in subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/Version.java,
src/org/tigris/subversion/javahl/SVNClient.java,
src/org/tigris/subversion/javahl/BlameCallback3.java,
src/org/tigris/subversion/javahl/Revision.java,
src/org/tigris/subversion/javahl/SubversionException.java,
src/org/tigris/subversion/javahl/OutputInterface.java,
src/org/tigris/subversion/javahl/Lock.java,
src/org/tigris/subversion/javahl/InputInterface.java,
src/org/tigris/subversion/javahl/ProplistCallback.java,
src/org/tigris/subversion/javahl/Path.java,
src/org/tigris/subversion/javahl/ClientException.java,
src/org/tigris/subversion/javahl/ChangelistCallback.java:
Remove unneeded imports.
[hwright] Trailing whitespace scrub.
* subversion/libsvn_subr/prompt.c,
subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java,
subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java,
subversion/bindings/javahl/native/CreateJ.cpp,
subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java,
subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,
subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java,
subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java,
subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java,
subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,
subversion/bindings/swig/ruby/test/test_wc.rb,
subversion/bindings/swig/ruby/svn/wc.rb,
subversion/tests/libsvn_subr/mergeinfo-test.c,
subversion/tests/cmdline/mergeinfo_tests.py,
subversion/tests/cmdline/log_tests.py,
subversion/tests/cmdline/upgrade_tests.py,
subversion/tests/cmdline/lock_tests.py,
subversion/tests/cmdline/switch_tests.py,
subversion/tests/cmdline/merge_authz_tests.py,
subversion/tests/cmdline/update_tests.py,
subversion/tests/cmdline/svntest/actions.py,
subversion/tests/cmdline/patch_tests.py,
subversion/tests/cmdline/merge_tests.py,
subversion/tests/cmdline/checkout_tests.py,
subversion/tests/libsvn_fs_fs/fs-pack-test.c,
subversion/libsvn_ra_svn/client.c,
subversion/svn/cl.h,
subversion/svn/notify.c,
subversion/include/svn_io.h,
subversion/include/svn_wc.h,
subversion/include/private/svn_wc_private.h,
subversion/libsvn_wc/util.c,
subversion/libsvn_wc/adm_ops.c,
subversion/libsvn_wc/status.c,
subversion/libsvn_wc/update_editor.c,
subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/wc_db.h,
subversion/libsvn_wc/upgrade.c,
subversion/libsvn_wc/workqueue.c,
subversion/libsvn_client/switch.c,
subversion/libsvn_client/externals.c,
subversion/libsvn_client/merge.c,
subversion/libsvn_client/patch.c,
subversion/libsvn_client/revert.c,
subversion/libsvn_client/copy.c,
subversion/libsvn_client/mergeinfo.c,
subversion/libsvn_client/update.c,
subversion/libsvn_client/commit_util.c,
subversion/libsvn_client/cleanup.c,
subversion/libsvn_ra_neon/ra_neon.h,
subversion/libsvn_repos/load.c,
subversion/libsvn_fs_fs/fs_fs.c,
subversion/libsvn_fs_fs/fs.h,
build/generator/gen_vcnet_vcproj.py,
build/generator/gen_win.py:
Scrub trailing whitespace.
[hwright] * build.conf
(private-built-includes): Add the Tristate class header.
[hwright] JavaHL: Use generics in one more location, and ignore a warning.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
(RevisionRange): Specify the type of the Comparable interface.
(compareTo): Take a RevisionRange object, and remove a cast.
(RevisionRange): Suppress a warning, since this function is called by
the native code.
[julianfoad] Add empty doc strings to the 141 static functions in libsvn_wc that didn't
have one. Why? To make me feel worse. But really, to give a tiny extra
visual cue that might encourage any passing programmer to write something in
it. This distinguishes them from non-static functions, which don't have a
doc string at their definition because it's at their declaration. Did I
make an exception for functions whose purpose is "so obvious that they don't
need one"? No.
* subversion/libsvn_wc/adm_crawler.c,
subversion/libsvn_wc/adm_files.c,
subversion/libsvn_wc/adm_ops.c,
subversion/libsvn_wc/ambient_depth_filter_editor.c,
subversion/libsvn_wc/conflicts.c,
subversion/libsvn_wc/deprecated.c,
subversion/libsvn_wc/entries.c,
subversion/libsvn_wc/lock.c,
subversion/libsvn_wc/log.c,
subversion/libsvn_wc/old-and-busted.c,
subversion/libsvn_wc/props.c,
subversion/libsvn_wc/relocate.c,
subversion/libsvn_wc/status.c,
subversion/libsvn_wc/translate.c,
subversion/libsvn_wc/tree_conflicts.c,
subversion/libsvn_wc/update_editor.c,
subversion/libsvn_wc/upgrade.c,
subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/workqueue.c
Add empty doc strings.
[philip] * subversion/include/svn_wc.h
(svn_wc_queue_committed2): Mark SVN_DEPRECATE.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_queue_committed2, svn_wc_process_committed_queue): Delete, moved
to deprecated.c.
* subversion/libsvn_wc/deprecated.c
(svn_wc_queue_committed2, svn_wc_process_committed_queue): Add, moved
from adm_ops.c.
[philip] Remove some access batons from post-commit processing.
* subversion/include/svn_wc.h
(svn_wc_queue_committed3, svn_wc_process_committed_queue2): New.
(svn_wc_queue_committed2, svn_wc_process_committed_queue): Deprecate.
* subversion/libsvn_wc/adm_ops.c
(struct committed_queue_item_t): Remove adm_abspath.
(process_committed_internal): Remove adm_abspath parameter, derive
abspath from path.
(svn_wc_queue_committed3): Renamed from svn_wc_process_committed_queue2
with access baton parameter removed.
(svn_wc_queue_committed2): Call svn_wc_queue_committed3.
(svn_wc_process_committed_queue2): Renamed svn_wc_process_committed_queue
with access baton parameter changed to wc context.
(svn_wc_process_committed_queue): Call svn_wc_process_committed_queue2.
* subversion/libsvn_client/commit.c
(svn_client_commit4): Call svn_wc_queue_committed3 and
svn_wc_process_committed_queue2.
[julianfoad] * subversion/libsvn_wc/update_editor.c
(accumulate_last_change): Assert that any lock token property received
here is deleting a lock token, as required by the (new) doc string.
[julianfoad] Try to fix up two WC-NG doc strings in update_editor.c.
### Add an assertion.
* subversion/libsvn_wc/update_editor.c
(accumulate_last_change): Write a better doc string.
(install_added_props): Add docco about the function and how it's in
transition to WC-NG.
[philip] * subversion/libsvn_client/client.h
(svn_client__copy_pair_t, svn_client__harvest_committables): Tweak doc string.
* subversion/libsvn_client/commit_util.c
(harvest_committables): Tweak doc string.
[philip] * subversion/libsvn_wc/update_editor.c
(cleanup_dir_baton): Use the proper wc context.
[rhuijben] Update some comments on svn_wc_add_repos_file4() and drop an unused argument.
* subversion/include/svn_wc.h
(svn_wc_add_repos_file4): Bring comment a bit to the WC-NG world.
* subversion/libsvn_wc/update_editor.c
(install_added_props): Update comment, drop dir_abspath argument.
(svn_wc_add_repos_file4): Update caller.
Suggested by: julianfoad
[julianfoad] Replace tabs with spaces.
* subversion/bindings/swig/INSTALL,
subversion/bindings/swig/NOTES,
subversion/tests/README,
subversion/libsvn_diff/diff.h,
subversion/libsvn_ra_neon/log.c,
subversion/libsvn_ra_serf/auth_kerb.c,
subversion/libsvn_ra_serf/auth_kerb.h,
subversion/libsvn_repos/commit.c,
subversion/libsvn_subr/quoprint.c,
subversion/libsvn_subr/simple_providers.c,
subversion/libsvn_subr/stream.c,
subversion/svn_private_config.hw,
subversion/tests/cmdline/commit_tests.py,
subversion/tests/cmdline/depth_tests.py,
subversion/tests/libsvn_diff/diff-diff3-test.c
Replace tabs with spaces.
[julianfoad] * subversion/libsvn_wc/lock.c
Convert tabs to spaces. A follow-up to r920424.
[julianfoad] * subversion/libsvn_wc/adm_ops.c
(mark_tree_copied, mark_tree_deleted): Fix typos in doc strings.
[cmpilato] * subversion/libsvn_wc/adm_ops.c
(mark_tree_deleted): Remove now-unnecessary call to
svn_wc__db_read_info(), since r920522 removed all the logic that
used the status bit it returns.
Suggested by: rhuijben
[gstein] * subversion/libsvn_wc/entries.c:
(read_entries_new): simple comment tweak.
[rhuijben] * subversion/libsvn_wc/adm_crawler.c
(svn_wc_crawl_revisions5): Collect data directly from BASE_NODE instead
of deriving it from WORKING_NODE and then looking for more details.
[rhuijben] * subversion/libsvn_wc/update_editor.c
(install_added_props): Remove call to svn_wc__db_base_set_dav_cache()
as the only caller, svn_wc_add_repos_file4() should never change
BASE_NODE information. (The information that was stored before this
patch is from the copy from origin, which is unrelated to the
BASE_NODE)
[cmpilato] * subversion/libsvn_wc/adm_ops.c
(mark_tree_deleted): Oops! Remove unnecessary local variable (and
population thereof) added in r920522.
[cmpilato] * subversion/libsvn_wc/adm_ops.c
(mark_tree_deleted): Further simplify this function, only calling
svn_wc__db_temp_op_delete() once per directory and taking
advantage of the smarter logic in temp_op_delete() to avoid
similar logic in this function.
[rhuijben] * subversion/libsvn_wc/update_editor.c
(svn_wc_add_repos_file4): Replace two entry reads by wc_db calls.
[hwright] JavaHL: Expose two flags as part of ChangePath class.
[ in subversion/bindings/javahl/ ]
* native/EnumMapper.h,
native/EnumMapper.cpp
(mapTristate): New.
* native/LogMessageCallback.cpp
(singleMessage): Update method signature and call for initializing a
ChangePath.
* src/org/apache/subversion/javahl/Tristate.java:
New.
* src/org/apache/subversion/javahl/ChangePath.java
(ChangePath): Update constructor.
(textMods, propMods): New.
(getTextMods, getPropMods): New.
[philip] Remove some svn_wc_entry_t using code.
* subversion/include/private/svn_wc_private.h
(svn_wc__path_switched): Remove SVN_ERR_ENTRY_MISSING_URL from doc
string, the caller wasn't taking advantage of it.
(svn_wc__adm_open_anchor_in_context): Delete.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_path_switched): Delete.
* subversion/libsvn_wc/util.c
(svn_wc__internal_path_switched): Delete.
(svn_wc__path_switched): Move to lock.c.
* subversion/libsvn_wc/lock.c
(child_is_disjoint): Check for SVN_ERR_WC_NOT_DIRECTORY.
(svn_wc__adm_open_anchor_in_context): Delete.
(svn_wc__path_switched): Copied from util.c, just call child_is_disjoint.
[hwright] JavaHL: Fix some typos in docstrings related to parameter names.
[ in subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/BlameCallback3.java,
src/org/tigris/subversion/javahl/SVNClientInterface.java,
src/org/apache/subversion/javahl/ISVNClient.java,
src/org/apache/subversion/javahl/DiffSummary.java:
Update pamameter names in docstrings to match method parameter names.
[hwright] JavaHL: Fix test failures caused by r920366 by introducing a inner LogMessage
class for test usage.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(LogMessage): New.
[rhuijben] Update the adm crawler to just using the BASE_NODE information for
calculating update information. Recent commits (read: r919992), removed
the last few hurdles to make this possible.
* subversion/libsvn_wc/adm_crawler.c
(report_revisions_and_depths): Update to use only BASE_NODE where possible,
as we don't have to tell the server about local additions for updates.
Also switch to the normal scratch_pool pattern instead of also using a
subpool.
[hwright] JavaHL: Remove a now-unused class.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java:
Remove.
[markphip] JavaHL: Change constructors from package protected to public so that
alternate JavaHL implementations like SVNKit do not have to use our package
namespace just so that they can construct these classes.
Patch by: Alexander Kitaev
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/ChangePath.java:
* src/org/apache/subversion/javahl/CommitItem.java:
* src/org/apache/subversion/javahl/ConflictDescriptor.java:
* src/org/apache/subversion/javahl/ConflictVersion.java:
* src/org/apache/subversion/javahl/DiffSummary.java:
* src/org/apache/subversion/javahl/DirEntry.java:
* src/org/apache/subversion/javahl/Info.java:
* src/org/apache/subversion/javahl/Info2.java:
* src/org/apache/subversion/javahl/Lock.java:
* src/org/apache/subversion/javahl/LogMessage.java:
* src/org/apache/subversion/javahl/NotifyInformation.java:
* src/org/apache/subversion/javahl/ProgressEvent.java:
Make constructor public.
[julianfoad] * subversion/libsvn_wc/update_editor.c
(get_empty_tmp_file): Note the inefficiencies of using this function.
[markphip] JavaHL: Change NativeResources.version to private and add a public
getVersion() method to retrieve it. This was suggested by SVNKit to
facilitate supporting our new and old namespace in their implementation.
Patch by: Alexander Kitaev
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/NativeResources.java:
Make version private and add public getVersion method.
* src/org/apache/subversion/javahl/SVNAdmin.java:
* src/org/apache/subversion/javahl/SVNClient.java:
* src/org/tigris/subversion/javahl/SVNAdmin.java:
* src/org/tigris/subversion/javahl/SVNClient.java:
Use NativeResources.getVersion() instead of accessing field
directly.
[philip] Followup to r920336.
* subversion/libsvn_client/commit_utils.c
(struct path_driver_cb_baton): Remove unused access baton.
[markphip] JavaHL: Extract interface from SVNAdmin class to make it easier for
alternative implementations to exist.
Suggested by: Alexander Kitaev
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/ISVNAdmin.java
New interface class for SVNAdmin methods.
* src/org/apache/subversion/javahl/SVNAdmin.java
Updated to implement ISVNAdmin.
* tests/org/apache/subversion/javahl/SVNTests.java:
Reference ISVNAdmin instead of SVNAdmin.
[philip] Remove access baton from svn_client__harvest_committables. Explicitly
use absolute paths in svn_client__copy_pair_t (they were mostly absolute
already).
* subversion/libsvn_client/client.h
(svn_client__harvest_committables): Change access baton parameter to an
abspath.
(svn_client__get_copy_source): Tweak docstring.
(struct svn_client__copy_pair_t): Remove src_abs, rename dst_parent to
dst_parent_abspath, document that other paths are absolute.
* subversion/libsvn_client/commit_utils.c
(harvest_committables): Rename parameter, remove p_path.
(svn_client__harvest_committables): Change access baton parameter to an
abspath.
* subversion/libsvn_client/commit.c
(svn_client_commit4): Update svn_client__harvest_committables call.
* subversion/libsvn_client/copy.c
(do_wc_to_wc_copies_with_write_lock): No need to convert to absolute.
(do_wc_to_wc_moves_with_locks2): Don't use src_abs.
(do_wc_to_wc_moves): No need to convert to absolute.
(wc_to_wc_copy): Use dst_parent_abspath.
(wc_to_repos_copy): Don't use src_abs.
(try_copy): Always put abspaths into copy_pairs.
[philip] * subversion/include/svn_dirent_uri.h (svn_dirent_is_child): Tweak docstring
[rhuijben] Resolve issue #3535, by making it possible to checkout repositories from a
Windows drive root. Based on a patch by Hugo Bastos Weber, but extended to
produce a better dirent. (The original version should work in 1.6.X,
because the code doesn't use dirents there)
* subversion/libsvn_ra_local/split_url.c
(svn_ra_local__split_URL): Allow urls in the form 'file:///E:' to be used
for finding a repository. Resolve this class of paths to a "E:/" like
dirent to make sure that the code handles different current directories
correctly.
* subversion/tests/cmdline/checkout_tests.py
(imports): Add subprocess.
(checkout_wc_from_drive):
New function, based on update_wc_on_windows_drive() in update_tests.py.
(test_list): Add checkout_wc_from_drive.
Patch by: Hugo Bastos Weber
(Tweaks and testcase by me)
[julianfoad] Assert that input paths are absolute where required, in a few functions
including those that were documented in r919106 as now taking absolute paths.
Suggested by: gstein
* subversion/libsvn_wc/adm_files.c
(svn_wc__get_revert_contents, open_adm_file,
svn_wc__open_adm_stream, svn_wc__open_writable_base,
svn_wc__adm_destroy, svn_wc__adm_cleanup_tmp_area): Assert that the input
path is an absolute path.
[rhuijben] * update_tests.py
(update_wc_on_windows_drive):
Add early bailout if not on Windows and add a workaround for when
the win32api python import is not available (like on some x64 installs).
[philip] * subversion/libsvn_client/switch.c (switch_internal): Make static.
[rhuijben] * subversion/libsvn_client/cleanup.c
(svn_client_upgrade): Plug an error leak and remove an unneeded if.
[dannas] Fix issue #3483 - extend svn_client_upgrade() to include externals. I've
done the externals upgrading after wc upgrade is finished. In that way
no errors in the externals will affect the wc.
* subversion/libsvn_client/cleanup.c
(svn_client_upgrade): Get all svn:externals. We need the target_dir so
we have to parse the description. For each target_dir we call
svn_wc_upgrade() which will recursively upgrade the external.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_with_externals): New. Checks the format of a 1.6 wc upgraded
to wc-ng.
(test_list): Add upgrade with_externals.
* subversion/tests/cmdline/upgrade_tests_data/upgrade_with_extenals.tar.bz2
(...): New. An 1.6 wc with the same structure as those used in
externals_tests.py.
Approved by: rhuijben
[rhuijben] When crawling the working copy for updating we are only interested in BASE
nodes, so we can safely ignore nodes that are only available in working.
In practice this doesn't work right on each and every working copy as
usages of svn_wc_add_repos_file4() could remove the .deleted (BASE)
information from the parent stub until this mangling was fixed in r919992.
(The merge to one-db will consolidate all this information, so this
shouldn't have any impact on working copies created in 1.6)
* subversion/libsvn_wc/adm_crawler.c
(report_revisions_and_depths): Iterate over just the checked out nodes
as we explicitly ignore local additions in the next step.
[rdonch] [in subversion/bindings/swig/python/tests]
* core.py,
delta.py,
pool.py,
wc.py,
mergeinfo.py,
run_all.py,
auth.py,
ra.py: Fix some code style issues found by pylint. This mostly includes
inserting whitespace, removing unneeded imports and semicolons, and
renaming identifiers colliding with reserved names.
Suggested by: bhuvan
[rhuijben] * subversion/libsvn_wc/update_editor.c
(open_directory):
Following up upon r920033, always check for incomplete in the
BASE_NODE table, as we are not interested in other incomplete
states.
[rhuijben] A few small cleanups of status retrievals in the update editor.
* subversion/libsvn_wc/update_editor.c
(complete_directory): Read status for determining exclusion and remove
resetting of depth as that is already done by just updating the node.
Remove incomplete WORKING_NODE check as this case is already fixed.
(open_root): Read BASE_NODE for determining incomplete status.
[rhuijben] Prepare the update editor for more direct WC-DB usage by making it use
repository relative paths for its calculations.
* subversion/libsvn_wc/update_editor.c
(edit_baton): Rename variable.
(dir_baton): Rename variable.
(node_get_url_ignore_errors): Rename to ...
(node_get_relpath_ignore_errors): ... this and use some wc_db apis
instead of svn_wc__node helpers.
(make_dir_baton): Calculate relative path instead of full uri.
(file_baton): Rename variable.
(make_file_baton): Calculate relative path instead of full uri.
(open_root): Fetch full uri for entry operation.
(check_tree_conflict): Take relative path instead of url.
(do_entry_deletion): Accept relative path and calculate full url
if re-adding a node via its entry.
(delete_entry): Construct relative path.
(add_directory, open_directory, add_file,
open_file): Create full urls for error messages and update calls
to functions that changed to relative paths.
(loggy_tweak_base_node): Add repos_root argument.
(merge_file): Update caller.
(close_edit): Construct full url.
(make_editor): Assert on repository_root and construct switch
relative path.
[rhuijben] * build/generator/templates/vcnet_vcproj.ezt
Enable stack and variable initialization validation in debug builds
for VS 2005 and 2008.
[rhuijben] Replace the loggy_tweak_entry() function in the update editor by two more
specific functions. One for updating BASE_NODE from the update editor and
one for updating WORKING_NODE from svn_wc_add_repos_file4().
* subversion/libsvn_wc/update_editor.c
(loggy_tweak_entry): Rename to ...
(loggy_tweak_base_node): ... this. Remove dir_abspath argument and
get parent directory internally.
(merge_file): Update to use loggy_tweak_base_node.
(loggy_tweak_working_node): New function, based on the old
loggy_tweak_entry() function. Remove updating of deleted, absent,
url and revnum, which only apply to updating base nodes.
(svn_wc_add_repos_file4): Update to use loggy_tweak_working_node.
[fabien] French translation update for r919760.
* subversion/po/fr.po: po-update & 4 fuzzy & 4 new
[rhuijben] * subversion/libsvn_wc/update_editor.c
(svn_wc_add_repos_file4):
Add comment about updating WORKING_NODE vs BASE_NODE.
[neels] * subversion/libsvn_wc/update_editor.c (check_tree_conflict): Comment tweak.
[rhuijben] * subversion/tests/cmdline/svntest/main.py
(TestSpawningThread.run_one):
Don't use binary mode for spawning parallel testcase processes to
avoid a blank line after every normal line of test output on Windows,
when running tests parallel.
[rhuijben] * subversion/libsvn_client/ra.c
(svn_client__open_ra_session_internal):
Following up on r919674, make sure that uuid is NULL on failures.
[rhuijben] * subversion/libsvn_client/ra.c
(svn_client__open_ra_session_internal):
Ignore all errors on retrieving wc information. This matches
the behavior of this internal function in 1.6. This should fix
most errors on the buildbots, caused by running the testsuite
below a 1.6 working copy.
------------------------------------------
Started by an SCM change
Building remotely on minerva.apache.org (Ubuntu)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U build.conf
U subversion/include/svn_dirent_uri.h
U subversion/include/svn_io.h
U subversion/include/svn_wc.h
U subversion/include/private/svn_wc_private.h
U subversion/libsvn_diff/diff.h
U subversion/libsvn_wc/relocate.c
U subversion/libsvn_wc/deprecated.c
U subversion/libsvn_wc/props.c
U subversion/libsvn_wc/util.c
U subversion/libsvn_wc/ambient_depth_filter_editor.c
U subversion/libsvn_wc/wc.h
U subversion/libsvn_wc/adm_ops.c
U subversion/libsvn_wc/status.c
U subversion/libsvn_wc/adm_files.c
U subversion/libsvn_wc/conflicts.c
U subversion/libsvn_wc/update_editor.c
U subversion/libsvn_wc/lock.c
U subversion/libsvn_wc/translate.c
U subversion/libsvn_wc/old-and-busted.c
U subversion/libsvn_wc/tree_conflicts.c
U subversion/libsvn_wc/entries.c
U subversion/libsvn_wc/wc_db.c
U subversion/libsvn_wc/adm_crawler.c
U subversion/libsvn_wc/log.c
U subversion/libsvn_wc/wc_db.h
U subversion/libsvn_wc/upgrade.c
U subversion/libsvn_wc/workqueue.c
U subversion/libsvn_subr/subst.c
U subversion/libsvn_subr/quoprint.c
U subversion/libsvn_subr/simple_providers.c
U subversion/libsvn_subr/prompt.c
U subversion/libsvn_subr/stream.c
U subversion/libsvn_ra_local/split_url.c
U subversion/libsvn_client/switch.c
U subversion/libsvn_client/externals.c
U subversion/libsvn_client/client.h
U subversion/libsvn_client/merge.c
U subversion/libsvn_client/patch.c
U subversion/libsvn_client/ra.c
U subversion/libsvn_client/revert.c
U subversion/libsvn_client/copy.c
U subversion/libsvn_client/mergeinfo.c
U subversion/libsvn_client/update.c
U subversion/libsvn_client/commit_util.c
U subversion/libsvn_client/cleanup.c
U subversion/libsvn_client/commit.c
U subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
U subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
U subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
U subversion/bindings/javahl/native/CreateJ.cpp
U subversion/bindings/javahl/native/SVNAdmin.cpp
U subversion/bindings/javahl/native/JNIThreadData.h
U subversion/bindings/javahl/native/StringArray.h
U subversion/bindings/javahl/native/Targets.h
U subversion/bindings/javahl/native/RevisionRange.h
U subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
U subversion/bindings/javahl/native/StringArray.cpp
U subversion/bindings/javahl/native/Targets.cpp
U subversion/bindings/javahl/native/RevpropTable.h
U subversion/bindings/javahl/native/EnumMapper.h
A subversion/bindings/javahl/native/Array.cpp
U subversion/bindings/javahl/native/CopySources.h
U subversion/bindings/javahl/native/LogMessageCallback.cpp
U subversion/bindings/javahl/native/RevpropTable.cpp
U subversion/bindings/javahl/native/EnumMapper.cpp
U subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
A subversion/bindings/javahl/native/Array.h
U subversion/bindings/javahl/native/SVNAdmin.h
D subversion/bindings/javahl/src/org/apache/subversion/javahl/LogMessage.java
A subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
AU subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/NotifyInformation.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
U subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SubversionException.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallback.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/ClientException.java
U subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangelistCallback.java
U subversion/bindings/swig/python/tests/core.py
U subversion/bindings/swig/python/tests/delta.py
U subversion/bindings/swig/python/tests/pool.py
U subversion/bindings/swig/python/tests/wc.py
U subversion/bindings/swig/python/tests/mergeinfo.py
U subversion/bindings/swig/python/tests/run_all.py
U subversion/bindings/swig/python/tests/client.py
U subversion/bindings/swig/python/tests/repository.py
U subversion/bindings/swig/python/tests/auth.py
U subversion/bindings/swig/python/tests/ra.py
U subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
U subversion/bindings/swig/ruby/test/test_wc.rb
U subversion/bindings/swig/ruby/svn/wc.rb
U subversion/bindings/swig/INSTALL
U subversion/bindings/swig/NOTES
U subversion/libsvn_ra_serf/auth_kerb.c
U subversion/libsvn_ra_serf/auth_kerb.h
U subversion/libsvn_ra_neon/log.c
U subversion/libsvn_ra_neon/ra_neon.h
U subversion/svn_private_config.hw
U subversion/tests/libsvn_diff/diff-diff3-test.c
U subversion/tests/libsvn_subr/mergeinfo-test.c
U subversion/tests/README
U subversion/tests/cmdline/mergeinfo_tests.py
U subversion/tests/cmdline/log_tests.py
U subversion/tests/cmdline/upgrade_tests.py
U subversion/tests/cmdline/lock_tests.py
U subversion/tests/cmdline/switch_tests.py
U subversion/tests/cmdline/merge_authz_tests.py
U subversion/tests/cmdline/update_tests.py
U subversion/tests/cmdline/commit_tests.py
AU subversion/tests/cmdline/upgrade_tests_data/upgrade_with_externals.tar.bz2
U subversion/tests/cmdline/svntest/actions.py
U subversion/tests/cmdline/svntest/main.py
U subversion/tests/cmdline/patch_tests.py
U subversion/tests/cmdline/merge_tests.py
U subversion/tests/cmdline/depth_tests.py
U subversion/tests/cmdline/checkout_tests.py
U subversion/tests/libsvn_fs_fs/fs-pack-test.c
U subversion/libsvn_ra_svn/client.c
U subversion/libsvn_repos/load.c
U subversion/libsvn_repos/commit.c
U subversion/svn/cl.h
U subversion/svn/notify.c
U subversion/libsvn_fs_fs/fs_fs.c
U subversion/libsvn_fs_fs/fs.h
U subversion/po/fr.po
U build/generator/gen_vcnet_vcproj.py
U build/generator/templates/vcnet_vcproj.ezt
U build/generator/gen_win.py
At revision 921212
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/hudson3616939888833143446.sh
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'. Stop.
Recording test results