Author: neels
Date: Sat Mar 13 23:22:40 2010
New Revision: 922690
URL: http://svn.apache.org/viewvc?rev=922690&view=rev
Log:
Cosmetic: indents and line wraps, else-ifs.
* subversion/libsvn_client/export.c (copy_one_versioned_file): Line width wrap.
* subversion/libsvn_client/merge.c (merge_file_changed): Else-if wrap/indent.
* subversion/libsvn_wc/adm_crawler.c
(svn_wc__internal_transmit_text_deltas): Indent.
* subversion/libsvn_wc/adm_ops.c (svn_wc__get_pristine_contents): Else-if wrap.
* subversion/libsvn_wc/old-and-busted.c (read_url): Else-if wrap/indent.
* subversion/libsvn_wc/questions.c (svn_wc__internal_text_modified_p): Indent.
* subversion/libsvn_wc/update_editor.c (check_tree_conflict): Else-if wrap.
* subversion/svnlook/main.c (do_plist): Else-if wrap/indent.
* subversion/svn/propset-cmd.c (svn_cl__propset): Else-if wrap/indent.
* subversion/tests/libsvn_repos/repos-test.c
(prop_validation_commit_with_revprop, prop_validation): Else-if wrap/indent.
Modified:
subversion/trunk/subversion/libsvn_client/export.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/old-and-busted.c
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/svn/propset-cmd.c
subversion/trunk/subversion/svnlook/main.c
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
Modified: subversion/trunk/subversion/libsvn_client/export.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Sat Mar 13 23:22:40 2010
@@ -155,8 +155,8 @@ copy_one_versioned_file(const char *from
### svn_opt_revision_ enum value for proper distinction
### between revert-base and commit-base.
- Copied-/moved-here nodes have a base, so export both added and
replaced
- files when they involve a copy-/move-here.
+ Copied-/moved-here nodes have a base, so export both added and
+ replaced files when they involve a copy-/move-here.
We get all this for free from evaluating SOURCE == NULL:
*/
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sat Mar 13 23:22:40 2010
@@ -1422,9 +1422,8 @@ merge_file_changed(const char *local_dir
return SVN_NO_ERROR;
}
}
- else
- if (prop_state)
- *prop_state = svn_wc_notify_state_unchanged;
+ else if (prop_state)
+ *prop_state = svn_wc_notify_state_unchanged;
/* Easy out: We are only applying mergeinfo differences. */
if (merge_b->record_only)
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Sat Mar 13 23:22:40 2010
@@ -1210,7 +1210,7 @@ svn_wc__internal_transmit_text_deltas(co
/* ### we should ALREADY have the checksum for pristine. */
SVN_ERR(svn_wc__get_pristine_contents(&p_stream, db, local_abspath,
- scratch_pool, scratch_pool));
+ scratch_pool, scratch_pool));
if (p_stream == NULL)
p_stream = svn_stream_empty(scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Sat Mar 13 23:22:40 2010
@@ -2228,8 +2228,7 @@ svn_wc__get_pristine_contents(svn_stream
return SVN_NO_ERROR;
}
}
- else
- if (status == svn_wc__db_status_not_present)
+ else if (status == svn_wc__db_status_not_present)
/* We know that the delete of this node has been committed.
This should be the same as if called on an unknown path. */
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
@@ -2237,8 +2236,7 @@ svn_wc__get_pristine_contents(svn_stream
"because its delete is already committed"),
svn_dirent_local_style(local_abspath,
scratch_pool));
- else
- if (status == svn_wc__db_status_absent
+ else if (status == svn_wc__db_status_absent
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_incomplete)
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
Modified: subversion/trunk/subversion/libsvn_wc/old-and-busted.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/old-and-busted.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/trunk/subversion/libsvn_wc/old-and-busted.c Sat Mar 13 23:22:40
2010
@@ -194,11 +194,10 @@ read_url(const char **result,
{
if (wc_format < SVN_WC__CHANGED_CANONICAL_URLS)
*result = svn_uri_canonicalize(*result, pool);
- else
- if (! svn_uri_is_canonical(*result, pool))
- return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
- _("Entry contains non-canonical path '%s'"),
- *result);
+ else if (! svn_uri_is_canonical(*result, pool))
+ return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
+ _("Entry contains non-canonical path '%s'"),
+ *result);
}
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Sat Mar 13 23:22:40 2010
@@ -353,7 +353,7 @@ svn_wc__internal_text_modified_p(svn_boo
}
compare_them:
- /* If there's no text-base file, we have to assume the working file
+ /* If there's no text-base file, we have to assume the working file
is modified. For example, a file scheduled for addition but not
yet committed. */
/* We used to stat for the working base here, but we just give
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sat Mar 13 23:22:40
2010
@@ -1772,8 +1772,7 @@ check_tree_conflict(svn_wc_conflict_desc
SVN_ERR_ASSERT(action == svn_wc_conflict_action_edit
|| action == svn_wc_conflict_action_delete
|| action == svn_wc_conflict_action_replace);
- else
- if (reason == svn_wc_conflict_reason_added)
+ else if (reason == svn_wc_conflict_reason_added)
/* When the node did not exist before (it was locally added), then 'update'
* cannot want to modify it in any way. It can only send _action_add. */
SVN_ERR_ASSERT(action == svn_wc_conflict_action_add);
@@ -1858,8 +1857,7 @@ check_tree_conflict(svn_wc_conflict_desc
if (base_kind == svn_wc__db_kind_file
|| base_kind == svn_wc__db_kind_symlink)
left_kind = svn_node_file;
- else
- if (base_kind == svn_wc__db_kind_dir)
+ else if (base_kind == svn_wc__db_kind_dir)
left_kind = svn_node_dir;
else
SVN_ERR_MALFUNCTION();
Modified: subversion/trunk/subversion/svn/propset-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propset-cmd.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/propset-cmd.c (original)
+++ subversion/trunk/subversion/svn/propset-cmd.c Sat Mar 13 23:22:40 2010
@@ -88,12 +88,11 @@ svn_cl__propset(apr_getopt_t *os,
if (svn_prop_needs_translation(pname_utf8))
SVN_ERR(svn_subst_translate_string(&propval, propval,
opt_state->encoding, scratch_pool));
- else
- if (opt_state->encoding)
- return svn_error_create
- (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("--encoding option applies only to textual"
- " Subversion-controlled properties"));
+ else if (opt_state->encoding)
+ return svn_error_create
+ (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ _("--encoding option applies only to textual"
+ " Subversion-controlled properties"));
/* Suck up all the remaining arguments into a targets array */
Modified: subversion/trunk/subversion/svnlook/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/main.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/main.c (original)
+++ subversion/trunk/subversion/svnlook/main.c Sat Mar 13 23:22:40 2010
@@ -1752,12 +1752,11 @@ do_plist(svnlook_ctxt_t *c,
else
printf(" %s : %s\n", pname_stdout, propval->data);
}
+ else if (xml)
+ svn_xml_make_open_tag(&sb, pool, svn_xml_self_closing, "property",
+ "name", pname, NULL);
else
- if (xml)
- svn_xml_make_open_tag(&sb, pool, svn_xml_self_closing, "property",
- "name", pname, NULL);
- else
- printf(" %s\n", pname);
+ printf(" %s\n", pname);
}
if (xml)
{
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=922690&r1=922689&r2=922690&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Sat Mar 13
23:22:40 2010
@@ -2152,13 +2152,12 @@ prop_validation_commit_with_revprop(cons
APR_HASH_KEY_STRING,
svn_string_create("plato", pool));
}
- else
- if (strcmp(prop_key, SVN_PROP_REVISION_LOG) != 0)
- {
- apr_hash_set(revprop_table, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING,
- svn_string_create("revision log", pool));
- }
+ else if (strcmp(prop_key, SVN_PROP_REVISION_LOG) != 0)
+ {
+ apr_hash_set(revprop_table, SVN_PROP_REVISION_LOG,
+ APR_HASH_KEY_STRING,
+ svn_string_create("revision log", pool));
+ }
/* Make an arbitrary change and commit using above values... */
@@ -2213,12 +2212,11 @@ prop_validation(const svn_test_opts_t *o
return svn_error_create(SVN_ERR_TEST_FAILED, err,
"Failed to reject a log with invalid "
"UTF-8");
- else
- if (err->apr_err != SVN_ERR_BAD_PROPERTY_VALUE)
- return svn_error_create(SVN_ERR_TEST_FAILED, err,
- "Expected SVN_ERR_BAD_PROPERTY_VALUE for "
- "a log with invalid UTF-8, "
- "got another error.");
+ else if (err->apr_err != SVN_ERR_BAD_PROPERTY_VALUE)
+ return svn_error_create(SVN_ERR_TEST_FAILED, err,
+ "Expected SVN_ERR_BAD_PROPERTY_VALUE for "
+ "a log with invalid UTF-8, "
+ "got another error.");
svn_error_clear(err);
@@ -2233,12 +2231,11 @@ prop_validation(const svn_test_opts_t *o
return svn_error_create(SVN_ERR_TEST_FAILED, err,
"Failed to reject a log with inconsistent "
"line ending style");
- else
- if (err->apr_err != SVN_ERR_BAD_PROPERTY_VALUE)
- return svn_error_create(SVN_ERR_TEST_FAILED, err,
- "Expected SVN_ERR_BAD_PROPERTY_VALUE for "
- "a log with inconsistent line ending style, "
- "got another error.");
+ else if (err->apr_err != SVN_ERR_BAD_PROPERTY_VALUE)
+ return svn_error_create(SVN_ERR_TEST_FAILED, err,
+ "Expected SVN_ERR_BAD_PROPERTY_VALUE for "
+ "a log with inconsistent line ending style, "
+ "got another error.");
svn_error_clear(err);
