Gabriela Gibson <gabriela.gibson@gmail.com> (gbg)
| Found |
Inspired |
Patch |
|
r1601498,
r1596113,
r1420210 |
r1464371 |
r1606200,
r1605842,
r1602199,
r1602122,
r1549081,
r1542741,
r1542685,
r1542514,
r1542096,
r1541944,
r1541788,
r1541728,
r1541124,
r1541082,
r1540536,
r1540299,
r1539971,
r1539448,
r1539107,
r1538976,
r1538975,
r1538972,
r1538953,
r1538929,
r1538927,
r1538088,
r1538071,
r1538050,
r1537987,
r1536037,
r1536020,
r1535411,
r1535404,
r1533871,
r1533721,
r1532607,
r1531702,
r1531588,
r1531535,
r1531530,
r1531371,
r1529609,
r1526609,
r1526594,
r1526539,
r1526487,
r1525836,
r1516196,
r1502389,
r1501106,
r1500884,
r1500656,
r1500647,
r1500344,
r1500343,
r1500271,
r1500091,
r1499791,
r1493132,
r1493122,
r1489166,
r1489096,
r1488813,
r1488657,
r1488629,
r1488538,
r1488516,
r1485007,
r1485004,
r1484986,
r1484791,
r1484785,
r1484733,
r1484692,
r1484625,
r1484521,
r1484341,
r1484265,
r1484260,
r1484251,
r1483945,
r1483944,
r1479934,
r1477730,
r1477635,
r1461180,
r1458895,
r1452120,
r1452117,
r1452063,
r1448847,
r1438625,
r1430384,
r1430275,
r1428689,
r1427728,
r1426480,
r1423585,
r1421011 |
r1420210 | julianfoad | 2012-12-11 15:04:01 +0000 (Tue, 11 Dec 2012)
* subversion/tests/README
Update: the 'list' option was renamed to '--list' quite a while ago.
Found by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
r1421011 | danielsh | 2012-12-12 22:04:13 +0000 (Wed, 12 Dec 2012)
Test for issue #4263: svnrdump: E125005: Cannot accept non-LF line endings in
'svn:log' property
Patch by: Gabriela Gibson <gabriela.gibson@gmail.com>
* subversion/tests/cmdline/svnrdump_tests.py
(copy_bad_line_endings_load): Test for '\r' line ending bug in svnrdump
(issue 4263).
r1423585 | breser | 2012-12-18 19:17:15 +0000 (Tue, 18 Dec 2012)
Fix issue #4263: svnrdump: E125005: Cannot accept non-LF line endings in
'svn:log' property
Fix to ensure that no "\r" characters are present in revision or node
props.
In the case of "\r\n" character sequences, the "\r" is removed.
In the case of "\r" characters which are not followed by "\n", the "\r"
is replaced by a "\n" character.
* subversion/svnrdump/svnrdump.h:
(svn_rdump__normalize_prop): New function declaration.
* subversion/svnrdump/util.c:
(svn_rdump__normalize_prop): New function to allow "svnrdump load" to
use existing logic
(svn_rdump__normalize_props): Refactored to move logic into
svn_rdump__normalize_prop()
* subversion/svnrdump/load_editor.c:
(set_revision_property): Added call to svn_rdump__normalize_prop()
(set_node_property): Added call to svn_rdump__normalize_prop()
* subversion/tests/cmdline/svnrdump_tests.py:
(copy_bad_line_endings_load): Removed "XFail" decorator
Patch by: Gabriela Gibson <gabriela.gibson@gmail.com>
r1426480 | danielsh | 2012-12-28 12:41:55 +0000 (Fri, 28 Dec 2012)
Update code comments in a number of files which refer to "main.c", where
the file has been renamed.
* subversion/svnrdump/load_editor.c:
(get_lock): Change comment to refer to "similar" function.
in subversion/svnsync/svnsync.c
Change comment to fix reference to "main.c"
* subversion/svnsync/svnsync.c:
(get_lock): Change comment to refer to "similar" function.
in subversion/svnsync/svnsync.c
* subversion/tests/svn_test_main.c:
(Opening comment): Fix file name after rename
* subversion/svndumpfilter/svndumpfilter.c:
(Opening comment): Fix file name after rename
* subversion/svn/cl.h:
(svn_cl__cmd_table[]): Fix file name in comment
(svn_cl__global_options[]): Fix file name in comment
(svn_cl__options[]): Fix file name in comment
* subversion/svn/svn.c:
(Opening comment): Fix file name after rename
* subversion/svnadmin/svnadmin.c:
(Opening comment): Fix file name after rename
* subversion/svnlook/svnlook.c:
(Opening comment): Fix file name after rename
* subversion/svnserve/svnserve.c:
(Opening comment): Fix file name after rename
Patch by: Gabriela Gibson <gabriela.gibson_at_gmail.com>
r1427728 | brane | 2013-01-02 10:53:03 +0000 (Wed, 02 Jan 2013)
Changes to get-deps.sh to download gtest.
* get-deps.sh:
(Variable definitions): Adds three "GTEST_*" variables to assist in
downloading gtest sources.
(get_gtest): New function: Download, unzip and move gtest source.
(get_deps): Check whether gtest is available.
Call get_gtest().
* .: Ignore the gtest directory.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
(Tweaked by me)
r1428689 | brane | 2013-01-04 00:51:27 +0000 (Fri, 04 Jan 2013)
Change default behaviour of get_deps.sh from downloading gtest
library to making it an optional target.
* get-deps.sh
(usage): Add gtest to list of possible arguments.
(get_deps): Remove gtest from list of default downloads.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
r1430275 | stsp | 2013-01-08 13:29:51 +0000 (Tue, 08 Jan 2013)
Create links for all the linkable items in code-to-read and
directory-layout sections of general.html page.
* publish/docs/community-guide/general.part.html:
(code-to-read): Create links for all file names to point to HTML
pretty-print versions.
(code-to-read): Add link for 'notes/assurance.txt'.
(directory-layout): Create links for all directories to point to
current directories in development repository.
(directory-layout): Remove apr and neon links.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
r1430384 | breser | 2013-01-08 16:55:05 +0000 (Tue, 08 Jan 2013)
Improve some additional links in our community guide.
* publis/docs/community-guide/general.part.html
(code-to-read): Change links to APR's documentation like the SVN links.
(directory-layout): Add link to packages directory entry.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
(adjusted by me to apply after r1430275 committed part of this and removed
an extra traililng slash on the packages link).
r1438625 | stsp | 2013-01-25 18:05:05 +0000 (Fri, 25 Jan 2013)
Update information about SVN automated tests and repoint links.
* svn/site/publish/docs/community-guide/building.part.html
(automated-tests): Update information and links. Remove mention of custom
buildbot setups, these are long gone. Move information about the
nofications@ list to ...
(build-farm): ... here. Add Updated link to trac.buildbot.net site.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
me
r1448847 | gbg | 2013-02-21 23:12:27 +0000 (Thu, 21 Feb 2013)
Add a section to Community Guide describing procedure for obtaining
the source for the Subversion web site. Add navigation links to new
page within community guide.
Add three html files creating one extra page on web site accessible at
/docs/community-guide/web.html. Also add README in top level directory
providing link to new web page.
* publish/docs/community-guide/web.html
(New page): Provide the top-level html page for the new page.
* publish/docs/community-guide/web.toc.html
(New page): Provide table-of-contents for new page.
* publish/docs/community-guide/web.part.html
(New page): Provide body text for new page
(Introduction): Provide brief overview of structure of web pages on
subversion site.
(web_sources): Provide instructions for accessing web sources via
https or svn.
(web_mirror): Provide instructions for creating mirror of Subversion
site with Apache.
(web_validation): Provide instructions for validating changes.
(web_patch_creation): Describe format of commit log message for
web changes.
* README
(New file): Provide link to new /docs/community-guide/web.html page.
* publish/docs/community-guide/releasing.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/issues.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/guide-nav.html
(topmenu): Add SSI variable pointing to web.html.
* publish/docs/community-guide/community-guide.html
(site-content): Add SSI variable pointing to web.html.
(Table of Contents): Add link to web.toc.html.
* publish/docs/community-guide/conventions.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/index.html
(Table of Contents): Add link to web.html.
* publish/docs/community-guide/l10n.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/mailing-lists.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/general.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/roles.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/debugging.html
(site-content): Add SSI variable pointing to web.html.
* publish/docs/community-guide/building.html
(site-content): Add SSI variable pointing to web.html.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
Approved by: danielsh
r1452063 | gbg | 2013-03-03 16:54:58 +0000 (Sun, 03 Mar 2013)
Update web server configuration file and change all the file
permissions to remove the executable bit.
"AddOutputFilter INCLUDES .html" is provided by httpd.conf
and this makes the "XBitHack On" setting unnecessary. Similarly,
the file permissions of the *.html files that are set to 'executable'
are not necessary.
See:
http://mail-archives.apache.org/mod_mbox/subversion-dev/201302.mbox/browser
* site/publish/.htaccess():
remove "XBitHack On".
* site/*
remove svn:executable property from all files.
Suggested by: danielsh
Approved by: danielsh
r1452117 | gbg | 2013-03-03 20:07:12 +0000 (Sun, 03 Mar 2013)
Add the gtest_addition branch which will be used for testing the
Subversion C++ bindings.
r1452120 | gbg | 2013-03-03 20:37:39 +0000 (Sun, 03 Mar 2013)
Add the optional dependency Googletest (aka Gtest) to be compiled by
the build system.
* trunk/get-deps.sh (gtest): change gtest dir to libgtest and
add user information.
* trunk/build/generator/gen_base.py (TargetLinked.add_dependencies):
Add .cc extension.
* trunk/gen-make.py (_usage_exit): add gtest flag help info.
* trunk/Makefile.in(): various entries for gtest flags
* trunk/build.conf (install): Add Gtest target.
* trunk/configure.ac (): Add AC_ARG_ENABLE command hook and test
(build rules): add gtest build rules
* INSTALL (Dependency Overview): add entry for Gtest
(Dependencies in Detail): add entry for Gtest
* doc/programmer/gtest-guide.txt(): Documentation for Subversion's
installation of Gtest.
* subversion/bindings/cxxhl/gtests/GtestAcceptance.cpp(): Sample test
for gtest.
* subversion/bindings/cxxhl/gtests/Makefile(): Makefile for sample
test for gtest.
r1458895 | gbg | 2013-03-20 15:45:55 +0000 (Wed, 20 Mar 2013)
Align comments for easier reading.
*subversion/svn/cl.h:
(svn_cl__opt_state_t): Align comments.
Approved by: danielsh
r1461180 | gbg | 2013-03-26 15:16:41 +0000 (Tue, 26 Mar 2013)
Add plain comment that will not be processed by Doxygen, which
explains that the list of #defines is intentionally presented as a
nested list.
* subversion/include/svn_config.h(Configuration Defines): Add plain
comment.
Approved by: C. Michael Pilato
r1464371 | stsp | 2013-04-04 09:01:31 +0000 (Thu, 04 Apr 2013)
* publish/ideas.html: List required technical skills for each project idea.
Inspired by: gbg
r1477635 | gbg | 2013-04-30 14:02:29 +0000 (Tue, 30 Apr 2013)
Clarify the doxygen documentation for the semantics of the @a sep_chars
parameter.
* subversion/include/svn_string.h
(svn_cstring_split): Clarify doxygen comment.
Suggested by: danielsh
Approved by: danielsh
r1477730 | breser | 2013-04-30 17:24:11 +0000 (Tue, 30 Apr 2013)
* get-deps.sh
(ZLIB): Update zlib version number.
(get_zlib): Modify tar command and file extension.
Patch by: Gabriela Gibson <gabriela.gibson{_AT_}gmail.com>
(modified by breser to not use GNU tar options)
r1479934 | gbg | 2013-05-07 15:09:06 +0000 (Tue, 07 May 2013)
Add section describing usage of the SVN_DBG macro to the Community Guide page
'Debugging SVN'.
* publish/docs/community-guide/debugging.part.html
(svn_dbg): Provide overview, links, hints and sample patches.
* publish/docs/community-guide/debugging.toc.html
(): Add link to section svn_dbg.
Suggested by: danielsh
r1483944 | gbg | 2013-05-17 18:21:10 +0000 (Fri, 17 May 2013)
Creating a branch for the invoke-diff-command feature.
r1483945 | gbg | 2013-05-17 18:28:23 +0000 (Fri, 17 May 2013)
Add new diff option "--invoke-diff-cmd" which allows the user to
define a custom command line or config file entry for an external
diff program.
* subversion/include/svn_client.h
(svn_client_diff7, svn_client_diff_peg7): Declare the new API. Like
svn_client_diff[_peg]6 but with invoke_diff_cmd parameter.
(svn_client_diff6, svn_client_diff_peg_6): Deprecate.
* subversion/include/svn_config.h
(SVN_CONFIG_OPTION_INVOKE_DIFF_CMD): New definition.
* subversion/include/svn_io.h
(svn_io_create_custom_diff_cmd): New function.
(svn_io_run_external_diff): New function.
* subversion/libsvn_client/deprecated.c
(svn_client_diff6, svn_client_diff_peg6): New deprecation wrappers.
* subversion/libsvn_client/diff.c
(struct diff_cmd_baton): New member: 'invoke_diff_cmd'.
(diff_content_changed): Call svn_io_run_external_diff if
--invoke-diff-cmd option was specified, otherwise retain previous
behaviour.
(set_up_diff_cmd_and_options): Apply invoke-diff-cmd option
preferentially. Old behavior unchanged.
(svn_client_diff_peg_7): Rename and update from
svn_client_diff_peg_6. Add new parameter: invoke_diff_cmd.
(svn_client_diff7): Rename and update from svn_client_diff6, add
new parameter 'invoke_diff_cmd'.
(): Update all comments mentioning 'svn_client_diff6' to
'svn_client_diff7'.
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): New entry: invoke-diff-cmd.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): New function.
(svn_io_run_external_diff): New function.
* subversion/svn/cl.h
(struct svn_cl__opt_state_t.diff): New member: 'invoke_diff_cmd'.
* subversion/svn/diff-cmd.c
(svn_cl__diff): Update call to svn_client_diff6 to svn_client_diff7.
* subversion/svn/svn.c
(svn_cl__options[]): Add help info and new variable:
'opt_invoke_diff_cmd'.
(svn_cl__cmd_table[]): New option: 'invoke-diff-cmd'.
(sub_main): Prohibit simultaneous usage of --invoke-diff-cmd and
--internal-diff. Add new opt_state.diff.invoke-diff-cmd option
to the option selector. Add call to svn_config_set.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): New function.
(test_list): Add new entry 'diff_invoke_external_diffcmd'.
* tools/hook-scripts/argv_dump.pl
(New File): Perl script that enumerates output by svn to assist with
testing.
r1484251 | gbg | 2013-05-19 09:57:35 +0000 (Sun, 19 May 2013)
Update call to svn_client_diff_peg6 to svn_client_diff_peg7.
* subversion/svn/log-cmd.c
(svn_client_diff_peg7): Update call to svn_client_diff_peg6 to
svn_client_diff_peg7.
r1484260 | gbg | 2013-05-19 10:15:55 +0000 (Sun, 19 May 2013)
Seperate variable declaration from assigment.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Seperate variable declaration from assigment.
r1484265 | gbg | 2013-05-19 10:41:31 +0000 (Sun, 19 May 2013)
Tidying up the appearance of the code.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Indentation and spacing fixed.
r1484341 | gbg | 2013-05-19 19:29:13 +0000 (Sun, 19 May 2013)
Tidying up the appearance of the code.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Indentation fixed.
r1484521 | gbg | 2013-05-20 16:47:18 +0000 (Mon, 20 May 2013)
On the invoke-diff-cmd branch: Removing tabs.
* subversion/svn/log-cmd.c
(display_diff): Tabs removed.
r1484625 | gbg | 2013-05-20 23:46:55 +0000 (Mon, 20 May 2013)
On the invoke-diff-cmd branch: Fix typo in doc string.
* subversion/include/svn_client.h
(svn_client_diff_peg6): Fix typo.
r1484692 | gbg | 2013-05-21 08:24:04 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Fix mistakes and formatting in doc
string, add new doc string.
* subversion/include/svn_client.h
(svn_client_diff_peg6): Fix doc string.
* /subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_io.h
(svn_io_create_custom_diff_cmd): Expand doxygen comment.
r1484733 | gbg | 2013-05-21 10:20:39 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Update parameter.
* subversion/svn/log-cmd.c
(svn_client_diff_peg7): Change 'NULL' entry to pass invoke_diff_cmd.
r1484785 | gbg | 2013-05-21 12:48:26 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Tidy code.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Tidy code.
r1484791 | gbg | 2013-05-21 12:52:43 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Tidy code.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Tidy code.
r1484986 | gbg | 2013-05-21 21:51:55 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Tidy and improve code, comment out faulty code.
* subversion/libsvn_client/diff.c
(svn_io_create_custom_diff_cmd): Add base condition check for
'found' variable. Tidy code (spaces and indentation). Fix pcalloc
issue. Resize ret allocation.
* subversion/svn/log-cmd.c
(display-diff): Comment out --invoke-diff-cmd and replace with NULL,
temporary measure to ensure svn compiles.
r1485004 | gbg | 2013-05-21 22:51:12 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Fix error messages. Add comments to
document non-canonical path usage.
* subversion/libsvn_client/diff.c
(diff_content_changed): Add comment explaining the presence of
non-canonical path in function call.
* subversion/svn/io.c
(svn_io_run_external_diff): Fix layering violation in first error
message. Remove CR from second error message.
r1485007 | gbg | 2013-05-21 22:57:23 +0000 (Tue, 21 May 2013)
On the invoke-diff-cmd branch: Repair erroneous initialization.
* subversion/svn/io.c
(svn_io_run_external_diff): Change pcalloc to palloc call.
r1488516 | gbg | 2013-06-01 12:49:15 +0000 (Sat, 01 Jun 2013)
On the invoke-diff-cmd branch: Add invoke-diff-cmd option to the log
command. Refactor failed_command code. Expand help info. Tidy code.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Assign variable at declaration time.
Tidy code.
* subversion/libsvn_subr/io.c
(svn_io_run_external_diff): Use safer apr_pstrcat function instead
of strcat. Remove call to svn_dirent_local_style.
* subversion/svn/log-cmd.c
(log_receiver_baton): New struct member invoke_diff_cmd.
(display_diff): New parameter 'invoke_diff_cmd' . Pass
invoke_diff_cmd parameter into svn_client_diff_peg7().
(log_entry_receiver): Pass invoke_diff_cmd into display_diff().
(svn_cl__log): Ensure mutual exclusions between invoke_diff_cmd and
quiet and diff-cmd, require 'diff' option. Populate
log_receiver_baton member invoke_diff_cmd. Tidy code.
(svn_cl__options): Expand help info for invoke-diff-cmd option.
* subversion/svn/svn.c
(svn_cl__cmd_table): Add opt_invoke_diff_cmd to the list of valid
subcommands.
r1488538 | gbg | 2013-06-01 15:36:07 +0000 (Sat, 01 Jun 2013)
On the invoke-diff-cmd branch: Cast NULL to char*.
* subversion/libsvn_subr/io.c
(svn_io_run_external_diff): Cast Null to char*.
r1488629 | gbg | 2013-06-01 22:39:11 +0000 (Sat, 01 Jun 2013)
On the invoke-diff-cmd branch: Adjust indentation.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Adjust indentation.
r1488657 | gbg | 2013-06-02 09:58:59 +0000 (Sun, 02 Jun 2013)
On the invoke-diff-cmd branch: Add guard against concurrent usage of
incompatible diff options. Remove previous guard code.
* subversion/svn/svn.c
(sub_main): Add guard against concurrent usage of incompatible diff
options. Remove previous guard code.
r1488813 | gbg | 2013-06-03 00:02:46 +0000 (Mon, 03 Jun 2013)
On the invoke-diff-cmd branch: Raise an error if both diff_cmd and
invoke-diff-cmd are set.
* subversion/include/svn_error_codes.h
(SVN_CLIENT_DIFF_CMD): New macro.
* subversion/libsvn_client/diff.c
(diff_content_changed): Raise an error if both diff_cmd and
invoke-diff-cmd are set.
r1489096 | gbg | 2013-06-03 18:34:49 +0000 (Mon, 03 Jun 2013)
On the invoke-diff-cmd branch: Improve call to apr_pstrcat.
* subversion/libsvn_subr/io.c
(svn_io_run_external_diff): Improve call to apr_pstrcat.
r1489166 | gbg | 2013-06-03 20:46:59 +0000 (Mon, 03 Jun 2013)
On the invoke-diff-cmd branch: Improve variable names.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): Improve variable names.
r1493122 | gbg | 2013-06-14 15:37:04 +0000 (Fri, 14 Jun 2013)
Rework branch and log message documentation. Tidy HTML.
* community-guide/conventions.part.html
(log-messages): Rework relocated branch log message documentation
moved from community-guide/general.part.html#lightweight-branches.
Remove mention of 'CIA' and substitute with ASFBot and update
link. Adjust paragraph containing link to 'partial-commit-access'
to columns limit.
* community-guide/general.part.html
(branch-creation-and-management): Add link to log message section.
(lightweight-branches): Relocate documentation pertaining to log
messages to community-guide/conventions.part.html#log-messages.
r1493132 | gbg | 2013-06-14 15:56:10 +0000 (Fri, 14 Jun 2013)
Add information about svn-dev IRC channel.
* community-guide/general.part.html:
(participating): Add irc address and freenode.webchat client.
r1499791 | gbg | 2013-07-04 15:37:23 +0000 (Thu, 04 Jul 2013)
On the invoke-diff-cmd branch: Change %fn% syntax to ;fn. Update
documentation. Fix faulty variable declaration.
* subversion/include/svn_io.h
(svn_io_create_custom_diff_cmd): Document change of %fn% syntax to
;fn and how to escape the parse tokens.
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): Change %fn% syntax to ;fn.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): Fix faulty variable declaration.
Change token_list from %fn% syntax to ;fn. Update comments to
reflect changes.
* subversion/svn/svn.c
(apr_getopt_option_t): Change %fn% syntax to ;fn. Document the
syntax.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Change %fn% syntax to ;fn.
r1500091 | gbg | 2013-07-05 18:20:06 +0000 (Fri, 05 Jul 2013)
Add information about the hackathons.
* publish/docs/community-guide/general.part.html
(participating): Add reference to 2013, 2012 and 2011 hackathon
event in Berlin.
r1500271 | gbg | 2013-07-06 14:11:13 +0000 (Sat, 06 Jul 2013)
On the invoke-diff-cmd branch:
* BRANCH-README: Add.
r1500343 | gbg | 2013-07-06 23:36:42 +0000 (Sat, 06 Jul 2013)
On the invoke_diff_cmd branch: Add --invoke-diff-cmd option to svnlook
diff option.
* subversion/svnlook/svnlook.c
(enum): New variable svnlook__invoke_diff_cmd.
(options_table[]): New entry 'invoke-diff-cmd'.
(cmd_tablcmd[]): Add svnlook__invoke_diff_cmd to diff cmd table
entry.
(svnlook_opt_state): New member variable "invoke_diff_cmd".
(svnlook_ctxt_t): New member variable "invoke_diff_cmd".
(print_diff_tree): Modify if condition to include new
invoke_diff_cmd. Add conditional call to
/include/svn_io.c:svn_io_run_external_diff().
(get_ctxt_baton): Assign invoke_diff_cmd data.
(main): Assign opt_arg to opt_state.invoke_diff_cmd. Add
exclusiveness test for invoke_diff_cmd and diff_cmd.
r1500344 | gbg | 2013-07-06 23:40:53 +0000 (Sat, 06 Jul 2013)
On the invoke-diff-cmd branch:
* BRANCH-README: Update file.
r1500647 | gbg | 2013-07-08 10:50:32 +0000 (Mon, 08 Jul 2013)
On the invoke-diff-cmd branch: Deprecate svn_io_run_diff2.
* subversion/include/svn_io.h
(svn_io_run_diff2): Deprecate function.
* subversion/libsvn_subr/io.c
(svn_io_run_diff2): Remove function.
* subversion/libsvn_subr/deprecated.c
(svn_io_run_diff2): New function.
r1500656 | gbg | 2013-07-08 11:14:19 +0000 (Mon, 08 Jul 2013)
On the invoke-diff-cmd branch:
* BRANCH-README: Add file.
* BRANCH_README: Delete file.
r1500884 | gbg | 2013-07-08 19:03:37 +0000 (Mon, 08 Jul 2013)
On the --invoke-diff-cmd branch: Fix help string and comment.
* subversion/svnlook/svnlook.c
(options_table): Reverse the order and adjuste help strings for
--invoke-diff-cmd and --diff_cmd, deprecating the latter.
(main): Fix comment.
r1501106 | gbg | 2013-07-09 06:24:18 +0000 (Tue, 09 Jul 2013)
On the --invoke-diff-cmd branch: Revert changes to svnlook help, fix
braces, indentation and extra semi-colon.
* subversion/svnlook/svnlook.c
(options_table): Reverse the order back to it's original state and
reinstate original diff-cmd help string.
* subversion/libsvn_subr/deprecate.c
(svn_io_run_diff2): Fix braces and indentation.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): Remove extraneous semi-colon.
r1502389 | gbg | 2013-07-11 22:51:05 +0000 (Thu, 11 Jul 2013)
On the invoke-diff-cmd branch: Reverse deprecation of
svn_io_run_diff2() leaving the new code in place.
* subversion/include/svn_io.h
(svn_io_run_diff2): Remove deprecation label.
* subversion/libsvn_subr/deprecated.c
(svn_io_run_diff2): Move function to subversion/libsvn_subr/io.c.
* subversion/libsvn_subr/io.c
(svn_io_run_diff2): Place function moved from deprecated.c. Fix
rogue variable.
r1516196 | gbg | 2013-08-21 16:09:43 +0000 (Wed, 21 Aug 2013)
On the invoke-diff-cmd branch: Merge branch with trunk revision 1516159.
r1525836 | gbg | 2013-09-24 10:50:05 +0000 (Tue, 24 Sep 2013)
On the invoke-diff-cmd branch: Cosmetic change only: Fix spacing and
indentation.
* subversion/libsvn_subr/io.c
(svn_io_create_custom_diff_cmd): Fix indentation and spacing.
r1526487 | gbg | 2013-09-26 13:47:21 +0000 (Thu, 26 Sep 2013)
On the invoke-diff-cmd branch: Merge to trunk r1526439.
r1526539 | gbg | 2013-09-26 15:00:15 +0000 (Thu, 26 Sep 2013)
On the invoke-diff-cmd branch: Add refactored version
__create_custom_diff_cmd as a handrolled O(n) alternative offering to
(old and suspect) svn_io_create_custom_diff_cmd. Update diff_tests.py
Nr. 49.
* subversion/include/svn_io.h
(__create_custom_diff_cmd): New internal function.(temporary
installation for comparison)
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): New temporary internal function,
refactored copy of svn_io_create_custom_diff_cmd().
(svn_io_run_external_diff): Change call temporarily from
svn_io_create_custom_diff_cmd() to __create_custom_diff_cmd().
Adjust code to conform to 80 char limit.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Fix typo in description, improve
tests.
r1526594 | gbg | 2013-09-26 16:29:06 +0000 (Thu, 26 Sep 2013)
Modify signed constant FNV1_BASE_32 to unsigned to suppress compiler
warning: subversion/libsvn_subr/file.c: In function
'calc_hash':subversion/libsvn_subr/file.c:149:3: warning: this decimal
constant is unsigned only in ISO C90 [enabled by default]
* subversion/libsvn_subr/file.c
(FNV1_BASE_32): Modify signed constant FNV1_BASE_32 to unsigned
constant.
Approved by: philip
r1526609 | gbg | 2013-09-26 17:16:52 +0000 (Thu, 26 Sep 2013)
On the invoke-diff-cmd branch: Ensure that ineligible delimiters that
have a special end characer are not modified. Add new test.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Ensure that ineligible delimiters that
have a special end characer are not modified.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Add new test. Change the misleading
term 'token' to 'delimiter' for consistency.
r1529609 | gbg | 2013-10-06 11:03:45 +0000 (Sun, 06 Oct 2013)
On the invoke-diff-cmd branch: Ensure that delimiters that have a
special start characer retain this after expansion. Add new test.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Ensure that ineligible delimiters that
have a special start characer are not modified. Ensure that labels
are passed correctly.
(svn_io_run_diff2): Add test location information.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Add new tests for the above behavior.
* subversion/svn/svn.c
(svn_cl__options): Update help text pertaining to invoke-diff-cmd.
r1531371 | gbg | 2013-10-11 17:41:19 +0000 (Fri, 11 Oct 2013)
On the invoke-diff-cmd branch: rewrite __create_custom_diff_cmd and
it's python test to preserve strings inside the command string that is
expanded.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Preserve internal strings that have
spaces as one arg for result[].
(svn_io_run_diff2): Add advice where to find the test for this
function.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Add tests for the above behavior.
r1531530 | gbg | 2013-10-12 13:35:47 +0000 (Sat, 12 Oct 2013)
On the invoke-diff-cmd branch: Refactor __create_custom_diff_cmd() and
it's test. Remove svn_io_create_custom_diff_cmd().
* subversion/include/svn_io.h
(svn_io_create_custom_diff_cmd): Remove.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Refactor.
(svn_io_create_custom_diff_cmd): Remove.
* subversion/tests/cmdline/diff_tests.py
(diff_invoke_external_diffcmd): Adjust tests for the above behavior.
r1531535 | gbg | 2013-10-12 14:06:33 +0000 (Sat, 12 Oct 2013)
On the invoke-diff-cmd branch: Update BRANCH-README file. Update
'diff' help.
* BRANCH-README: Update to reflect current state.
* subversion/svn/svn.c
(svn_cl__options): Update help info for invoke-diff-cmd.
r1531588 | gbg | 2013-10-12 20:24:44 +0000 (Sat, 12 Oct 2013)
On the invoke-diff-cmd branch: Update BRANCH-README file. Typo fix in
io.c.
* BRANCH-README: Add a selection of salient log messages.
* subversion/libsvn_subr/io.c:
(__create_custom_diff_cmd): remove extra semi-colon.
r1531702 | gbg | 2013-10-13 16:10:59 +0000 (Sun, 13 Oct 2013)
On the invoke-diff-cmd branch: Merging r1526469 through r1531700.
r1532607 | gbg | 2013-10-16 00:36:26 +0000 (Wed, 16 Oct 2013)
On the invoke-diff-cmd branch: Trivial changes.
r1533721 | gbg | 2013-10-19 09:24:59 +0000 (Sat, 19 Oct 2013)
On the invoke-diff-cmd branch: Refactor __create_custom_diff_cmd() to
use the new delimiter schema. Update svn_io_run_diff2(), add a
scratch_pool to svn_io_run_external_diff(), update help into in
svn_cl__options[].
* BRANCH-README:
(What --invoke-diff-cmd and --invoke-diff3-cmd provide): Update svn
help diff info.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Remove shell escape facility. Change
delimiters.
(svn_io_run_diff2): Change call to __create_custom_diff_cmd to use
the new delimiter schema.
(svn_io_run_external_diff): Add scratch_pool and ensure destruction
thereof.
* subversion/svn/svn.c
(svn_cl__options[]): Update help info to reflect the new delimiter
schema.
* subversion/tests/cmdline/diff_tests.py:
(diff_invoke_external_diffcmd): Update test to use the new delimiter
schema.
r1533871 | gbg | 2013-10-20 10:11:04 +0000 (Sun, 20 Oct 2013)
On the invoke-diff-cmd branch: Merged r1533864 into r1531702.
r1535404 | gbg | 2013-10-24 15:11:06 +0000 (Thu, 24 Oct 2013)
On the invoke-diff-cmd-feature branch: trunk revision 1535399 merged into branch revision 1533871.
r1535411 | gbg | 2013-10-24 15:21:46 +0000 (Thu, 24 Oct 2013)
On the invoke-diff-cmd-feature branch: Add invoke-diff-cmd help to svn
help log.
* subversion/svn/svn.c
(svn_cl__cmd_table[]): Add opt_invoke_diff_cmd to svn_cl__log entry.
r1536020 | gbg | 2013-10-26 19:02:27 +0000 (Sat, 26 Oct 2013)
On the invoke-diff-cmd-feature branch: Add per file diff support which
uses an arbitrary config file.
* BRANCH-README: Update to reflect the latest changes.
* diff_cmd_config: Temporary file for demonstration/testing purposes.
* subversion/include/svn_io.h
(svn_io_parse_diff_cmd_file): New temporary function.
* subversion/libsvn_subr/io.c
(svn_io_run_external_diff): Add selection mechanism.
(svn_io_parse_diff_cmd_file): New temporary function.
* subversion/svn/svn.c
(svn_cl__options[]): Update svn diff help to explain the new
feature.
r1536037 | gbg | 2013-10-26 21:12:37 +0000 (Sat, 26 Oct 2013)
On the invoke-diff-cmd-feature branch: Update BRANCH-README file.
* BRANCH-README: Update.
r1537987 | gbg | 2013-11-01 17:01:43 +0000 (Fri, 01 Nov 2013)
On the invoke-diff-cmd branch: Continuation from r1535411: Adjust
substitution syntax to %svn_(label)_[old|new|mine|yours|base]. Update
string assigment to use apr_pstrdup.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Update substitution syntax. Update
string assigment to use apr_pstrdup.
* subversion/svn/svn.c
(svn_cl__options[], "invoke-diff-cmd"): Update help info.
* BRANCH-README: Update.
r1538050 | gbg | 2013-11-01 20:27:19 +0000 (Fri, 01 Nov 2013)
On the invoke-diff-cmd-feature branch: trunk revision 1538048 merged into branch revision 1537987.
r1538071 | gbg | 2013-11-01 22:16:20 +0000 (Fri, 01 Nov 2013)
On the invoke-diff-cmd-feature branch: trunk revision 1538068 merged
into branch revision 1538050. Correct errors trying to revert and
re-applied all the changes from r1537987: Continuation from r1535411:
Adjust substitution syntax to %svn_(label)_[old|new|mine|yours|base].
Update string assigment to use apr_pstrdup. Update tests. Update help
info.
* subversion/libsvn_subr/io.c
(__create_custom_diff_cmd): Update substitution syntax. Update
string assigment to use apr_pstrdup.
(svn_io_run_diff2): Update default user args syntax to reflect new
substitution syntax.
* subversion/svn/svn.c
(svn_cl__options[], "invoke-diff-cmd"): Update help info.
* BRANCH-README: Update.
* /subversion/tests/cmdline/diff_tests.py: Update tests.
r1538088 | gbg | 2013-11-01 23:26:09 +0000 (Fri, 01 Nov 2013)
On the invoke-diff-cmd-feature branch: Fix variable declaration and
initialization. Update help info.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Fix variable declaration and
intialization.
* subversion/libsvn_subr/config_file.c
(invoke-diff-cmd): Update help info.
r1538927 | gbg | 2013-11-05 10:29:23 +0000 (Tue, 05 Nov 2013)
On the invoke-merge-cmd-feature: Create a new branch from 1538071
invoke-diff-cmd-feature branch.
r1538929 | gbg | 2013-11-05 10:40:38 +0000 (Tue, 05 Nov 2013)
On the invoke-merge-feature branch: trunk revision 1538925 merged into branch revision 1535411.
r1538953 | gbg | 2013-11-05 11:48:24 +0000 (Tue, 05 Nov 2013)
On the invoke-merge-feature branch: Update BRANCH-README to describe
the new branch.
* BRANCH-README: Initial creation.
r1538972 | gbg | 2013-11-05 12:45:48 +0000 (Tue, 05 Nov 2013)
On the invoke-diff-cmd-feature branch: Resend correct BRANCH-README
file which got erroneously replace in the previous commit. Delete the
trunk which was added by mistake in commit r1538929.
r1538975 | gbg | 2013-11-05 12:51:47 +0000 (Tue, 05 Nov 2013)
On the invoke-merge-feature branch: Update BRANCH-README to describe
the new branch.
* BRANCH-README: Initial creation.
r1538976 | gbg | 2013-11-05 12:53:28 +0000 (Tue, 05 Nov 2013)
On the invoke-diff-merge-feature branch: trunk revision 1538962 merged
into branch revision 1538927.
r1539107 | gbg | 2013-11-05 19:25:05 +0000 (Tue, 05 Nov 2013)
On the invoke-diff-cmd-feature branch: Resend correct BRANCH-README
file.
* BRANCH-README: Revert to 1538088 version.
r1539448 | gbg | 2013-11-06 20:05:20 +0000 (Wed, 06 Nov 2013)
On the invoke-diff-cmd-feature branch: Fixed all omissions, errors and
typos found in review: http://mail-archives.apache.org/mod_mbox/subversion-dev/201311.mbox/%3C1383750720.1526.YahooMailNeo@web186106.mail.ir2.yahoo.com%3E
* subversion/include/private/svn_io_private.h
(svn_io__create_custom_diff_cmd): New function declaration.
* subversion/include/svn_client.h
(svn_client_diff6): Fix doc string.
(svn_client_diff_peg6): Fix doc string.
(svn_client_diff_peg5): Fix doc string.
* subversion/include/svn_io.h
(__create_custom_diff_cmd): Remove function.
* subversion/libsvn_client/diff.c
(diff_cmd_baton): Move declaration of invoke_diff_cmd to group with
diff_cmd.
* subversion/libsvn_subr/io.c
(diff_content_changed): Add missing space to help string.
(svn_io__create_custom_diff_cmd): Rename function from
__create_custom_diff_cmd. Change internal logic to ensure that
every present reserved keyword is expanded, including multiple
occurences thereof in the same word.
(svn_io_run_external_diff): Restore original function contents from
/trunk. Add location of matching test.
* subversion/svn/svn.c
(svn_cl__options "invoke-diff-cmd"): Update and format help
information.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(--invoke-diff-cmd): Add new entry to help output data.
r1539971 | gbg | 2013-11-08 10:44:03 +0000 (Fri, 08 Nov 2013)
On the invoke-diff-cmd-feature branch: Update BRANCH-README file.
* BRANCH-README:
(Changes to the existing code structure): Update.
r1540299 | gbg | 2013-11-09 13:18:14 +0000 (Sat, 09 Nov 2013)
On the invoke-diff-cmd-feature branch: Checkpoint commit (ignore, trivial).
r1540536 | gbg | 2013-11-10 20:10:58 +0000 (Sun, 10 Nov 2013)
On the invoke-diff-cmd-feature branch: Update BRANCH-README file.
* BRANCH-README:
(Log messages of salient code changes): Update entries.
r1541082 | gbg | 2013-11-12 14:31:11 +0000 (Tue, 12 Nov 2013)
On the invoke-diff-cmd-feature branch: Checkpoint commit (ignore, trivial).
r1541124 | gbg | 2013-11-12 16:07:06 +0000 (Tue, 12 Nov 2013)
On the invoke-diff-cmd-feature branch: Checkpoint commit (ignore, trivial).
r1541728 | gbg | 2013-11-13 21:22:17 +0000 (Wed, 13 Nov 2013)
On the invoke-diff-cmd-feature branch: Update BRANCH-README file.
* BRANCH-README:
(Log messages): Update entries.
(Diff file for this Branch): New entry.
r1541788 | gbg | 2013-11-14 02:47:57 +0000 (Thu, 14 Nov 2013)
On the invoke-diff-merge-feature branch: Update BRANCH-README.
r1541944 | gbg | 2013-11-14 15:53:41 +0000 (Thu, 14 Nov 2013)
Removing broken branch, see invoke-diff3-cmd branch replacement.
r1542096 | gbg | 2013-11-14 21:45:41 +0000 (Thu, 14 Nov 2013)
On the invoke-diff3-cmd-feature: Create a new branch from the r1538071
invoke-diff-cmd-feature branch.
r1542514 | gbg | 2013-11-16 14:36:46 +0000 (Sat, 16 Nov 2013)
On the invoke-diff3-feature branch: Add new invoke-diff3-cmd to
Subversion.
* BRANCH-README
(*) Description of Branch.
* subversion/include/private/svn_wc_private.h
(svn_wc__get_file_external_editor,
(svn_wc__get_update_editor,
(svn_wc__get_switch_editor): New parameter:
const char *invoke_diff3_cmd.
* subversion/include/svn_config.h
(): New definition: SVN_CONFIG_OPTION_INVOKE_DIFF3_CMD.
* subversion/include/svn_error_codes.h
(command-line client errors): New definition:
SVN_ERR_CL_NO_EXTERNAL_DIFF3_TOOL.
(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS): Adjust numbering in order
to retain a logical grouping.
* subversion/include/svn_io.h
(svn_io_run_invoke_diff3): New function.
* subversion/include/svn_wc.h
(svn_wc_merge6): New function.
(svn_wc_merge5): Deprecate.
* subversion/libsvn_client/externals.c
(switch_file_external): New variable: const char *invoke_diff3_cmd.
Initialize diff3_cmd to NULL. Add precedence logic and read the
config file to populate invoke_diff3_cmd. Add invoke_diff3_cmd in
call to svn_wc__get_file_external_editor().
* subversion/libsvn_client/merge.c
(merge_cmd_baton_t): New member *invoke_diff3_cmd. Adjust comment.
(merge_file_changed): Replace call to svn_wc_merge5 with call to
svn_wc_merge6.
(do_merge): New variable: const char *invoke_diff3_cmd. Initialize
diff3_cmd to NULL. Adjust comment. Add precedence logic and read
the config file to populate invoke_diff3_cmd. Add invoke_diff3_cmd
to merge_baton.
* subversion/libsvn_client/switch.c
(switch_internal): New variable: const char *invoke_diff3_cmd. Add
precedence logic and read the config file to populate
invoke_diff3_cmd. Add invoke_diff3_cmd in call to
svn_wc__get_switch_editor().
* subversion/libsvn_client/update.c
(update_internal): Initialize diff3_cmd to NULL. New variable:
*invoke_diff3_cmd. Adjust comment, add precedence logic and read
the config file to populate invoke_diff3_cmd. Add
invoke_diff3_cmd in call to svn_wc__get_update_editor().
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): Add entry for invoke-diff3-cmd.
* subversion/libsvn_subr/io.c
(svn_io_run_invoke_diff3): New function.
* subversion/libsvn_wc/deprecated.c
(svn_wc_get_update_editor4): Add invoke-diff3-cmd as NULL to call to
svn_wc__get_update_editor().
(svn_wc_get_switch_editor4): Add invoke-diff3-cmd as NULL to call to
svn_wc__get_switch_editor().
(svn_wc_merge5): New function.
* subversion/libsvn_wc/externals.c
(struct edit_baton): Rename diff3cmd to diff3_cmd. New member
variable: const char *invoke_diff3_cmd.
(close_file): Rename diff3cmd to diff3_cmd and add invoke_diff3_cmd
in call to svn_wc__perform_file_merge().
(svn_wc__get_file_external_editor): New parameter: const char
*invoke_diff3_cmd. Rename diff3cmd to diff3_cmd in eb
assignment and assign invoke_diff3_cmd to struct edit_baton eb.
* subversion/libsvn_wc/merge.c
(merge_target_t): Adjust comment for old_actual_props. New member
variable: invoke_diff3_cmd.
(do_text_merge_external): New parameter: const char
invoke_diff3_cmd. Add if condition to route call to newly added
svn_io_run_invoke_diff3(). Add clarifying braces around
A = (B == C) type assignment.
(merge_text_file): Adjust if condition to route call to
do_text_merge_external() and add invoke_diff3_cmd to call to
do_text_merge_external().
(svn_wc__internal_merge): New parameter: const char
*invoke_diff3_cmd. Assign invoke_diff3_cmd to mt. Add
invoke_diff3_cmd as a conditional variable in to call to
detranslate_wc_file().
(svn_wc_merge6): Declare new API.
* subversion/libsvn_wc/update_editor.c
(struct edit_baton): New member const char *invoke_diff3_cmd.
(svn_wc__perform_file_merge): New parameter: const char
*invoke_diff3_cmd. Add invoke_diff3_cmd to
svn_wc__internal_merge().
(merge_file): Add invoke_diff3_cmd to svn_wc__internal_merge().
(make_editor): New parameter: const char *invoke_diff3_cmd. Assign
invoke_diff3_cmd to eb.
(svn_wc__get_update_editor, svn_wc__get_switch_editor): New
parameter: const char *invoke_diff3_cmd. Add invoke_diff3_cmd to
call to make_editor().
* subversion/libsvn_wc/wc.h
(svn_wc__internal_merge): Adjust function comment. New parameter:
const char *invoke_diff3_cmd. Add newline to conform to general
formatting in this file.
(svn_wc__perform_file_merge): New parameter: const char
*invoke_diff3_cmd.
* subversion/libsvn_wc/wc_db_update_move.c
(update_working_file): Add invoke_diff3_cmd in call to
svn_wc__perform_file_merge() as NULL. Adjust other comments for
neatness.
* subversion/svn/cl.h
(svn_cl__accept_t): New commented member:
svn_cl__accept_invoke_diff3_config.
(): New definition: SVN_CL__ACCEPT_INVOKE_DIFF3_CONFIG.
(svn_cl__opt_state_t): New member const char* invoke_diff3_cmd.
(svn_cl__invoke_diff3_cmd_externally): New function.
* subversion/svn/conflict-callbacks.c
(svn_cl__accept_from_word): Add SVN_CL__ACCEPT_INVOKE_DIFF3_CONFIG
to if condition returns svn_cl__accept_launch.
(invoke_diff3_resolver): New routing function that calls
svn_cl__invoke_diff3_cmd_externally().
(text_conflict_options): Add "3f" option for invoke-diff3-cmd tool
selection and add 'i' option for interactive invoke-diff3-cmd
input.
(handle_text_conflict): Add interactive selection code for
invoke-diff3-cmd input ("i" section) and invoke-diff3-cmd tool
("3f" section) to if condition. Add '3f' and 'i' to next_option.
Adjust general indentation(2 entries).
(conflict_func_interactive): Add cases for "i" and "3f" selection.
Adjust general indentation. Add case
'svn_cl__accept_invoke_diff3_config'.
* subversion/svn/svn.c
(svn_cl__longopt_t): New member 'opt_diff3_cmd'.
(svn_cl__options): Add 'invoke-diff3-cmd' entry plus help text.
(svn_cl__cmd_table,"cleanup","merge","switch","update"): Add
opt_invoke_diff3_cmd.
(sub_main): Add case opt_invoke_diff3_cmd. Ensure murutal
exclusiveness of diff3-cmd and invoke-diff3-cmd. Add call to
svn_config_set(). Add error check for
svn_cl__accept_invoke_diff3_config.
* subversion/svn/util.c
(): Include svn_io_private.h
(svn_cl__invoke_diff3_cmd_externally): New function.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(): Update help output.
r1542685 | gbg | 2013-11-17 10:02:39 +0000 (Sun, 17 Nov 2013)
On the invoke-diff-cmd-feature branch: trunk revision 1542632 merged into branch revision 1541728.
r1542741 | gbg | 2013-11-17 14:56:28 +0000 (Sun, 17 Nov 2013)
On the invoke-diff-cmd-feature branch: Update BRANCH-README file.
Repair accidental white space changes to assorted files.
* BRANCH-README:
(Index): New section.
(Log Messages) Rework all log messages.
(Diff file): Replace with uptodate version.
* subversion/include/svn_io.h
(svn_io_run_cmd): Remove accidentally introduded whitespace at the
end of "@since New in 1.6.0".
* subversion/libsvn_client/diff.c
(diff_baton): Remove accidentally introduded newline before closing
brace.
* subversion/svn/svn.c
(sub_main): Remove accidentally introduded whitespace at the end of
"if (opt_state.diff.diff_cmd)".
* subversion/svnlook/svnlook.c
(main): Replace accidentally removed newline before "case 't'".
r1549081 | gbg | 2013-12-08 17:56:46 +0000 (Sun, 08 Dec 2013)
On the invoke-diff-cmd-feature branch: trunk revision 1548823 merged into branch revision 1542741.
r1596113 | stefan2 | 2014-05-20 05:43:02 +0000 (Tue, 20 May 2014)
Prevent type mismatch warnings.
* tools/server-side/svnfsfs/load-index-cmd.c
(parse_index_line): Use an intermediate variable of a fixed type and
then cast to the respective platform type. We
can't test for value ranges here as there is no
suitable MAX constant for apr_off_t. OTOH, this
is an expert tool and the user is ultimately
responsible for providing correct / valid data.
Found by: gbg
r1601498 | breser | 2014-06-09 20:23:06 +0000 (Mon, 09 Jun 2014)
Remove issue-2897-take2 branch.
Issue #2897 was marked as closed with 1.8.0 by Julian Foad and this branch has
not been touched since 2009. Additionally, the www/hacking.html file in this
branch is turning up in Google search results despite being terribly out of date.
Found by: Gabriela Gibson <gabriella.gibson{_at_}gmail.com>
r1602122 | gbg | 2014-06-12 11:17:34 +0000 (Thu, 12 Jun 2014)
Change all occurrences of 'diff_cmd_baton' to 'dwi'.
* subversion/libsvn_client/diff.c
(just_paths_for_diff_labels),
(diff_props_changed),
(svn_client_diff6),
(svn_client_diff_peg6): changed local variable diff_cmd_baton to
dwi throughout.
Approved by: rhuijben
r1602199 | gbg | 2014-06-12 15:21:01 +0000 (Thu, 12 Jun 2014)
* COMMITTERS
(gbg): Add myself as a partial committer for gtest.
r1605842 | gbg | 2014-06-26 16:28:00 +0000 (Thu, 26 Jun 2014)
On the diff-cmd-feature branch: Creating a branch of /trunk.
r1606200 | gbg | 2014-06-27 20:11:29 +0000 (Fri, 27 Jun 2014)
On the diff-cmd branch:
Addressing issue 2044, extending the invocation capabilities of the
svn diff --diff-cmd.
See http://subversion.tigris.org/issues/show_bug.cgi?id=2044
This is an intermediate attempt for discussion and contains 2 bugs:
1) /subversion/tests/cmdline/diff_tests.py 52 is an XFAIL. Input
appears to be correct, but the test script with a space in the name
"diff script" is not called, this may be an apr_proc_create()
issue.
2) Emtpy single quotes are rendered as '''' by apr_proc_create().
* subversion/BRANCH-README
Decription of this Branch.
* subversion/include/private/svn_io_private.h
(svn_io__create_custom_diff_cmd): Declare new function and
document it. This function is an intermediate version and will
be refactored once the behaviour is settled.
* subversion/libsvn_subr/io.c
(svn_io__create_custom_diff_cmd): New Function. This function
translates user input to diff input.
(svn_io_run_diff): Refactor function to preserve old behaviour of
--diff-cmd whilst facilitiating the new extended syntax.
* subversion/tests/cmdline/diff_tests.py
(test_list): Add new tests diff_external_diffcmd_1,
diff_external_diffcmd_2, diff_external_diffcmd_3 and
diff_external_diffcmd_4.
(diff_external_diffcmd): Change test description, rename the test
script 'diff' to the more descriptive 'diff_script.
(diff_external_diffcmd_1): New function. Test that the
--extensions option works as before when the --diff-cmd is used
with the classic syntax.
(diff_external_diffcmd_2): New function. Check that the new syntax
produces a correct, simple diff program call.
(diff_external_diffcmd_3): New function. This case handles the
cases of -filename or filename+ where + and - are placeholders
for any chosen character. Check that strings containing spaces
enclosed in double quotes are correct parsed as one entry into
the execv compatible shell command array.
(diff_external_diffcmd_4): New function with XFAIL result. Check
that escaped spaces are correctly handled, in case the user has
a program name with a space in it. This currently fails at shell
level, so this may be the wrong approach alltogether.