You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/03/23 16:27:33 UTC
svn commit: r1668667 [1/3] - in /subversion/branches/move-tracking-2: ./
subversion/ subversion/bindings/javahl/native/
subversion/bindings/swig/include/ subversion/bindings/swig/perl/native/
subversion/include/ subversion/include/private/ subversion/l...
Author: julianfoad
Date: Mon Mar 23 15:27:31 2015
New Revision: 1668667
URL: http://svn.apache.org/r1668667
Log:
On the 'move-tracking-2' branch: catch up to trunk@1668666.
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/CHANGES (contents, props changed)
subversion/branches/move-tracking-2/Makefile.in (contents, props changed)
subversion/branches/move-tracking-2/NOTICE (contents, props changed)
subversion/branches/move-tracking-2/subversion/ (props changed)
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.h
subversion/branches/move-tracking-2/subversion/bindings/swig/include/svn_types.swg
subversion/branches/move-tracking-2/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/move-tracking-2/subversion/include/private/svn_fs_fs_private.h
subversion/branches/move-tracking-2/subversion/include/svn_config.h
subversion/branches/move-tracking-2/subversion/include/svn_diff.h
subversion/branches/move-tracking-2/subversion/include/svn_fs.h
subversion/branches/move-tracking-2/subversion/include/svn_io.h
subversion/branches/move-tracking-2/subversion/include/svn_ra.h
subversion/branches/move-tracking-2/subversion/include/svn_repos.h
subversion/branches/move-tracking-2/subversion/include/svn_string.h
subversion/branches/move-tracking-2/subversion/include/svn_wc.h
subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_file.c
subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_memory.c
subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c
subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.h
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/verify.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/ (props changed)
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/tree.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/serf.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/repos.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/config_win.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/properties.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/stream.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/version.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/delete.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/diff_editor.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/entries.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/info.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/merge.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/props.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/questions.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_private.h
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/workqueue.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/deadprops.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/get-location-segments.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/log.c
subversion/branches/move-tracking-2/subversion/svn/conflict-callbacks.c
subversion/branches/move-tracking-2/subversion/svn/diff-cmd.c
subversion/branches/move-tracking-2/subversion/svnrdump/load_editor.c
subversion/branches/move-tracking-2/subversion/svnserve/serve.c
subversion/branches/move-tracking-2/subversion/tests/cmdline/diff_tests.py
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/move-tracking-2/tools/ (props changed)
subversion/branches/move-tracking-2/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
subversion/branches/move-tracking-2/tools/dev/fsfs-access-map.c
subversion/branches/move-tracking-2/tools/dist/release.py
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 23 15:27:31 2015
@@ -88,4 +88,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1606692-1666945
+/subversion/trunk:1606692-1668666
Modified: subversion/branches/move-tracking-2/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/CHANGES?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/CHANGES (original)
+++ subversion/branches/move-tracking-2/CHANGES Mon Mar 23 15:27:31 2015
@@ -692,12 +692,13 @@ http://svn.apache.org/repos/asf/subversi
* swig-py: fix support for svn_ra_lock() and svn_ra_unlock() (r1662891)
-Version 1.8.12
-(?? ?? 2015, from /branches/1.8.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.8.12
+Version 1.8.13
+(31 Mar 2015, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.13
User-visible changes:
- Client-side bugfixes:
+ * ra_serf: prevent abort of commits that have already succeeded (r1659867)
* ra_serf: support case-insensitivity in HTTP headers (r1650481, r1650489)
* better error message if an external is shadowed (r1655712, r1655738)
* ra_svn: fix reporting of directory read errors (r1656713)
@@ -708,12 +709,27 @@ http://svn.apache.org/repos/asf/subversi
* fix working copy corruption with relative file external (issue #4411)
* don't crash if config file is unreadable (r1590751, r1660350)
* svn resolve: don't ask a question with only one answer (r1658417)
+ * fix assertion failure in svn move (r1651963 et al)
+ * working copy performance improvements (r1664531, r1664476, et al)
+ * handle existing working copies which become externals (r1660071)
+ * fix recording of WC meta-data for foreign repos copies (r1660593)
+ * fix calculating repository path of replaced directories (r1660646)
+ * fix calculating repository path after commit of switched nodes (r1663991)
+ * svnrdump: don't provide HEAD+1 as base revision for deletes (r1664684)
+ * don't leave conflict markers on files that are moved (r1660220, r1665874)
+ * avoid unnecessary subtree mergeinfo recording (r1666690)
+ * fix diff of a locally copied directory with props (r1619380 et al)
- Server-side bugfixes:
+ * fsfs: fix a problem verifying pre-1.4 repos used with 1.8 (r1561419)
* svnadmin freeze: fix memory allocation error (r1653039)
* svnadmin load: tolerate invalid mergeinfo at r0 (r1643074, issue #4476)
* svnadmin load: strip references to r1 from mergeinfo (issue #4538)
* svnsync: strip any r0 references from mergeinfo (issue #4476)
+ * fsfs: reduce memory consumption when operating on dag nodes (r1655651)
+ * reject invalid get-location-segments requests in mod_dav_svn and
+ svnserve (r1667233)
+ * mod_dav_svn: reject invalid txnprop change requests (r1667235)
- Client-side and server-side bugfixes:
* fix undefined behaviour in string buffer routines (r1650834)
@@ -727,6 +743,11 @@ http://svn.apache.org/repos/asf/subversi
* make sqlite amalgamated build work with sqlite 3.8.x+ (r1659399)
* fix build with Ruby 2 (r1596882)
* process 'svnadmin dump' output as binary in the test suite (r1592987)
+ * simplify Windows resource compilation to avoid warnings (r1532287)
+
+
+Version 1.8.12
+(Not released, see changes for 1.8.13.)
Version 1.8.11
@@ -1506,15 +1527,25 @@ http://svn.apache.org/repos/asf/subversi
Version 1.7.20
-(?? ??? 2015, from /branches/1.7.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.7.19
+(31 Mar 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.20
User-visible changes:
+ - Client-side bugfixes:
+ * fix 'svn patch' output for reordered hunks (issue #4533)
+
+ - Server-side bugfixes:
+ * reject invalid get-location-segments requests in mod_dav_svn and
+ svnserve (r1667233)
+ * mod_dav_svn: reject invalid txnprop change requests (r1667235)
+
- Client-side and server-side bugfixes:
* properly duplicate svn error objects (r1651759)
+ * fix use-after-free in config parser (1646785, r1646786, r1646797)
Developer-visible changes:
* add lock file config for testing against HTTPD 2.4+ (r1544302, r1544303)
+ * fix build with absolute path to neon install (r1664789)
Version 1.7.19
Propchange: subversion/branches/move-tracking-2/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 23 15:27:31 2015
@@ -86,4 +86,4 @@
/subversion/branches/verify-at-commit/CHANGES:1462039-1462408
/subversion/branches/verify-keep-going/CHANGES:1439280-1546110
/subversion/branches/wc-collate-path/CHANGES:1402685-1480384
-/subversion/trunk/CHANGES:1606692-1666945
+/subversion/trunk/CHANGES:1606692-1668666
Modified: subversion/branches/move-tracking-2/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/Makefile.in?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/Makefile.in (original)
+++ subversion/branches/move-tracking-2/Makefile.in Mon Mar 23 15:27:31 2015
@@ -849,7 +849,11 @@ swig-pl_DEPS = autogen-swig-pl libsvn_sw
$(SWIG_PL_DIR)/native/Makefile
swig-pl: $(swig-pl_DEPS)
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
- ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
+ for f in $(SWIG_PL_SRC_DIR)/native/*.c ; do \
+ if [ -e "$$f" ] ; then \
+ ln -sf "$$f" $(SWIG_PL_DIR)/native; \
+ fi; \
+ done; \
fi
cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"
Propchange: subversion/branches/move-tracking-2/Makefile.in
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 23 15:27:31 2015
@@ -86,4 +86,4 @@
/subversion/branches/verify-at-commit/Makefile.in:1462039-1462408
/subversion/branches/verify-keep-going/Makefile.in:1439280-1546110
/subversion/branches/wc-collate-path/Makefile.in:1402685-1480384
-/subversion/trunk/Makefile.in:1606692-1660163
+/subversion/trunk/Makefile.in:1606692-1668666
Modified: subversion/branches/move-tracking-2/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/NOTICE?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/NOTICE (original)
+++ subversion/branches/move-tracking-2/NOTICE Mon Mar 23 15:27:31 2015
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Propchange: subversion/branches/move-tracking-2/NOTICE
('svn:mergeinfo' removed)
Propchange: subversion/branches/move-tracking-2/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 23 15:27:31 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/subversion:1462039-1462408
/subversion/branches/verify-keep-going/subversion:1439280-1546110
/subversion/branches/wc-collate-path/subversion:1402685-1480384
-/subversion/trunk/subversion:1606692-1666945
+/subversion/trunk/subversion:1606692-1668666
Modified: subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.cpp Mon Mar 23 15:27:31 2015
@@ -214,6 +214,8 @@ RemoteSession::RemoteSession(int retryAt
cycle_detected = true;
break;
}
+ /* ### Shouldn't url be updated for the next attempt?
+ ### There is no real cycle if we just do the same thing twice? */
}
if (cycle_detected)
Modified: subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.h (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/RemoteSession.h Mon Mar 23 15:27:31 2015
@@ -56,7 +56,7 @@ class RemoteSession : public SVNBase
const char* username, const char* password,
Prompter::UniquePtr prompter, jobject jprogress,
jobject jcfgcb, jobject jtunnelcb);
- ~RemoteSession();
+ virtual ~RemoteSession();
void cancelOperation() const { m_context->cancelOperation(); }
@@ -102,7 +102,6 @@ class RemoteSession : public SVNBase
jlong jstart_revision, jlong jend_revision,
jboolean jinclude_merged_revisions,
jobject jcallback);
- // TODO: getFileRevisions
// TODO: lock
// TODO: unlock
// TODO: getLock
Modified: subversion/branches/move-tracking-2/subversion/bindings/swig/include/svn_types.swg
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/swig/include/svn_types.swg?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/swig/include/svn_types.swg Mon Mar 23 15:27:31 2015
@@ -1116,11 +1116,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
}
%typemap(argout) unsigned char *result_digest {
- /* FIXME: This code is clearly buggy. The return value of sv_newmortal()
- is immediately overwritten by the return value
- of svn_swig_pl_from_md5(). */
- ST(argvi) = sv_newmortal();
- ST(argvi++) = svn_swig_pl_from_md5($1);
+ %append_output(svn_swig_pl_from_md5($1));
}
#endif
Modified: subversion/branches/move-tracking-2/subversion/bindings/swig/perl/native/Core.pm
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/swig/perl/native/Core.pm?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/swig/perl/native/Core.pm (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/swig/perl/native/Core.pm Mon Mar 23 15:27:31 2015
@@ -959,6 +959,8 @@ use SVN::Base qw(Core svn_log_entry_t_);
=head2 svn_log_entry_t
+=over 4
+
=item $entry-E<gt>revision()
The revision of the commit.
@@ -988,6 +990,8 @@ in the same sense of C<_p_svn_merge_rang
Whether C<$entry-E<gt>revision()> is a merged revision resulting
from a reverse merge.
+=back
+
=cut
package _p_svn_auth_cred_simple_t;
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_fs_fs_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_fs_fs_private.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_fs_fs_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_fs_fs_private.h Mon Mar 23 15:27:31 2015
@@ -53,7 +53,8 @@ typedef struct svn_fs_fs__large_change_i
/* size of the (deltified) representation */
apr_uint64_t size;
- /* Revision of the representation. SVN_INVALID_REVNUM for unused entries. */
+ /* Revision of the representation. SVN_INVALID_REVNUM for unused entries.
+ */
svn_revnum_t revision;
/* node path. "" for unused instances */
@@ -267,19 +268,20 @@ svn_fs_fs__get_stats(svn_fs_fs__stats_t
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Node-revision IDs in FSFS consist of 3 of sub-IDs ("parts") that consist
+/* A node-revision ID in FSFS consists of 3 sub-IDs ("parts") that consist
* of a creation REVISION number and some revision- / transaction-local
* counter value (NUMBER). Old-style ID parts use global counter values.
*
* The parts are: node_id, copy_id and txn_id for in-txn IDs as well as
- * node_id, copy_id and rev_offset for in-revision IDs. This struct the
+ * node_id, copy_id and rev_item for in-revision IDs. This struct is the
* data structure used for each of those parts.
*/
typedef struct svn_fs_fs__id_part_t
{
- /* SVN_INVALID_REVNUM for txns -> not a txn, COUNTER must be 0.
- SVN_INVALID_REVNUM for others -> not assigned to a revision, yet.
- 0 for others -> old-style ID or the root in rev 0. */
+ /* SVN_INVALID_REVNUM for txn_id part -> not a txn, NUMBER must be 0.
+ SVN_INVALID_REVNUM for other parts -> not assigned to a revision, yet.
+ 0 for other parts -> old-style ID or the root in rev 0.
+ */
svn_revnum_t revision;
/* sub-id value relative to REVISION. Its interpretation depends on
Modified: subversion/branches/move-tracking-2/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_config.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_config.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_config.h Mon Mar 23 15:27:31 2015
@@ -782,7 +782,8 @@ svn_config_write_auth_data(apr_hash_t *h
* fully purged) to allow perusal and selective removal of credentials.
*
* @a cred_kind and @a realmstring specify the key of the credential.
- * @a hash contains the hash data associated with the record.
+ * @a hash contains the hash data associated with the record. @a walk_baton
+ * is the baton passed to svn_config_walk_auth_data().
*
* Before returning set @a *delete_cred to TRUE to remove the credential from
* the cache; leave @a *delete_cred unchanged or set it to FALSE to keep the
Modified: subversion/branches/move-tracking-2/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_diff.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_diff.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_diff.h Mon Mar 23 15:27:31 2015
@@ -705,7 +705,8 @@ svn_diff_file_output_unified(svn_stream_
* @a conflict_latest to be displayed as conflict markers in the output.
* If @a conflict_original, @a conflict_modified, @a conflict_latest and/or
* @a conflict_separator is @c NULL, a default marker will be displayed.
- * @a conflict_style dictates how conflicts are displayed.
+ * @a conflict_style dictates how conflicts are displayed.
+ * Uses @a scratch_pool for temporary allocations.
*
* @since New in 1.9.
*/
@@ -722,7 +723,7 @@ svn_diff_file_output_merge3(svn_stream_t
svn_diff_conflict_display_style_t conflict_style,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Similar to svn_diff_file_output_merge3, but without cancel support.
*
@@ -858,6 +859,8 @@ svn_diff_mem_string_diff4(svn_diff_t **d
* will be used in the generated diff output. Otherwise the legacy compile
* time default will be used.
*
+ * Uses @a scratch_pool for temporary allocations.
+ *
* @since New in 1.9
*/
svn_error_t *
@@ -873,7 +876,7 @@ svn_diff_mem_string_output_unified3(svn_
int context_size,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Similar to svn_diff_mem_string_output_unified3() but without
* cancel support and with @a context_size set to -1.
@@ -924,6 +927,8 @@ svn_diff_mem_string_output_unified(svn_s
*
* @a conflict_style dictates how conflicts are displayed.
*
+ * Uses @a scratch_pool for temporary allocations.
+ *
* @since New in 1.9.
*/
svn_error_t *
@@ -939,7 +944,7 @@ svn_diff_mem_string_output_merge3(svn_st
svn_diff_conflict_display_style_t style,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Similar to svn_diff_mem_string_output_merge2(), but without cancel support.
*
Modified: subversion/branches/move-tracking-2/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_fs.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_fs.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_fs.h Mon Mar 23 15:27:31 2015
@@ -361,22 +361,22 @@ typedef enum svn_fs_upgrade_notify_actio
/** The type of an upgrade notification function. @a number is specifc
* to @a action (see #svn_fs_upgrade_notify_action_t); @a action is the
* type of action being performed. @a baton is the corresponding baton
- * for the notification function, and @a pool can be used for temporary
- * allocations, but will be cleared between invocations.
+ * for the notification function, and @a scratch_pool can be used for
+ * temporary allocations, but will be cleared between invocations.
*
* @since New in 1.9.
*/
typedef svn_error_t *(*svn_fs_upgrade_notify_t)(void *baton,
apr_uint64_t number,
svn_fs_upgrade_notify_action_t action,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/**
* Upgrade the Subversion filesystem located in the directory @a path
* to the latest version supported by this library. Return
* #SVN_ERR_FS_UNSUPPORTED_UPGRADE and make no changes to the
- * filesystem if the requested upgrade is not supported. Use @a pool
- * for necessary allocations.
+ * filesystem if the requested upgrade is not supported. Use
+ * @a scratch_pool for temporary allocations.
*
* The optional @a notify_func callback is only a general feedback that
* the operation is still in process but may be called in e.g. random shard
@@ -399,7 +399,7 @@ svn_fs_upgrade2(const char *path,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/**
* Like svn_fs_upgrade2 but with notify_func, notify_baton, cancel_func
@@ -486,13 +486,14 @@ svn_fs_delete_fs(const char *path,
/** The type of a hotcopy notification function. @a start_revision and
* @a end_revision indicate the copied revision range. @a baton is the
- * corresponding baton for the notification function, and @a pool can be
- * used for temporary allocations, but will be cleared between invocations.
+ * corresponding baton for the notification function, and @a scratch_pool
+ * can be used for temporary allocations, but will be cleared between
+ * invocations.
*/
typedef void (*svn_fs_hotcopy_notify_t)(void *baton,
svn_revnum_t start_revision,
svn_revnum_t end_revision,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/**
* Copy a possibly live Subversion filesystem from @a src_path to
@@ -1728,7 +1729,7 @@ svn_fs_node_id(const svn_fs_id_t **id_p,
* are related and return the result in @a relation. There is no restriction
* concerning the roots: They may refer to different repositories, be in
* arbitrary revision order and any of them may pertain to a transaction.
- * @a pool is used for temporary allocations.
+ * @a scratch_pool is used for temporary allocations.
*
* @note Paths from different svn_fs_t will be reported as unrelated even
* if the underlying physical repository is the same.
@@ -1741,7 +1742,7 @@ svn_fs_node_relation(svn_fs_node_relatio
const char *path_a,
svn_fs_root_t *root_b,
const char *path_b,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Set @a *revision to the revision in which @a path under @a root was
* created. Use @a pool for any temporary allocations. @a *revision will
@@ -1831,7 +1832,7 @@ svn_fs_change_node_prop(svn_fs_root_t *r
* differ from those at @a path2 under @a root2, or set it to #FALSE if they
* are the same. Both paths must exist under their respective roots, and
* both roots must be in the same filesystem.
- * Do any necessary temporary allocation in @a pool.
+ * Do any necessary temporary allocation in @a scratch_pool.
*
* @since New in 1.9.
*/
@@ -1841,7 +1842,7 @@ svn_fs_props_different(svn_boolean_t *di
const char *path1,
svn_fs_root_t *root2,
const char *path2,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Determine if the properties of two path/root combinations are different.
@@ -2386,7 +2387,7 @@ svn_fs_apply_text(svn_stream_t **content
* @a root1 differ from those at @a path2 under @a root2, or set it to
* #FALSE if they are the same. Both paths must exist under their
* respective roots, and both roots must be in the same filesystem.
- * Do any necessary temporary allocation in @a pool.
+ * Do any necessary temporary allocation in @a scratch_pool.
*
* @since New in 1.9.
*/
@@ -2396,7 +2397,7 @@ svn_fs_contents_different(svn_boolean_t
const char *path1,
svn_fs_root_t *root2,
const char *path2,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Check if the contents of two root/path combos have changed. In
* contrast to #svn_fs_contents_different, we only perform a quick test
Modified: subversion/branches/move-tracking-2/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_io.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_io.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_io.h Mon Mar 23 15:27:31 2015
@@ -689,11 +689,9 @@ svn_io_files_contents_three_same_p(svn_b
* closing the file, attempt to delete the file before returning the error.
*
* Write the data in 'binary' mode (#APR_FOPEN_BINARY). If @a contents
- * is null, create an empty file.
+ * is @c NULL, create an empty file.
*
* Use @a pool for memory allocations.
- *
- * @since
*/
svn_error_t *
svn_io_file_create(const char *file,
@@ -707,9 +705,9 @@ svn_io_file_create(const char *file,
* closing the file, attempt to delete the file before returning the error.
*
* Write the data in 'binary' mode (#APR_FOPEN_BINARY). If @a length is
- * zero, create an empty file; in this case @a contents may be null.
+ * zero, create an empty file; in this case @a contents may be @c NULL.
*
- * Use @a pool for memory allocations.
+ * Use @a scratch_pool for temporary allocations.
*
* @since New in 1.9.
*/
@@ -717,20 +715,20 @@ svn_error_t *
svn_io_file_create_bytes(const char *file,
const void *contents,
apr_size_t length,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Create an empty file at utf8-encoded path @a file.
*
* @a file must not already exist. If an error occurs while
* closing the file, attempt to delete the file before returning the error.
*
- * Use @a pool for memory allocations.
+ * Use @a scratch_pool for temporary allocations.
*
* @since New in 1.9.
*/
svn_error_t *
svn_io_file_create_empty(const char *file,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/**
* Lock file at @a lock_file. If @a exclusive is TRUE,
@@ -1131,8 +1129,8 @@ svn_error_t *
svn_stream_for_stdout(svn_stream_t **out,
apr_pool_t *pool);
-/** Set @a *str to a string buffer allocated in @a pool that contains all
- * data from the current position in @a stream to its end. @a len_hint
+/** Set @a *str to a string buffer allocated in @a result_pool that contains
+ * all data from the current position in @a stream to its end. @a len_hint
* specifies the initial capacity of the string buffer and may be 0. The
* buffer gets automatically resized to fit the actual amount of data being
* read from @a stream.
@@ -1143,7 +1141,7 @@ svn_error_t *
svn_stringbuf_from_stream(svn_stringbuf_t **str,
svn_stream_t *stream,
apr_size_t len_hint,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
/** Return a generic stream connected to stringbuf @a str. Allocate the
* stream in @a pool.
@@ -2227,12 +2225,12 @@ svn_io_file_seek(apr_file_t *file,
* internal data buffer to @a block_size bytes and to read data aligned to
* multiples of that value. The beginning of the block will be returned
* in @a buffer_start, if that is not NULL.
- * Uses @a pool for temporary allocations.
+ * Uses @a scratch_pool for temporary allocations.
*
- * @note Due to limitations of the APR API, in particular pre-1.3 APR,
- * the alignment may not be successful. If you never use any other seek
- * function on @a file, you are, however, virtually guaranteed to get at
- * least 4kByte alignments for all reads.
+ * @note Due to limitations of the APR API, the alignment may not be
+ * successful. If you never use any other seek function on @a file,
+ * however, you are virtually guaranteed to get at least 4kByte alignment
+ * for all reads.
*
* @note Calling this for non-buffered files is legal but inefficient.
*
@@ -2243,7 +2241,7 @@ svn_io_file_aligned_seek(apr_file_t *fil
apr_off_t block_size,
apr_off_t *buffer_start,
apr_off_t offset,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/** Wrapper for apr_file_write(). */
svn_error_t *
Modified: subversion/branches/move-tracking-2/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_ra.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_ra.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_ra.h Mon Mar 23 15:27:31 2015
@@ -289,7 +289,7 @@ typedef svn_boolean_t (*svn_ra_check_tun
* This function will be called when the pool that owns the tunnel
* connection is cleared or destroyed.
*
- * @a tunnel_context is the baton as returned from the
+ * @a close_baton is the baton as returned from the
* svn_ra_open_tunnel_func_t.
*
* @a tunnel_baton was returned by the open-tunnel callback.
@@ -1798,7 +1798,7 @@ svn_ra_get_location_segments(svn_ra_sess
* to support reversion of the revision range for @a include_merged_revision
* @c FALSE reporting by switching @a end with @a start.
*
- * @note Prior to Subversion 1.9, this function may accept delta handlers
+ * @note Prior to Subversion 1.9, this function may request delta handlers
* from @a handler even for empty text deltas. Starting with 1.9, the
* delta handler / baton return arguments passed to @a handler will be
* #NULL unless there is an actual difference in the file contents between
Modified: subversion/branches/move-tracking-2/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_repos.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_repos.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_repos.h Mon Mar 23 15:27:31 2015
@@ -629,14 +629,15 @@ svn_fs_t *
svn_repos_fs(svn_repos_t *repos);
/** Return the type of filesystem associated with repository object
- * @a repos allocated in @a pool.
+ * @a repos allocated in @a result_pool.
*
* @see #svn_fs_backend_names
*
* @since New in 1.9.
*/
const char *
-svn_repos_fs_type(svn_repos_t *repos, apr_pool_t *pool);
+svn_repos_fs_type(svn_repos_t *repos,
+ apr_pool_t *result_pool);
/** Make a hot copy of the Subversion repository found at @a src_path
* to @a dst_path.
@@ -662,6 +663,8 @@ svn_repos_fs_type(svn_repos_t *repos, ap
* The optional @a cancel_func callback will be invoked with
* @a cancel_baton as usual to allow the user to preempt this potentially
* lengthy operation.
+ *
+ * Use @a scratch_pool for temporary allocations.
*
* @since New in 1.9.
*/
@@ -674,7 +677,7 @@ svn_repos_hotcopy3(const char *src_path,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/**
* Like svn_repos_hotcopy3(), but with @a notify_func and @a notify_baton
Modified: subversion/branches/move-tracking-2/subversion/include/svn_string.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_string.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_string.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_string.h Mon Mar 23 15:27:31 2015
@@ -305,7 +305,7 @@ svn_stringbuf_fillchar(svn_stringbuf_t *
* The advantages extend beyond the actual call because the reduced
* register pressure allows for more optimization within the caller.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
* @since New in 1.7.
*/
void
@@ -314,7 +314,7 @@ svn_stringbuf_appendbyte(svn_stringbuf_t
/** Append the array of bytes @a bytes of length @a count onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
*
* @since 1.9 @a bytes can be NULL if @a count is zero.
*/
@@ -325,7 +325,7 @@ svn_stringbuf_appendbytes(svn_stringbuf_
/** Append @a byte @a count times onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
* @since New in 1.9.
*/
void
@@ -335,7 +335,7 @@ svn_stringbuf_appendfill(svn_stringbuf_t
/** Append the stringbuf @c appendstr onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
*/
void
svn_stringbuf_appendstr(svn_stringbuf_t *targetstr,
@@ -343,7 +343,7 @@ svn_stringbuf_appendstr(svn_stringbuf_t
/** Append the C string @a cstr onto @a targetstr.
*
- * reallocs if necessary. @a targetstr is affected, nothing else is.
+ * Reallocs if necessary. @a targetstr is affected, nothing else is.
*/
void
svn_stringbuf_appendcstr(svn_stringbuf_t *targetstr,
Modified: subversion/branches/move-tracking-2/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_wc.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_wc.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_wc.h Mon Mar 23 15:27:31 2015
@@ -1859,11 +1859,11 @@ typedef struct svn_wc_conflict_descripti
/** Info on the "merge-right source" or "their" version of incoming change. */
const svn_wc_conflict_version_t *src_right_version;
- /* For property conflicts, the absolute path to the .prej file.
+ /** For property conflicts, the absolute path to the .prej file.
* @since New in 1.9. */
const char *prop_reject_abspath;
- /* For property conflicts, the local base value of the property, i.e. the
+ /** For property conflicts, the local base value of the property, i.e. the
* value of the property as of the BASE revision of the working copy.
* For conflicts created during update/switch this contains the
* post-update/switch property value. The pre-update/switch value can
@@ -1872,20 +1872,20 @@ typedef struct svn_wc_conflict_descripti
* @since New in 1.9. */
const svn_string_t *prop_value_base;
- /* For property conflicts, the local working value of the property,
+ /** For property conflicts, the local working value of the property,
* i.e. the value of the property in the working copy, possibly with
* local modiciations.
* Only set if available, so might be @c NULL.
* @since New in 1.9. */
const svn_string_t *prop_value_working;
- /* For property conflicts, the incoming old value of the property,
+ /** For property conflicts, the incoming old value of the property,
* i.e. the value the property had at @c src_left_version.
* Only set if available, so might be @c NULL.
* @since New in 1.9 */
const svn_string_t *prop_value_incoming_old;
- /* For property conflicts, the incoming new value of the property,
+ /** For property conflicts, the incoming new value of the property,
* i.e. the value the property had at @c src_right_version.
* Only set if available, so might be @c NULL.
* @since New in 1.9 */
@@ -3836,8 +3836,8 @@ typedef struct svn_wc_status3_t
svn_boolean_t file_external;
- /** The actual kind of the node in the working copy. May differ from kind
- * on obstructions, deletes, etc. svn_node_unknown if unavailable.
+ /** The actual kind of the node in the working copy. May differ from
+ * @a kind on obstructions, deletes, etc. #svn_node_unknown if unavailable.
*
* @since New in 1.9 */
svn_node_kind_t actual_kind;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_file.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_file.c Mon Mar 23 15:27:31 2015
@@ -2360,7 +2360,7 @@ svn_diff_file_output_merge3(svn_stream_t
svn_diff_conflict_display_style_t style,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
svn_diff3__file_output_baton_t baton;
apr_file_t *file[3];
@@ -2376,7 +2376,7 @@ svn_diff_file_output_merge3(svn_stream_t
baton.context_size = SVN_DIFF__UNIFIED_CONTEXT_SIZE;
if (conflicts_only)
{
- baton.pool = svn_pool_create(pool);
+ baton.pool = svn_pool_create(scratch_pool);
make_context_saver(&baton);
baton.real_output_stream = output_stream;
}
@@ -2387,22 +2387,22 @@ svn_diff_file_output_merge3(svn_stream_t
baton.path[2] = latest_path;
SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_modified,
conflict_modified ? conflict_modified
- : apr_psprintf(pool, "<<<<<<< %s",
+ : apr_psprintf(scratch_pool, "<<<<<<< %s",
modified_path),
- pool));
+ scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_original,
conflict_original ? conflict_original
- : apr_psprintf(pool, "||||||| %s",
+ : apr_psprintf(scratch_pool, "||||||| %s",
original_path),
- pool));
+ scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_separator,
conflict_separator ? conflict_separator
- : "=======", pool));
+ : "=======", scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8(&baton.conflict_latest,
conflict_latest ? conflict_latest
- : apr_psprintf(pool, ">>>>>>> %s",
+ : apr_psprintf(scratch_pool, ">>>>>>> %s",
latest_path),
- pool));
+ scratch_pool));
baton.conflict_style = style;
@@ -2413,7 +2413,7 @@ svn_diff_file_output_merge3(svn_stream_t
SVN_ERR(map_or_read_file(&file[idx],
MMAP_T_ARG(mm[idx])
&baton.buffer[idx], &size,
- baton.path[idx], pool));
+ baton.path[idx], scratch_pool));
baton.curp[idx] = baton.buffer[idx];
baton.endp[idx] = baton.buffer[idx];
@@ -2454,7 +2454,7 @@ svn_diff_file_output_merge3(svn_stream_t
if (file[idx])
{
- SVN_ERR(svn_io_file_close(file[idx], pool));
+ SVN_ERR(svn_io_file_close(file[idx], scratch_pool));
}
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_memory.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_memory.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_memory.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_diff/diff_memory.c Mon Mar 23 15:27:31 2015
@@ -622,7 +622,7 @@ svn_diff_mem_string_output_unified3(svn_
int context_size,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
if (svn_diff_contains_diffs(diff))
@@ -631,9 +631,9 @@ svn_diff_mem_string_output_unified3(svn_
memset(&baton, 0, sizeof(baton));
baton.output_stream = output_stream;
- baton.pool = svn_pool_create(pool);
+ baton.pool = svn_pool_create(scratch_pool);
baton.header_encoding = header_encoding;
- baton.hunk = svn_stringbuf_create_empty(pool);
+ baton.hunk = svn_stringbuf_create_empty(scratch_pool);
baton.hunk_delimiter = hunk_delimiter;
baton.no_newline_string
= (hunk_delimiter == NULL || strcmp(hunk_delimiter, "##") != 0)
@@ -644,22 +644,22 @@ svn_diff_mem_string_output_unified3(svn_
SVN_ERR(svn_utf_cstring_from_utf8_ex2
(&(baton.prefix_str[unified_output_context]), " ",
- header_encoding, pool));
+ header_encoding, scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8_ex2
(&(baton.prefix_str[unified_output_delete]), "-",
- header_encoding, pool));
+ header_encoding, scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8_ex2
(&(baton.prefix_str[unified_output_insert]), "+",
- header_encoding, pool));
+ header_encoding, scratch_pool));
- fill_source_tokens(&baton.sources[0], original, pool);
- fill_source_tokens(&baton.sources[1], modified, pool);
+ fill_source_tokens(&baton.sources[0], original, scratch_pool);
+ fill_source_tokens(&baton.sources[1], modified, scratch_pool);
if (with_diff_header)
{
SVN_ERR(svn_diff__unidiff_write_header(
output_stream, header_encoding,
- original_header, modified_header, pool));
+ original_header, modified_header, scratch_pool));
}
SVN_ERR(svn_diff_output2(diff, &baton,
@@ -688,7 +688,7 @@ typedef struct context_saver_t {
const char **data; /* const char *data[context_size] */
apr_size_t *len; /* apr_size_t len[context_size] */
apr_size_t next_slot;
- apr_size_t total_written;
+ apr_ssize_t total_writes;
} context_saver_t;
@@ -701,7 +701,7 @@ context_saver_stream_write(void *baton,
cs->data[cs->next_slot] = data;
cs->len[cs->next_slot] = *len;
cs->next_slot = (cs->next_slot + 1) % cs->context_size;
- cs->total_written++;
+ cs->total_writes++;
return SVN_NO_ERROR;
}
@@ -822,13 +822,11 @@ make_trailing_context_printer(merge_outp
static svn_error_t *
-output_merge_token_range(apr_size_t *lines_printed_p,
- merge_output_baton_t *btn,
+output_merge_token_range(merge_output_baton_t *btn,
int idx, apr_off_t first,
apr_off_t length)
{
apr_array_header_t *tokens = btn->sources[idx].tokens;
- apr_size_t lines_printed = 0;
for (; length > 0 && first < tokens->nelts; length--, first++)
{
@@ -838,12 +836,8 @@ output_merge_token_range(apr_size_t *lin
/* Note that the trailing context printer assumes that
svn_stream_write is called exactly once per line. */
SVN_ERR(svn_stream_write(btn->output_stream, token->data, &len));
- lines_printed++;
}
- if (lines_printed_p)
- *lines_printed_p = lines_printed;
-
return SVN_NO_ERROR;
}
@@ -866,7 +860,7 @@ output_common_modified(void *baton,
apr_off_t modified_start, apr_off_t modified_length,
apr_off_t latest_start, apr_off_t latest_length)
{
- return output_merge_token_range(NULL, baton, 1/*modified*/,
+ return output_merge_token_range(baton, 1/*modified*/,
modified_start, modified_length);
}
@@ -876,7 +870,7 @@ output_latest(void *baton,
apr_off_t modified_start, apr_off_t modified_length,
apr_off_t latest_start, apr_off_t latest_length)
{
- return output_merge_token_range(NULL, baton, 2/*latest*/,
+ return output_merge_token_range(baton, 2/*latest*/,
latest_start, latest_length);
}
@@ -920,26 +914,26 @@ output_conflict(void *baton,
style == svn_diff_conflict_display_modified_original_latest)
{
SVN_ERR(output_merge_marker(btn, 1/*modified*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 1/*modified*/,
+ SVN_ERR(output_merge_token_range(btn, 1/*modified*/,
modified_start, modified_length));
if (style == svn_diff_conflict_display_modified_original_latest)
{
SVN_ERR(output_merge_marker(btn, 0/*original*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 0/*original*/,
+ SVN_ERR(output_merge_token_range(btn, 0/*original*/,
original_start, original_length));
}
SVN_ERR(output_merge_marker(btn, 2/*separator*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 2/*latest*/,
+ SVN_ERR(output_merge_token_range(btn, 2/*latest*/,
latest_start, latest_length));
SVN_ERR(output_merge_marker(btn, 3/*latest (end)*/));
}
else if (style == svn_diff_conflict_display_modified)
- SVN_ERR(output_merge_token_range(NULL, btn, 1/*modified*/,
+ SVN_ERR(output_merge_token_range(btn, 1/*modified*/,
modified_start, modified_length));
else if (style == svn_diff_conflict_display_latest)
- SVN_ERR(output_merge_token_range(NULL, btn, 2/*latest*/,
+ SVN_ERR(output_merge_token_range(btn, 2/*latest*/,
latest_start, latest_length));
else /* unknown style */
SVN_ERR_MALFUNCTION();
@@ -983,7 +977,7 @@ output_conflict_with_context(void *baton
trailing context)? If so, flush it. */
if (btn->output_stream == btn->context_saver->stream)
{
- if (btn->context_saver->total_written > btn->context_size)
+ if (btn->context_saver->total_writes > btn->context_size)
SVN_ERR(svn_stream_puts(btn->real_output_stream, "@@\n"));
SVN_ERR(flush_context_saver(btn->context_saver, btn->real_output_stream));
}
@@ -995,17 +989,17 @@ output_conflict_with_context(void *baton
SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[1],
modified_start,
modified_length));
- SVN_ERR(output_merge_token_range(NULL, btn, 1/*modified*/,
+ SVN_ERR(output_merge_token_range(btn, 1/*modified*/,
modified_start, modified_length));
SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[0],
original_start,
original_length));
- SVN_ERR(output_merge_token_range(NULL, btn, 0/*original*/,
+ SVN_ERR(output_merge_token_range(btn, 0/*original*/,
original_start, original_length));
SVN_ERR(output_merge_marker(btn, 2/*separator*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 2/*latest*/,
+ SVN_ERR(output_merge_token_range(btn, 2/*latest*/,
latest_start, latest_length));
SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[3],
latest_start,
@@ -1066,7 +1060,7 @@ svn_diff_mem_string_output_merge3(svn_st
svn_diff_conflict_display_style_t style,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
merge_output_baton_t btn;
const char *eol;
@@ -1080,16 +1074,16 @@ svn_diff_mem_string_output_merge3(svn_st
if (conflicts_only)
{
- btn.pool = svn_pool_create(pool);
+ btn.pool = svn_pool_create(scratch_pool);
make_context_saver(&btn);
btn.real_output_stream = output_stream;
}
else
btn.output_stream = output_stream;
- fill_source_tokens(&(btn.sources[0]), original, pool);
- fill_source_tokens(&(btn.sources[1]), modified, pool);
- fill_source_tokens(&(btn.sources[2]), latest, pool);
+ fill_source_tokens(&(btn.sources[0]), original, scratch_pool);
+ fill_source_tokens(&(btn.sources[1]), modified, scratch_pool);
+ fill_source_tokens(&(btn.sources[2]), latest, scratch_pool);
btn.conflict_style = style;
@@ -1110,22 +1104,22 @@ svn_diff_mem_string_output_merge3(svn_st
conflict_modified
? conflict_modified
: "<<<<<<< (modified)",
- pool));
+ scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8(&btn.markers[0],
conflict_original
? conflict_original
: "||||||| (original)",
- pool));
+ scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8(&btn.markers[2],
conflict_separator
? conflict_separator
: "=======",
- pool));
+ scratch_pool));
SVN_ERR(svn_utf_cstring_from_utf8(&btn.markers[3],
conflict_latest
? conflict_latest
: ">>>>>>> (latest)",
- pool));
+ scratch_pool));
SVN_ERR(svn_diff_output2(diff, &btn, vtable, cancel_func, cancel_baton));
if (conflicts_only)
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c Mon Mar 23 15:27:31 2015
@@ -561,19 +561,19 @@ svn_fs_upgrade2(const char *path,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
fs_library_vtable_t *vtable;
svn_fs_t *fs;
- SVN_ERR(fs_library_vtable(&vtable, path, pool));
- fs = fs_new(NULL, pool);
+ SVN_ERR(fs_library_vtable(&vtable, path, scratch_pool));
+ fs = fs_new(NULL, scratch_pool);
SVN_ERR(vtable->upgrade_fs(fs, path,
notify_func, notify_baton,
cancel_func, cancel_baton,
common_pool_lock,
- pool, common_pool));
+ scratch_pool, common_pool));
return SVN_NO_ERROR;
}
@@ -1141,7 +1141,7 @@ svn_error_t *
svn_fs_node_relation(svn_fs_node_relation_t *relation,
svn_fs_root_t *root_a, const char *path_a,
svn_fs_root_t *root_b, const char *path_b,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
/* Different repository types? */
if (root_a->fs != root_b->fs)
@@ -1150,9 +1150,10 @@ svn_fs_node_relation(svn_fs_node_relatio
return SVN_NO_ERROR;
}
- return svn_error_trace(root_a->vtable->node_relation(relation, root_a,
- path_a, root_b,
- path_b, pool));
+ return svn_error_trace(root_a->vtable->node_relation(relation,
+ root_a, path_a,
+ root_b, path_b,
+ scratch_pool));
}
svn_error_t *
@@ -1207,12 +1208,12 @@ svn_fs_change_node_prop(svn_fs_root_t *r
svn_error_t *
svn_fs_props_different(svn_boolean_t *changed_p, svn_fs_root_t *root1,
const char *path1, svn_fs_root_t *root2,
- const char *path2, apr_pool_t *pool)
+ const char *path2, apr_pool_t *scratch_pool)
{
return svn_error_trace(root1->vtable->props_changed(changed_p,
root1, path1,
root2, path2,
- TRUE, pool));
+ TRUE, scratch_pool));
}
svn_error_t *
@@ -1484,12 +1485,13 @@ svn_fs_apply_text(svn_stream_t **content
svn_error_t *
svn_fs_contents_different(svn_boolean_t *changed_p, svn_fs_root_t *root1,
const char *path1, svn_fs_root_t *root2,
- const char *path2, apr_pool_t *pool)
+ const char *path2, apr_pool_t *scratch_pool)
{
return svn_error_trace(root1->vtable->contents_changed(changed_p,
root1, path1,
root2, path2,
- TRUE, pool));
+ TRUE,
+ scratch_pool));
}
svn_error_t *
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.h?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.h Mon Mar 23 15:27:31 2015
@@ -99,7 +99,7 @@ typedef struct fs_library_vtable_t
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_mutex__t *common_pool_lock,
- apr_pool_t *pool,
+ apr_pool_t *scratch_pool,
apr_pool_t *common_pool);
svn_error_t *(*verify_fs)(svn_fs_t *fs, const char *path,
svn_revnum_t start,
@@ -314,7 +314,7 @@ typedef struct root_vtable_t
svn_error_t *(*node_relation)(svn_fs_node_relation_t *relation,
svn_fs_root_t *root_a, const char *path_a,
svn_fs_root_t *root_b, const char *path_b,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
svn_error_t *(*node_created_rev)(svn_revnum_t *revision,
svn_fs_root_t *root, const char *path,
apr_pool_t *pool);
@@ -353,7 +353,7 @@ typedef struct root_vtable_t
svn_error_t *(*props_changed)(int *changed_p, svn_fs_root_t *root1,
const char *path1, svn_fs_root_t *root2,
const char *path2, svn_boolean_t strict,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/* Directories */
svn_error_t *(*dir_entries)(apr_hash_t **entries_p, svn_fs_root_t *root,
@@ -394,7 +394,7 @@ typedef struct root_vtable_t
svn_error_t *(*contents_changed)(int *changed_p, svn_fs_root_t *root1,
const char *path1, svn_fs_root_t *root2,
const char *path2, svn_boolean_t strict,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
svn_error_t *(*get_file_delta_stream)(svn_txdelta_stream_t **stream_p,
svn_fs_root_t *source_root,
const char *source_path,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/tree.c Mon Mar 23 15:27:31 2015
@@ -1353,7 +1353,10 @@ fs_node_relation(svn_fs_node_relation_t
* direct the relation is. */
if (a_is_root_dir && b_is_root_dir)
{
- *relation = ((root_a->rev == root_b->rev) && !different_txn)
+ /* For txn roots, root->REV is the base revision of that TXN. */
+ *relation = ( (root_a->rev == root_b->rev)
+ && (root_a->is_txn_root == root_b->is_txn_root)
+ && !different_txn)
? svn_fs_node_same
: svn_fs_node_common_ancestor;
return SVN_NO_ERROR;
@@ -1379,7 +1382,7 @@ fs_node_relation(svn_fs_node_relation_t
/* Noderevs have the same node-ID now. So, they *seem* to be related.
*
* Special case: Different txns may create the same (txn-local) node ID.
- * Only when they are committed can they actually be related to others. */
+ * These are not related to each other, nor to any other node ID so far. */
if (different_txn && node_id_a.revision == SVN_INVALID_REVNUM)
{
*relation = svn_fs_node_unrelated;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/verify.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/verify.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/verify.c Mon Mar 23 15:27:31 2015
@@ -463,7 +463,8 @@ expect_buffer_nul(apr_file_t *file,
/* read the whole data block; error out on failure */
data.chunks[(size - 1)/ sizeof(apr_uint64_t)] = 0;
- SVN_ERR(svn_io_file_read_full2(file, data.buffer, (apr_size_t)size, NULL, NULL, pool));
+ SVN_ERR(svn_io_file_read_full2(file, data.buffer, (apr_size_t)size, NULL,
+ NULL, pool));
/* chunky check */
for (i = 0; i < size / sizeof(apr_uint64_t); ++i)
Propchange: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 23 15:27:31 2015
@@ -90,4 +90,4 @@
/subversion/branches/verify-keep-going/subversion/libsvn_fs_x:1439280-1492639,1546002-1546110
/subversion/branches/wc-collate-path/subversion/libsvn_fs_x:1402685-1480384
/subversion/trunk/subversion/libsvn_fs_fs:1415133-1596500,1596567,1597414,1597989,1598273,1599140,1600872,1601633,1603485-1603487,1603499,1603605,1604128,1604188,1604413-1604414,1604416-1604417,1604421,1604442,1604700,1604717,1604720,1604726,1604755,1604794,1604802,1604824,1604836,1604844,1604902-1604903,1604911,1604925,1604933,1604947,1605059-1605060,1605064-1605065,1605068,1605071-1605073,1605075,1605123,1605188-1605189,1605191,1605197,1605444,1605633,1606132,1606142,1606144,1606514,1606526,1606528,1606551,1606554,1606564,1606598-1606599,1606656,1606658,1606662,1606744,1606840,1607085,1607572,1612407,1612810,1613339,1613872,1614611,1615348,1615351-1615352,1615356,1616338-1616339,1616613,1617586,1617688,1618138,1618151,1618153,1618226,1618641,1618653,1618662,1619068,1619358,1619413,1619769,1619774,1620602,1620909,1620912,1620928,1620930,1621275,1621635,1622931,1622937,1622942,1622946,1622959-1622960,1622963,1622987,1623007,1623368,1623373,1623377,1623379,1623381,1623398,1623402,162
4011,1624265,1624512,1626246,1626871,1626873,1626886,1627497-1627498,1627502,1627947-1627949,1627966,1628083,1628093,1628158-1628159,1628161,1628392-1628393,1628415,1628427,1628676,1628738,1628762,1628764,1629854-1629855,1629857,1629865,1629873,1629875,1629879,1630067,1630070,1631049-1631051,1631075,1631115,1631171,1631180,1631185-1631186,1631196-1631197,1631239-1631240,1631548,1631550,1631563,1631567,1631588,1631598,1632646,1632776,1632849,1632851-1632853,1632856-1632857,1632868,1632908,1632926,1633232,1633617-1633618,1634872,1634875,1634879-1634880,1634920,1636478,1636483,1636629,1636644,1637184,1637186,1637330,1637358,1637363,1637393,1639319,1639322,1639335,1639348,1639352,1639355,1639358,1639414,1639419,1639426,1639430,1639436,1639440,1639549,1640061-1640062,1640197,1640915,1640966,1641013,1643139,1643233,1645567,1646021,1646712,1646716,1647537,1647540-1647541,1647820,1647905,1648230,1648238,1648241-1648243,1648253,1648272,1648532,1648537-1648539,1648542,1648591,1648612,1653608,
1658482
-/subversion/trunk/subversion/libsvn_fs_x:1414756-1509914,1606692-1666945
+/subversion/trunk/subversion/libsvn_fs_x:1414756-1509914,1606692-1668666
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_x/tree.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_x/tree.c Mon Mar 23 15:27:31 2015
@@ -1350,7 +1350,10 @@ x_node_relation(svn_fs_node_relation_t *
= root_a->is_txn_root && root_b->is_txn_root
&& strcmp(root_a->txn, root_b->txn);
- *relation = ((root_a->rev == root_b->rev) && !different_txn)
+ /* For txn roots, root->REV is the base revision of that TXN. */
+ *relation = ( (root_a->rev == root_b->rev)
+ && (root_a->is_txn_root == root_b->is_txn_root)
+ && !different_txn)
? svn_fs_node_same
: svn_fs_node_common_ancestor;
return SVN_NO_ERROR;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/serf.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/serf.c Mon Mar 23 15:27:31 2015
@@ -148,7 +148,8 @@ load_http_auth_types(apr_pool_t *pool, s
static svn_error_t *
load_config(svn_ra_serf__session_t *session,
apr_hash_t *config_hash,
- apr_pool_t *pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_config_t *config, *config_client;
const char *server_group;
@@ -202,7 +203,7 @@ load_config(svn_ra_serf__session_t *sess
SVN_CONFIG_OPTION_HTTP_PROXY_EXCEPTIONS, "");
if (! svn_cstring_match_glob_list(session->session_url.hostname,
svn_cstring_split(exceptions, ",",
- TRUE, pool)))
+ TRUE, scratch_pool)))
{
svn_config_get(config, &proxy_host, SVN_CONFIG_SECTION_GLOBAL,
SVN_CONFIG_OPTION_HTTP_PROXY_HOST, NULL);
@@ -433,7 +434,7 @@ load_config(svn_ra_serf__session_t *sess
}
/* Setup authentication. */
- SVN_ERR(load_http_auth_types(pool, config, server_group,
+ SVN_ERR(load_http_auth_types(result_pool, config, server_group,
&session->authn_types));
serf_config_authn_types(session->context, session->authn_types);
serf_config_credentials_callback(session->context,
@@ -542,7 +543,7 @@ svn_ra_serf__open(svn_ra_session_t *sess
this, if we find an intervening proxy does not support chunked requests. */
serf_sess->using_chunked_requests = TRUE;
- SVN_ERR(load_config(serf_sess, config, serf_sess->pool));
+ SVN_ERR(load_config(serf_sess, config, serf_sess->pool, scratch_pool));
serf_sess->conns[0] = apr_pcalloc(serf_sess->pool,
sizeof(*serf_sess->conns[0]));
@@ -759,7 +760,8 @@ ra_serf_dup_session(svn_ra_session_t *ne
new_sess->context = serf_context_create(result_pool);
- SVN_ERR(load_config(new_sess, old_sess->config, result_pool));
+ SVN_ERR(load_config(new_sess, old_sess->config,
+ result_pool, scratch_pool));
new_sess->conns[0] = apr_pcalloc(result_pool,
sizeof(*new_sess->conns[0]));
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c Mon Mar 23 15:27:31 2015
@@ -2759,7 +2759,7 @@ make_update_reporter(svn_ra_session_t *r
update_editor,
update_baton,
depth, has_target,
- sess->pool));
+ result_pool));
update_editor = filter_editor;
update_baton = filter_baton;
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/repos.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_repos/repos.c Mon Mar 23 15:27:31 2015
@@ -1635,9 +1635,10 @@ svn_repos_fs(svn_repos_t *repos)
}
const char *
-svn_repos_fs_type(svn_repos_t *repos, apr_pool_t *pool)
+svn_repos_fs_type(svn_repos_t *repos,
+ apr_pool_t *result_pool)
{
- return apr_pstrdup(pool, repos->fs_type);
+ return apr_pstrdup(result_pool, repos->fs_type);
}
/* For historical reasons, for the Berkeley DB backend, this code uses
@@ -1957,7 +1958,7 @@ svn_repos_hotcopy3(const char *src_path,
void *notify_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
svn_fs_hotcopy_notify_t fs_notify_func;
struct fs_hotcopy_notify_baton_t fs_notify_baton;
@@ -1968,8 +1969,8 @@ svn_repos_hotcopy3(const char *src_path,
svn_repos_t *dst_repos;
svn_error_t *err;
- SVN_ERR(svn_dirent_get_absolute(&src_abspath, src_path, pool));
- SVN_ERR(svn_dirent_get_absolute(&dst_abspath, dst_path, pool));
+ SVN_ERR(svn_dirent_get_absolute(&src_abspath, src_path, scratch_pool));
+ SVN_ERR(svn_dirent_get_absolute(&dst_abspath, dst_path, scratch_pool));
if (strcmp(src_abspath, dst_abspath) == 0)
return svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL,
_("Hotcopy source and destination are equal"));
@@ -1979,7 +1980,7 @@ svn_repos_hotcopy3(const char *src_path,
FALSE, FALSE,
FALSE, /* don't try to open the db yet. */
NULL,
- pool, pool));
+ scratch_pool, scratch_pool));
/* If we are going to clean logs, then get an exclusive lock on
db-logs.lock, to ensure that no one else will work with logs.
@@ -1987,7 +1988,7 @@ svn_repos_hotcopy3(const char *src_path,
If we are just copying, then get a shared lock to ensure that
no one else will clean logs while we copying them */
- SVN_ERR(lock_db_logs_file(src_repos, clean_logs, pool));
+ SVN_ERR(lock_db_logs_file(src_repos, clean_logs, scratch_pool));
/* Copy the repository to a new path, with exception of
specially handled directories */
@@ -2001,16 +2002,16 @@ svn_repos_hotcopy3(const char *src_path,
0,
hotcopy_structure,
&hotcopy_context,
- pool));
+ scratch_pool));
/* Prepare dst_repos object so that we may create locks,
so that we may open repository */
- dst_repos = create_svn_repos_t(dst_abspath, pool);
+ dst_repos = create_svn_repos_t(dst_abspath, scratch_pool);
dst_repos->fs_type = src_repos->fs_type;
dst_repos->format = src_repos->format;
- err = create_locks(dst_repos, pool);
+ err = create_locks(dst_repos, scratch_pool);
if (err)
{
if (incremental && err->apr_err == SVN_ERR_DIR_NOT_EMPTY)
@@ -2019,7 +2020,8 @@ svn_repos_hotcopy3(const char *src_path,
return svn_error_trace(err);
}
- err = svn_io_dir_make_sgid(dst_repos->db_path, APR_OS_DEFAULT, pool);
+ err = svn_io_dir_make_sgid(dst_repos->db_path, APR_OS_DEFAULT,
+ scratch_pool);
if (err)
{
if (incremental && APR_STATUS_IS_EEXIST(err->apr_err))
@@ -2030,7 +2032,7 @@ svn_repos_hotcopy3(const char *src_path,
/* Exclusively lock the new repository.
No one should be accessing it at the moment */
- SVN_ERR(lock_repos(dst_repos, TRUE, FALSE, pool));
+ SVN_ERR(lock_repos(dst_repos, TRUE, FALSE, scratch_pool));
fs_notify_func = notify_func ? fs_hotcopy_notify : NULL;
fs_notify_baton.notify_func = notify_func;
@@ -2039,12 +2041,12 @@ svn_repos_hotcopy3(const char *src_path,
SVN_ERR(svn_fs_hotcopy3(src_repos->db_path, dst_repos->db_path,
clean_logs, incremental,
fs_notify_func, &fs_notify_baton,
- cancel_func, cancel_baton, pool));
+ cancel_func, cancel_baton, scratch_pool));
/* Destination repository is ready. Stamp it with a format number. */
return svn_io_write_version_file
- (svn_dirent_join(dst_repos->path, SVN_REPOS__FORMAT, pool),
- dst_repos->format, pool);
+ (svn_dirent_join(dst_repos->path, SVN_REPOS__FORMAT, scratch_pool),
+ dst_repos->format, scratch_pool);
}
/* Return the library version number. */
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/config_win.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/config_win.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/config_win.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/config_win.c Mon Mar 23 15:27:31 2015
@@ -198,7 +198,8 @@ svn_config__parse_registry(svn_config_t
if (err != ERROR_SUCCESS)
{
apr_status_t apr_err = APR_FROM_OS_ERROR(err);
- svn_boolean_t is_enoent = APR_STATUS_IS_ENOENT(apr_err);
+ svn_boolean_t is_enoent = APR_STATUS_IS_ENOENT(apr_err)
+ || (err == ERROR_INVALID_HANDLE);
if (must_exist || !is_enoent)
return svn_error_createf(SVN_ERR_BAD_FILENAME,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c Mon Mar 23 15:27:31 2015
@@ -1191,7 +1191,7 @@ svn_error_t *
svn_io_file_create_bytes(const char *file,
const void *contents,
apr_size_t length,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
apr_file_t *f;
apr_size_t written;
@@ -1200,13 +1200,14 @@ svn_io_file_create_bytes(const char *fil
SVN_ERR(svn_io_file_open(&f, file,
(APR_WRITE | APR_CREATE | APR_EXCL),
APR_OS_DEFAULT,
- pool));
+ scratch_pool));
if (length)
- err = svn_io_file_write_full(f, contents, length, &written, pool);
+ err = svn_io_file_write_full(f, contents, length, &written,
+ scratch_pool);
err = svn_error_compose_create(
err,
- svn_io_file_close(f, pool));
+ svn_io_file_close(f, scratch_pool));
if (err)
{
@@ -1216,7 +1217,7 @@ svn_io_file_create_bytes(const char *fil
return svn_error_trace(
svn_error_compose_create(
err,
- svn_io_remove_file2(file, TRUE, pool)));
+ svn_io_remove_file2(file, TRUE, scratch_pool)));
}
return SVN_NO_ERROR;
@@ -1235,9 +1236,10 @@ svn_io_file_create(const char *file,
svn_error_t *
svn_io_file_create_empty(const char *file,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
- return svn_error_trace(svn_io_file_create_bytes(file, NULL, 0, pool));
+ return svn_error_trace(svn_io_file_create_bytes(file, NULL, 0,
+ scratch_pool));
}
svn_error_t *
@@ -3633,7 +3635,7 @@ svn_io_file_aligned_seek(apr_file_t *fil
apr_off_t block_size,
apr_off_t *buffer_start,
apr_off_t offset,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
const apr_size_t apr_default_buffer_size = 4096;
apr_size_t file_buffer_size = apr_default_buffer_size;
@@ -3683,7 +3685,7 @@ svn_io_file_aligned_seek(apr_file_t *fil
buffer and no I/O will actually happen in the FILL_BUFFER
section below.
*/
- SVN_ERR(svn_io_file_seek(file, APR_CUR, ¤t, pool));
+ SVN_ERR(svn_io_file_seek(file, APR_CUR, ¤t, scratch_pool));
fill_buffer = aligned_offset + file_buffer_size <= current
|| current <= aligned_offset;
}
@@ -3694,7 +3696,8 @@ svn_io_file_aligned_seek(apr_file_t *fil
apr_status_t status;
/* seek to the start of the block and cause APR to read 1 block */
- SVN_ERR(svn_io_file_seek(file, APR_SET, &aligned_offset, pool));
+ SVN_ERR(svn_io_file_seek(file, APR_SET, &aligned_offset,
+ scratch_pool));
status = apr_file_getc(&dummy, file);
/* read may fail if we seek to or behind EOF. That's ok then. */
@@ -3702,17 +3705,17 @@ svn_io_file_aligned_seek(apr_file_t *fil
return do_io_file_wrapper_cleanup(file, status,
N_("Can't read file '%s'"),
N_("Can't read stream"),
- pool);
+ scratch_pool);
}
/* finally, seek to the OFFSET the caller wants */
desired_offset = offset;
- SVN_ERR(svn_io_file_seek(file, APR_SET, &offset, pool));
+ SVN_ERR(svn_io_file_seek(file, APR_SET, &offset, scratch_pool));
if (desired_offset != offset)
return do_io_file_wrapper_cleanup(file, APR_EOF,
N_("Can't seek in file '%s'"),
N_("Can't seek in stream"),
- pool);
+ scratch_pool);
/* return the buffer start that we (probably) enforced */
if (buffer_start)
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/properties.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/properties.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/properties.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/properties.c Mon Mar 23 15:27:31 2015
@@ -131,7 +131,6 @@ svn_boolean_t
svn_prop_has_svn_prop(const apr_hash_t *props, apr_pool_t *pool)
{
apr_hash_index_t *hi;
- const void *prop_name;
if (! props)
return FALSE;
@@ -139,8 +138,9 @@ svn_prop_has_svn_prop(const apr_hash_t *
for (hi = apr_hash_first(pool, (apr_hash_t *)props); hi;
hi = apr_hash_next(hi))
{
- apr_hash_this(hi, &prop_name, NULL, NULL);
- if (svn_prop_is_svn_prop((const char *) prop_name))
+ const char *prop_name = apr_hash_this_key(hi);
+
+ if (svn_prop_is_svn_prop(prop_name))
return TRUE;
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/stream.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/stream.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/stream.c Mon Mar 23 15:27:31 2015
@@ -1443,13 +1443,14 @@ svn_error_t *
svn_stringbuf_from_stream(svn_stringbuf_t **str,
svn_stream_t *stream,
apr_size_t len_hint,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
#define MIN_READ_SIZE 64
apr_size_t to_read = 0;
svn_stringbuf_t *text
- = svn_stringbuf_create_ensure(len_hint ? len_hint : MIN_READ_SIZE, pool);
+ = svn_stringbuf_create_ensure(len_hint ? len_hint : MIN_READ_SIZE,
+ result_pool);
do
{
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/version.c?rev=1668667&r1=1668666&r2=1668667&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/version.c Mon Mar 23 15:27:31 2015
@@ -136,7 +136,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2014 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2015 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "