This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9598

share: properly copy cache files when cloning from a share
ClosedPublic

Authored by joerg.sonnenberger on Dec 14 2020, 1:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5b9bb4e9a3bf: share: properly copy cache files when cloning from a share
Summary

If a is shared to b and b cloned to c, the old code would look directly
under b/.hg for the cache directory and not use the cachevfs layer to
pick the members from a/.hg/cache. Adjust variable names and comments to
reflect that the function is used for more than just the branchmap
cache.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

joerg.sonnenberger retitled this revision from share: propery copy cache files when cloning from a share to share: properly copy cache files when cloning from a share.Dec 14 2020, 2:03 PM
joerg.sonnenberger added a commit: rHG5b9bb4e9a3bf: share: properly copy cache files when cloning from a share.Dec 16 2020, 7:14 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5b9bb4e9a3bf: share: properly copy cache files when cloning from a share (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (11 lines)
Mtests/test-share.t (11 lines)

Diff 24314

mercurial/hg.py

# way to pull just non-changegroup data. # way to pull just non-changegroup data.
exchange.pull(destrepo, srcpeer, heads=revs) exchange.pull(destrepo, srcpeer, heads=revs)
_postshareupdate(destrepo, update) _postshareupdate(destrepo, update)
return srcpeer, peer(ui, peeropts, dest) return srcpeer, peer(ui, peeropts, dest)
# Recomputing branch cache might be slow on big repos, # Recomputing caches is often slow on big repos, so copy them.
# so just copy it
def _copycache(srcrepo, dstcachedir, fname): def _copycache(srcrepo, dstcachedir, fname):
"""copy a cache from srcrepo to destcachedir (if it exists)""" """copy a cache from srcrepo to destcachedir (if it exists)"""
srcbranchcache = srcrepo.vfs.join(b'cache/%s' % fname) srcfname = srcrepo.cachevfs.join(fname)
dstbranchcache = os.path.join(dstcachedir, fname) dstfname = os.path.join(dstcachedir, fname)
if os.path.exists(srcbranchcache): if os.path.exists(srcfname):
if not os.path.exists(dstcachedir): if not os.path.exists(dstcachedir):
os.mkdir(dstcachedir) os.mkdir(dstcachedir)
util.copyfile(srcbranchcache, dstbranchcache) util.copyfile(srcfname, dstfname)
def clone( def clone(
ui, ui,
peeropts, peeropts,
source, source,
dest=None, dest=None,
pull=False, pull=False,

tests/test-share.t

checklink-target (symlink !) checklink-target (symlink !)
manifestfulltextcache (reporevlogstore !) manifestfulltextcache (reporevlogstore !)
$ ls -1 ../repo1/.hg/cache $ ls -1 ../repo1/.hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2-visible tags2-visible
Cloning a shared repo should pick up the full cache dir on the other hand.
$ hg clone . ../repo2-clone
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ ls -1 ../repo2-clone/.hg/cache
branch2-served
rbc-names-v1
rbc-revs-v1
tags2-visible
Some sed versions appends newline, some don't, and some just fails Some sed versions appends newline, some don't, and some just fails
$ cat .hg/sharedpath; echo $ cat .hg/sharedpath; echo
$TESTTMP/repo1/.hg $TESTTMP/repo1/.hg
trailing newline on .hg/sharedpath is ok trailing newline on .hg/sharedpath is ok
$ hg tip -q $ hg tip -q
0:d3873e73d99e 0:d3873e73d99e