svn commit: r1338204 - /subversion/trunk/subversion/libsvn_client/mergeinfo.c

[ju...@apache.org]

Author: julianfoad
Date: Mon May 14 13:56:12 2012
New Revision: 1338204

URL: http://svn.apache.org/viewvc?rev=1338204&view=rev
Log:
* subversion/libsvn_client/mergeinfo.c
  (get_mergeinfo): Clarify by renaming 'url' to 'peg_url' and removing the
    redundant 'rev' variable.

Modified:
    subversion/trunk/subversion/libsvn_client/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1338204&r1=1338203&r2=1338204&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon May 14 13:56:12 2012
@@ -1051,13 +1051,12 @@ get_mergeinfo(svn_mergeinfo_catalog_t *m
               apr_pool_t *scratch_pool)
 {
   svn_ra_session_t *ra_session;
-  svn_revnum_t rev;
   const char *local_abspath;
-  const char *url;
   svn_boolean_t use_url = svn_path_is_url(path_or_url);
+  const char *peg_url;
   svn_revnum_t peg_rev;
 
-  SVN_ERR(svn_client__ra_session_from_path(&ra_session, &peg_rev, &url,
+  SVN_ERR(svn_client__ra_session_from_path(&ra_session, &peg_rev, &peg_url,
                                            path_or_url, NULL, peg_revision,
                                            peg_revision, ctx, scratch_pool));
 
@@ -1071,10 +1070,9 @@ get_mergeinfo(svn_mergeinfo_catalog_t *m
 
       SVN_ERR(svn_client__wc_node_get_origin(&origin, local_abspath, ctx,
                                              scratch_pool, scratch_pool));
-      rev = origin ? origin->rev : SVN_INVALID_REVNUM;
       if (!origin
-          || strcmp(origin->url, url) != 0
-          || peg_rev != rev)
+          || strcmp(origin->url, peg_url) != 0
+          || peg_rev != origin->rev)
       {
         use_url = TRUE; /* Don't rely on local mergeinfo */
       }
@@ -1088,9 +1086,8 @@ get_mergeinfo(svn_mergeinfo_catalog_t *m
 
   if (use_url)
     {
-      rev = peg_rev;
       SVN_ERR(svn_client__get_repos_mergeinfo_catalog(
-        mergeinfo_catalog, ra_session, url, rev, svn_mergeinfo_inherited,
+        mergeinfo_catalog, ra_session, peg_url, peg_rev, svn_mergeinfo_inherited,
         FALSE, include_descendants,
         result_pool, scratch_pool));
     }