Checkout
 

epg in subversion

* COMMITTERS: Move myself to dormant section.

Fix syntax error from r31936.

* subversion/bindings/javahl/native/EnumMapper.cpp

Drop ; at the end of #include directive.

Fix clean-javahl to clean all javahl files.

* Makefile.in

(JAVAHL_JAR): Add macro for path to svn-javahl.jar.

(INSTALL_EXTRA_JAVAHL_JAVA): Use $(JAVAHL_JAR).

(clean-javahl): rm $(JAVAHL_JAR).

Move r31688 to Approved; two votes is enough for a test.

Nominate r31695 along with r31692.

Nominate and vote for r31692 for 1.5.1.

Vote for r31688.

Vote for r31685, move to Approved.

Vote for r31228.

Nominate r31603 for 1.5.1.

* subversion/bindings/swig/core.i

Don't %ignore svn_path_is_url.

Nominate r31223 for 1.5.1.

Change vote to -0 for r31313 until test failures are fixed.

Vote for r31468, r31470, moving to Approved.

* build/ac-macros/apache.m4

Add option --with-apache-libexecdir option (help string could use a little

work) to allow overriding where apxs wants to install Apache modules.

* CHANGES

(Developer-visible changes/API changes): Note SVN_ERR_RA_DAV_PATH_NOT_FOUND

is now deprecated.

Vote for r31313 and r31334.

Vote for r31243, r31246, r31249, r31250, r31251, r31271, noting Ruby caveat.

Fix segmentation fault introduced in r25535, when svn_ra_open3 is

passed a bogus URL such as 'bogusURL'.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_open3): Raise SVN_ERR_RA_ILLEGAL_URL if repos_URI.hostname is

NULL rather than passing that NULL to svn_config_find_group().

Vote for r31131.

Nominate r31107, including vote from jerenkrantz (via IRC).

Nominate r31066.

Fix segfault bug in r31055.

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

(wc_diff_callbacks2_file_changed_or_added): Oops, need

to use svn_swig_py_proparray_to_dict for propchanges

(wc_diff_callbacks2_dir_props_changed is already correct).

Nominate r31056.

Nominate r31055 (subversion/bindings/swig).

* build.conf

(__SWIG_PYTHON__): Enable svn.diff on Windows (sigh, I thought this

was supposed to be automatic and transparent?).

Fix the r30694 svn_wc_diff_callbacks2_t compatibility (it mistakenly used

existing svn_wc_diff_callbacks_t wrappers, which can't work; the

structures are very different).

Make svn_wc_diff_callbacks2_t work in Python and add Python test for it.

* subversion/libsvn_wc/diff.c

(struct callbacks2_wrapper_baton, callbacks2_wrapper): Remove; we can

provide compatibility with svn_wc_diff_callbacks2_t without these, as

svn_wc_diff_callbacks3_t just adds to functions.

(file_changed, file_added, file_deleted, dir_added, dir_deleted,

dir_props_changed, callbacks_wrapper): Be specific in the doc string

that these are for wrapping svn_wc_diff_callbacks_t.

(dir_opened, dir_closed): Be specific in the doc string that these are for

wrapping both svn_wc_diff_callbacks_t svn_wc_diff_callbacks2_t.

(callbacks2_wrap): Add function to return a new svn_wc_diff_callbacks3_t

with dir_opened and dir_closed fields pointing to the no-op compat

implementations also used for wrapping svn_wc_diff_callbacks_t (in

callbacks_wrapper), and all other fields pointing to the equivalent

fields in the svn_wc_diff_callbacks2_t.

(svn_wc_get_diff_editor4, svn_wc_diff4): Use callbacks2_compat.

(svn_wc_get_diff_editor2): This uses svn_wc_diff_callbacks2_t and

therefore must be wrapped separately; use callbacks_wrapper with

svn_wc_get_diff_editor5 directly.

(svn_wc_diff2): This uses svn_wc_diff_callbacks2_t and therefore must be

wrapped separately; use callbacks_wrapper with svn_wc_diff5 directly.

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

Provide svn_wc_diff_callbacks2_t binding infrastructure.

(wc_diff_callbacks2_file_changed_or_added): Add helper for changed and

added, which are almost the same.

(wc_diff_callbacks2_file_changed,

wc_diff_callbacks2_file_added,

wc_diff_callbacks2_file_deleted

wc_diff_callbacks2_dir_added,

wc_diff_callbacks2_dir_deleted,

wc_diff_callbacks2_dir_props_changed): Add wrapper callbacks, which

call the Python callbacks in the baton.

(svn_swig_py_setup_wc_diff_callbacks2): Return those callbacks in a new

svn_wc_diff_callbacks2_t with the Python callbacks as the baton (based

on the way we handle ra callbacks).

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h

(svn_swig_py_setup_wc_diff_callbacks2): Declare.

* subversion/bindings/swig/svn_wc.i

Hook svn_swig_py_setup_wc_diff_callbacks2 up for svn_wc_diff_callbacks2_t.

* subversion/bindings/swig/python/svn/wc.py

(DiffCallbacks2): Add base class for svn_wc_diff_callbacks2_t, so wc

diff callers don't have something to build on, defining only the

callbacks in which they're interested.

* subversion/bindings/swig/python/tests/wc.py

(test_diff_editor4): Add test for svn.wc.get_diff_editor4.

* tools/server-side/svn_server_log_parse.py

Copy capabilities TODO from test_svn_server_log_parse.py .

Fix TODO about URI-encoding/decoding.

* tools/server-side/svn_server_log_parse.py

(Parser): URI-decode paths and property names with urllib.unquote

before passing to the handle methods.

* tools/server-side/test_svn_server_log_parse.py

(TestCase.open): Expect decoded client string.

(uri_encode): Add wrapper for URI-encoding with urllib.quote, for Test.

(Test): Encode paths and property names in the rebuilding the log file.

Merge r30896, r30905 from trunk:

* r30896, r30905

Make Cyrus SASL client support DIGEST-MD5 (at the very least).

Notes:

r30896 was a bad attempt, but required for r30905 to apply

cleanly.

Votes:

+1: glasser, markphip, epg