Patchwork [1,of,2,V2] clone: for local clones, copy branchcache from the right location (issue4286)

login
register
mail settings
Submitter Siddharth Agarwal
Date Aug. 21, 2014, 11:25 p.m.
Message ID <d5c551bf9d58912c8c08.1408663521@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/5551/
State Accepted
Headers show

Comments

Siddharth Agarwal - Aug. 21, 2014, 11:25 p.m.
# 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.

Patch

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):