# HG changeset patch # User Pierre-Yves David # Date 1489020804 28800 # Node ID 4282feb794328be2d61b86e540f7f5a0f0c0a087 # Parent a3a2382b2e1bb9aaef8bf52a6723190cf0c3c693 hg-mod: directly use repo.vfs.join The 'repo.join' method is about to be deprecated. diff -r a3a2382b2e1b -r 4282feb79432 mercurial/hg.py --- a/mercurial/hg.py Wed Mar 08 16:53:17 2017 -0800 +++ b/mercurial/hg.py Wed Mar 08 16:53:24 2017 -0800 @@ -559,7 +559,7 @@ destlock = copystore(ui, srcrepo, destpath) # copy bookmarks over - srcbookmarks = srcrepo.join('bookmarks') + srcbookmarks = srcrepo.vfs.join('bookmarks') dstbookmarks = os.path.join(destpath, 'bookmarks') if os.path.exists(srcbookmarks): util.copyfile(srcbookmarks, dstbookmarks) @@ -567,7 +567,7 @@ # Recomputing branch cache might be slow on big repos, # so just copy it def copybranchcache(fname): - srcbranchcache = srcrepo.join('cache/%s' % fname) + srcbranchcache = srcrepo.vfs.join('cache/%s' % fname) dstbranchcache = os.path.join(dstcachedir, fname) if os.path.exists(srcbranchcache): if not os.path.exists(dstcachedir):