You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/05/05 18:59:24 UTC
svn commit: r1677860 -
/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Author: julianfoad
Date: Tue May 5 16:59:24 2015
New Revision: 1677860
URL: http://svn.apache.org/r1677860
Log:
On the 'move-tracking-2' branch: Eliminate one use of
svn_branch_find_nested_branch_element_by_rrpath().
* subversion/libsvn_delta/branch.c
(svn_branch_state_parse): Look up the outer branch by id instead of by path.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1677860&r1=1677859&r2=1677860&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Tue May 5 16:59:24 2015
@@ -942,12 +942,24 @@ svn_branch_state_parse(svn_branch_state_
SVN_ERR(parse_branch_line(bid, &root_eid, &branch_root_rrpath,
stream, scratch_pool));
- if (branch_root_rrpath[0])
+ /* Find the outer branch and outer EID */
+ if (strcmp(bid, "B0") != 0)
{
- svn_branch_find_nested_branch_element_by_rrpath(&outer_branch, &outer_eid,
- rev_root->root_branch,
- branch_root_rrpath,
- scratch_pool);
+ char *outer_bid = apr_pstrdup(scratch_pool, bid);
+ char *last_dot = strrchr(outer_bid, '.');
+
+ if (last_dot) /* BID looks like "B3.11" or "B3.11.22" etc. */
+ {
+ *last_dot = '\0';
+ outer_eid = atoi(last_dot + 1);
+ }
+ else /* looks like "B22" (non-zero and with no dot) */
+ {
+ outer_bid = "B0";
+ outer_eid = atoi(bid + 1);
+ }
+ outer_branch = svn_branch_revision_root_get_branch_by_id(
+ rev_root, outer_bid, scratch_pool);
}
else
{