subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1453766 - /subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c
Date Thu, 07 Mar 2013 10:41:13 GMT
Author: stefan2
Date: Thu Mar  7 10:41:12 2013
New Revision: 1453766

URL: http://svn.apache.org/r1453766
Log:
On the fsfs-format7 branch: minor code improvement

* subversion/libsvn_fs_fs/transaction.c
  (choose_delta_base): factor out common code

Modified:
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c?rev=1453766&r1=1453765&r2=1453766&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c Thu Mar  7 10:41:12
2013
@@ -1788,6 +1788,7 @@ choose_delta_base(representation_t **rep
   base = noderev;
   while ((count++) < noderev->predecessor_count)
     {
+      svn_revnum_t base_revision;
       SVN_ERR(svn_fs_fs__get_node_revision(&base, fs,
                                            base->predecessor_id, pool));
 
@@ -1798,16 +1799,15 @@ choose_delta_base(representation_t **rep
        * look the same (false positive) while reps shared within the same
        * revision will not be caught (false negative).
        */
+      base_revision = svn_fs_fs__id_rev(base->id);
       if (props)
         {
-          if (   base->prop_rep
-              && svn_fs_fs__id_rev(base->id) > base->prop_rep->revision)
+          if (base->prop_rep && base_revision > base->prop_rep->revision)
             maybe_shared_rep = TRUE;
         }
       else
         {
-          if (   base->data_rep
-              && svn_fs_fs__id_rev(base->id) > base->data_rep->revision)
+          if (base->data_rep && base_revision > base->data_rep->revision)
             maybe_shared_rep = TRUE;
         }
     }



Mime
View raw message