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/05/19 21:29:14 UTC
svn commit: r1484341 -
/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
Author: gbg
Date: Sun May 19 19:29:13 2013
New Revision: 1484341
URL: http://svn.apache.org/r1484341
Log:
Tidying up the appearance of the code.
* subversion/libsvn_client/diff.c
(set_up_diff_cmd_and_options): Indentation fixed.
Modified:
subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c?rev=1484341&r1=1484340&r2=1484341&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c Sun May 19 19:29:13 2013
@@ -2488,24 +2488,25 @@ set_up_diff_cmd_and_options(struct diff_
if (diff_cmd)
SVN_ERR(svn_path_cstring_to_utf8(&diff_cmd_baton->diff_cmd,
diff_cmd, pool));
- else {
- if (config) /* check if there is a invoke_diff_cmd in the config file */
- {
- svn_config_t *cfg;
-
- cfg = svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG);
- diff_cmd_baton->diff_cmd = NULL;
- svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
- SVN_CONFIG_OPTION_INVOKE_DIFF_CMD, NULL);
- if (diff_cmd)
- {
- SVN_ERR(svn_path_cstring_to_utf8(
- &diff_cmd_baton->invoke_diff_cmd, diff_cmd, pool));
-
- return SVN_NO_ERROR;
- }
- }
- }
+ else
+ {
+ if (config) /* check if there is a invoke_diff_cmd in the config file */
+ {
+ svn_config_t *cfg;
+
+ cfg = svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG);
+ diff_cmd_baton->diff_cmd = NULL;
+ svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
+ SVN_CONFIG_OPTION_INVOKE_DIFF_CMD, NULL);
+ if (diff_cmd)
+ {
+ SVN_ERR(svn_path_cstring_to_utf8(
+ &diff_cmd_baton->invoke_diff_cmd, diff_cmd, pool));
+
+ return SVN_NO_ERROR;
+ }
+ }
+ }
/* If there was a command, arrange options to pass to it. */
if (diff_cmd_baton->diff_cmd)
RE: svn commit: r1484341 - /subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: gbg@apache.org [mailto:gbg@apache.org]
> Sent: zondag 19 mei 2013 21:29
> To: commits@subversion.apache.org
> Subject: svn commit: r1484341 - /subversion/branches/invoke-diff-cmd-
> feature/subversion/libsvn_client/diff.c
>
> Author: gbg
> Date: Sun May 19 19:29:13 2013
> New Revision: 1484341
>
> URL: http://svn.apache.org/r1484341
> Log:
> Tidying up the appearance of the code.
Can you please prefix your commits to this branch with something like
On the invoke diff branch:
Without that the log message reads as a commit to trunk while a recent message such as
[[
Author: stsp
Date: Sun May 19 10:17:07 2013
New Revision: 1484261
URL: http://svn.apache.org/r1484261
Log:
On the 1.6.x-issue4340 branch, filter control characters from an error message.
This corresponds to r1481627 on trunk, but the svn_path_illegal_path_escape()
API function used in that commit is not available in 1.6.x. So I've manually
marked the revision as merged using a --record-only merge.
]]
makes it immediately clear that we look at a patch applied to a branch.
Bert