svn commit: r1338153 - in /subversion/trunk/subversion: libsvn_client/update.c libsvn_wc/node.c

[ju...@apache.org]

Author: julianfoad
Date: Mon May 14 11:05:17 2012
New Revision: 1338153

URL: http://svn.apache.org/viewvc?rev=1338153&view=rev
Log:
Remove a redundant test for a 'missing URL'.

* subversion/libsvn_client/update.c
  (update_internal): Replace a redundant check with an assertion, in
    anticipation of removing it altogether in a subsequent commit.

* subversion/libsvn_wc/node.c
  (svn_wc__node_get_base): Add assertions to make it clear that either all
    or none of the outputs are valid.

Modified:
    subversion/trunk/subversion/libsvn_client/update.c
    subversion/trunk/subversion/libsvn_wc/node.c

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1338153&r1=1338152&r2=1338153&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Mon May 14 11:05:17 2012
@@ -258,10 +258,8 @@ update_internal(svn_revnum_t *result_rev
         }
       return SVN_NO_ERROR;
     }
-  else if (! repos_relpath)
-      return svn_error_createf(SVN_ERR_ENTRY_MISSING_URL, NULL,
-                               _("'%s' has no URL"),
-                               svn_dirent_local_style(anchor_abspath, pool));
+  else
+    SVN_ERR_ASSERT(repos_relpath);
 
   anchor_url = svn_path_url_add_component2(repos_root_url, repos_relpath,
                                            pool);

Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1338153&r1=1338152&r2=1338153&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Mon May 14 11:05:17 2012
@@ -909,6 +909,10 @@ svn_wc__node_get_base(svn_revnum_t *revi
     }
   SVN_ERR(err);
 
+  SVN_ERR_ASSERT(!revision || SVN_IS_VALID_REVNUM(*revision));
+  SVN_ERR_ASSERT(!repos_relpath || *repos_relpath);
+  SVN_ERR_ASSERT(!repos_root_url || *repos_root_url);
+  SVN_ERR_ASSERT(!repos_uuid || *repos_uuid);
   return SVN_NO_ERROR;
 }