From patchwork Thu Aug 21 23:25:21 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1, of, 2, V2] clone: for local clones,
 copy branchcache from the right location (issue4286)
From: Siddharth Agarwal <sid0@fb.com>
X-Patchwork-Id: 5551
Message-Id: <d5c551bf9d58912c8c08.1408663521@devbig136.prn2.facebook.com>
To: <mercurial-devel@selenic.com>
Date: Thu, 21 Aug 2014 16:25:21 -0700

# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1408661912 25200
#      Thu Aug 21 15:58:32 2014 -0700
# Node ID d5c551bf9d58912c8c084b5abce76b606c870eb6
# Parent  373d25ae3077814c3c05062ed11f21d5447cacd7
clone: for local clones, copy branchcache from the right location (issue4286)

The unfiltered branchcache is in .hg/cache/branch2, not
.hg/store/cache/branch2.

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -367,7 +367,7 @@
             # Recomputing branch cache might be slow on big repos,
             # so just copy it
             dstcachedir = os.path.join(destpath, 'cache')
-            srcbranchcache = srcrepo.sjoin('cache/branch2')
+            srcbranchcache = srcrepo.join('cache/branch2')
             dstbranchcache = os.path.join(dstcachedir, 'branch2')
             if os.path.exists(srcbranchcache):
                 if not os.path.exists(dstcachedir):