You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gb...@apache.org on 2013/11/10 21:10:58 UTC
svn commit: r1540536 -
/subversion/branches/invoke-diff-cmd-feature/BRANCH-README
Author: gbg
Date: Sun Nov 10 20:10:58 2013
New Revision: 1540536
URL: http://svn.apache.org/r1540536
Log:
On the invoke-diff-cmd-feature branch: Update BRANCH-README file.
* BRANCH-README:
(Log messages of salient code changes): Update entries.
Modified:
subversion/branches/invoke-diff-cmd-feature/BRANCH-README
Modified: subversion/branches/invoke-diff-cmd-feature/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/BRANCH-README?rev=1540536&r1=1540535&r2=1540536&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/BRANCH-README (original)
+++ subversion/branches/invoke-diff-cmd-feature/BRANCH-README Sun Nov 10 20:10:58 2013
@@ -115,193 +115,166 @@ The test for the 'invoke-diff-cmd' featu
/subversion/tests/cmdline/diff_tests.py diff_invoke_external_diffcmd
-The test for the updated --diff-cmd is
- /subversion/tests/cmdline/diff_tests.py diff_external_diffcmd
+Log messages of salient code changes
+====================================
-TODO:
-====
+* subversion/include/private/svn_io_private.h
- * Finalise the discussion about which substitution syntax to choose.
+ (svn_io__create_custom_diff_cmd): New function declaration.
-Review tools
-============
-
-The entire code of the branch can be obtained thus (temporary measure,
-see below):
-
-svn log --stop-on-copy | grep '^*\ subversion' |\
- awk '{gsub(/^ +| +$/,"")} {print $0}' | cut -d '*' -f 2 |\
- sort --unique | while read line; do echo $line | if [ -a $line ];\
- then echo ""; echo \
-"================================================================================";\
- echo "";\
- diff -p --context=0 -b -B -w "$HOME/trunk/$line" "$PWD/$line"; fi;\
- done > entire-branch-code
-
-The following used to work, but doesn't anymore, I'm not sure why
-(asking on svn-dev currently, will update once this is settled):
+* subversion/libsvn_client/diff.c
-svn diff ^/subversion/trunk@1531612\
- ^/subversion/branches/invoke-diff-cmd-feature
+ (diff_cmd_baton): New member: 'invoke_diff_cmd'. Move declaration of
+ invoke_diff_cmd to group with diff_cmd.
-To obtain a visitable list of files with line numbers in the Emacs
-compilation buffer:
+ (set_up_diff_cmd_and_options): Apply invoke-diff-cmd option
+ preferentially. Old behavior unchanged.
-M-x cd /branches/invoke-diff-cmd-feature/
-M-x compile
-svn diff ^/subversion/trunk@1531612\
- ^/subversion/branches/invoke-diff-cmd-feature |\
- perl -ne '/Index: (.*)$/ && ($name = $1);
- /^@@.*\+(\d+),/ && print "./$name:$1:diff\n";'
+ (diff_content_changed): Raise an error if both diff_cmd and
+ invoke-diff-cmd are set. Add comment explaining the presence of
+ non-canonical path in function call. Call
+ svn_io_run_external_diff if --invoke-diff-cmd option was
+ specified, otherwise retain previous behaviour.
+ (sub_main): Add guard against concurrent usage of incompatible diff
+ options. Remove previous guard code.
-Log messages of salient code changes (not including the per file feature)
-=========================================================================
+ (svn_client_diff_peg_7): Rename and update from
+ svn_client_diff_peg_6. Add new parameter: invoke_diff_cmd.
-* subversion/include/svn_client.h
+ (svn_client_diff7): Rename and update from svn_client_diff6, add
+ new parameter 'invoke_diff_cmd'.
- (svn_client_diff7, svn_client_diff_peg7): Declare the new API. Like
- svn_client_diff[_peg]6 but with invoke_diff_cmd parameter.
+ (): Update all comments mentioning 'svn_client_diff6' to
+ 'svn_client_diff7'.
- (svn_client_diff6, svn_client_diff_peg_6): Deprecate.
+* subversion/libsvn_subr/config_file.c
-* subversion/svn/log-cmd.c
+ (svn_config_ensure): New entry: invoke-diff-cmd.
- (svn_client_diff_peg7): Update call to svn_client_diff_peg6 to
- svn_client_diff_peg7.
+ (invoke-diff-cmd): Update help info.
- (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().
+* subversion/libsvn_subr/io.c
- (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.
+ (svn_io__create_custom_diff_cmd): New function.
- (svn_cl__options): Expand help info for invoke-diff-cmd option.
+ (svn_io_run_diff2): Add test location information.
+ (svn_io_run_external_diff): New function.
-* subversion/include/svn_config.h
- (SVN_CONFIG_OPTION_INVOKE_DIFF_CMD): New definition.
+* subversion/svn/svn.c
+ (svn_cl__cmd_table[]): New option: 'invoke-diff-cmd'. Add
+ opt_invoke_diff_cmd to svn_cl__log entry. Add opt_invoke_diff_cmd
+ to the list of valid subcommands.
-* subversion/include/svn_io.h
+ (svn_cl__options "invoke-diff-cmd"): Add help information. Add new
+ variable 'opt_invoke_diff_cmd'.
- (svn_io_create_custom_diff_cmd): New function.
+ (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.
- (svn_io_run_external_diff): New function.
-
- (svn_io_run_diff2): Deprecate function.
+* subversion/tests/cmdline/diff_tests.py
-* subversion/libsvn_client/deprecated.c
+ (diff_invoke_external_diffcmd): New function.
- (svn_client_diff6, svn_client_diff_peg6): New deprecation wrappers.
+ (test_list): Add new entry 'diff_invoke_external_diffcmd'.
-* subversion/libsvn_client/diff.c
+* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
- (struct diff_cmd_baton): New member: 'invoke_diff_cmd'.
+ (--invoke-diff-cmd): Add new entry to help output data.
- (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 behaviour unchanged.
-
- (svn_client_diff_peg_7): Rename and update from
- svn_client_diff_peg_6. Add new parameter: invoke_diff_cmd.
+* subversion/libsvn_subr/config_file.c
- (svn_client_diff7): Rename and update from svn_client_diff6, add
- new parameter 'invoke_diff_cmd'.
+ (invoke-diff-cmd): Add help info.
- (): Update all comments mentioning 'svn_client_diff6' to
- 'svn_client_diff7'.
- (diff_content_changed): Raise an error if both diff_cmd and
- invoke-diff-cmd are set.
+* subversion/svnlook/svnlook.c
+ (enum): New variable svnlook__invoke_diff_cmd.
-* subversion/libsvn_subr/config_file.c
+ (options_table[]): New entry 'invoke-diff-cmd'.
- (svn_config_ensure): 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".
-* subversion/libsvn_subr/io.c
+ (svnlook_ctxt_t): New member variable "invoke_diff_cmd".
- (svn_io_create_custom_diff_cmd): New function.
+ (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().
- (svn_io_run_external_diff): New function.
+ (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.
-* subversion/svn/cl.h
- (struct svn_cl__opt_state_t.diff): New member: 'invoke_diff_cmd'.
+* subversion/include/svn_error_codes.h
+ (SVN_CLIENT_DIFF_CMD): New macro.
-* subversion/svn/diff-cmd.c
- (svn_cl__diff): Update call to svn_client_diff6 to svn_client_diff7.
+* subversion/svn/log-cmd.c
+ (log_receiver_baton): New struct member invoke_diff_cmd.
-* subversion/svn/svn.c
+ (display_diff): New parameter 'invoke_diff_cmd' . Pass
+ invoke_diff_cmd parameter into svn_client_diff_peg7().
- (svn_cl__options[]): Add help info and new variable:
- 'opt_invoke_diff_cmd'.
+ (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.
- (svn_cl__cmd_table[]): New option: 'invoke-diff-cmd'.
+ (svn_cl__options): Add help info for invoke-diff-cmd option.
- (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.
+ (svn_client_diff_peg7): Update call to svn_client_diff_peg6 to
+ svn_client_diff_peg7.
- (svn_cl__cmd_table): Add opt_invoke_diff_cmd to the list of valid
- sub-commands.
- (sub_main): Add guard against concurrent usage of incompatible diff
- options. Remove previous guard code.
+* 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.
-* subversion/tests/cmdline/diff_tests.py
+ (svn_client_diff6, svn_client_diff_peg_6): Deprecate.
- (diff_invoke_external_diffcmd): New function.
- (test_list): Add new entry 'diff_invoke_external_diffcmd'.
+* subversion/include/svn_config.h
+ (SVN_CONFIG_OPTION_INVOKE_DIFF_CMD): New definition.
-* subversion/include/svn_error_codes.h
- (SVN_CLIENT_DIFF_CMD): New macro.
+* subversion/include/svn_io.h
+ (svn_io_run_external_diff): New function.
-* subversion/svnlook/svnlook.c
- (enum): New variable svnlook__invoke_diff_cmd.
+* subversion/libsvn_client/deprecated.c
- (options_table[]): New entry 'invoke-diff-cmd'.
+ (svn_client_diff6, svn_client_diff_peg6): New deprecation wrappers.
- (cmd_tablcmd[]): Add svnlook__invoke_diff_cmd to diff cmd table
- entry.
- (svnlook_opt_state): New member variable "invoke_diff_cmd".
+* subversion/svn/cl.h
- (svnlook_ctxt_t): New member variable "invoke_diff_cmd".
+ (struct svn_cl__opt_state_t.diff): New member: '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.
+* subversion/svn/diff-cmd.c
- (main): Assign opt_arg to opt_state.invoke_diff_cmd. Add
- exclusiveness test for invoke_diff_cmd and diff_cmd.
+ (svn_cl__diff): Update call to svn_client_diff6 to svn_client_diff7.