svn commit: r1660975 - /subversion/trunk/subversion/libsvn_client/blame.c

[rhuijben]

Author: rhuijben
Date: Thu Feb 19 18:51:52 2015
New Revision: 1660975

URL: http://svn.apache.org/r1660975
Log:
* subversion/libsvn_client/blame.c
  (file_rev_handler): Following up on r1660969, reverse the condition and
    just perform a range check. All revisions should be in that range
    except for the very first received and those of merges.

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

Modified: subversion/trunk/subversion/libsvn_client/blame.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/blame.c?rev=1660975&r1=1660974&r2=1660975&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/blame.c (original)
+++ subversion/trunk/subversion/libsvn_client/blame.c Thu Feb 19 18:51:52 2015
@@ -489,20 +489,9 @@ file_rev_handler(void *baton, const char
   /* Create the rev structure. */
   delta_baton->rev = apr_pcalloc(frb->mainpool, sizeof(struct rev));
 
-  if ((frb->start_rev < frb->end_rev)
-      ? (revnum < MIN(frb->start_rev, frb->end_rev))
-      : (revnum > MAX(frb->start_rev, frb->end_rev)))
-    {
-      /* We shouldn't get more than one revision outside the
-         specified range (unless we alsoe receive merged revisions) */
-      SVN_ERR_ASSERT((frb->last_filename == NULL)
-                     || frb->include_merged_revisions);
-
-      /* The file existed before start_rev; generate no blame info for
-         lines from this revision (or before). */
-      delta_baton->rev->revision = SVN_INVALID_REVNUM;
-    }
-  else
+  if (merged_revision
+      || (revnum >= MIN(frb->start_rev, frb->end_rev)
+          && revnum <= MAX(frb->start_rev, frb->end_rev)))
     {
       /* 1+ for the "youngest to oldest" blame */
       SVN_ERR_ASSERT(revnum <= 1 + MAX(frb->end_rev, frb->start_rev));
@@ -511,6 +500,16 @@ file_rev_handler(void *baton, const char
       delta_baton->rev->revision = revnum;
       delta_baton->rev->rev_props = svn_prop_hash_dup(rev_props, 
frb->mainpool);
     }
+  else
+    {
+      /* We shouldn't get more than one revision outside the
+         specified range (unless we alsoe receive merged revisions) */
+      SVN_ERR_ASSERT(frb->last_filename == NULL);
+
+      /* The file existed before start_rev; generate no blame info for
+         lines from this revision (or before). */
+      delta_baton->rev->revision = SVN_INVALID_REVNUM;
+    }
 
   if (frb->include_merged_revisions)
     delta_baton->rev->path = apr_pstrdup(frb->mainpool, path);