| simonfar |
| Restricted Project |
Prevents downloading any manifest revlogs when the client is in treeonly mode.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | remotefilelog/__init__.py (2 lines) | |||
| M | remotefilelog/remotefilelogserver.py (6 lines) | |||
| M | tests/test-treemanifest-treeonly.t (13 lines) |
| def stream_out_shallow(orig): | def stream_out_shallow(orig): | ||||
| caps = shallowutil.peercapabilities(remote) | caps = shallowutil.peercapabilities(remote) | ||||
| if shallowrepo.requirement in caps: | if shallowrepo.requirement in caps: | ||||
| opts = {} | opts = {} | ||||
| if repo.includepattern: | if repo.includepattern: | ||||
| opts['includepattern'] = '\0'.join(repo.includepattern) | opts['includepattern'] = '\0'.join(repo.includepattern) | ||||
| if repo.excludepattern: | if repo.excludepattern: | ||||
| opts['excludepattern'] = '\0'.join(repo.excludepattern) | opts['excludepattern'] = '\0'.join(repo.excludepattern) | ||||
| if repo.ui.configbool("treemanifest", "treeonly"): | |||||
| opts['noflatmanifest'] = 'True' | |||||
| return remote._callstream('stream_out_shallow', **opts) | return remote._callstream('stream_out_shallow', **opts) | ||||
| else: | else: | ||||
| return orig() | return orig() | ||||
| wrapfunction(remote, 'stream_out', stream_out_shallow) | wrapfunction(remote, 'stream_out', stream_out_shallow) | ||||
| if hasstreamclone: | if hasstreamclone: | ||||
| def stream_wrap(orig, op): | def stream_wrap(orig, op): | ||||
| setup_streamout(op.repo, op.remote) | setup_streamout(op.repo, op.remote) | ||||
| return orig(op) | return orig(op) | ||||
| wireproto.commands['getflogheads'] = (getflogheads, 'path') | wireproto.commands['getflogheads'] = (getflogheads, 'path') | ||||
| wireproto.commands['getfiles'] = (getfiles, '') | wireproto.commands['getfiles'] = (getfiles, '') | ||||
| wireproto.commands['getfile'] = (getfile, 'file node') | wireproto.commands['getfile'] = (getfile, 'file node') | ||||
| wireproto.commands['getpackv1'] = (getpack, '*') | wireproto.commands['getpackv1'] = (getpack, '*') | ||||
| class streamstate(object): | class streamstate(object): | ||||
| match = None | match = None | ||||
| shallowremote = False | shallowremote = False | ||||
| noflatmf = False | |||||
| state = streamstate() | state = streamstate() | ||||
| def stream_out_shallow(repo, proto, other): | def stream_out_shallow(repo, proto, other): | ||||
| includepattern = None | includepattern = None | ||||
| excludepattern = None | excludepattern = None | ||||
| raw = other.get('includepattern') | raw = other.get('includepattern') | ||||
| if raw: | if raw: | ||||
| includepattern = raw.split('\0') | includepattern = raw.split('\0') | ||||
| raw = other.get('excludepattern') | raw = other.get('excludepattern') | ||||
| if raw: | if raw: | ||||
| excludepattern = raw.split('\0') | excludepattern = raw.split('\0') | ||||
| oldshallow = state.shallowremote | oldshallow = state.shallowremote | ||||
| oldmatch = state.match | oldmatch = state.match | ||||
| oldnoflatmf = state.noflatmf | |||||
| try: | try: | ||||
| state.shallowremote = True | state.shallowremote = True | ||||
| state.match = match.always(repo.root, '') | state.match = match.always(repo.root, '') | ||||
| state.noflatmf = other.get('noflatmanifest') == 'True' | |||||
| if includepattern or excludepattern: | if includepattern or excludepattern: | ||||
| state.match = match.match(repo.root, '', None, | state.match = match.match(repo.root, '', None, | ||||
| includepattern, excludepattern) | includepattern, excludepattern) | ||||
| streamres = wireproto.stream(repo, proto) | streamres = wireproto.stream(repo, proto) | ||||
| # Force the first value to execute, so the file list is computed | # Force the first value to execute, so the file list is computed | ||||
| # within the try/finally scope | # within the try/finally scope | ||||
| first = next(streamres.gen) | first = next(streamres.gen) | ||||
| second = next(streamres.gen) | second = next(streamres.gen) | ||||
| def gen(): | def gen(): | ||||
| yield first | yield first | ||||
| yield second | yield second | ||||
| for value in streamres.gen: | for value in streamres.gen: | ||||
| yield value | yield value | ||||
| return wireproto.streamres(gen()) | return wireproto.streamres(gen()) | ||||
| finally: | finally: | ||||
| state.shallowremote = oldshallow | state.shallowremote = oldshallow | ||||
| state.match = oldmatch | state.match = oldmatch | ||||
| state.noflatmf = oldnoflatmf | |||||
| wireproto.commands['stream_out_shallow'] = (stream_out_shallow, '*') | wireproto.commands['stream_out_shallow'] = (stream_out_shallow, '*') | ||||
| # don't clone filelogs to shallow clients | # don't clone filelogs to shallow clients | ||||
| def _walkstreamfiles(orig, repo): | def _walkstreamfiles(orig, repo): | ||||
| if state.shallowremote: | if state.shallowremote: | ||||
| # if we are shallow ourselves, stream our local commits | # if we are shallow ourselves, stream our local commits | ||||
| if shallowrepo.requirement in repo.requirements: | if shallowrepo.requirement in repo.requirements: | ||||
| for (u, e, s) in repo.store.datafiles(): | for (u, e, s) in repo.store.datafiles(): | ||||
| f = u[5:-2] # trim data/... and .i/.d | f = u[5:-2] # trim data/... and .i/.d | ||||
| if not state.match(f): | if not state.match(f): | ||||
| yield (u, e, s) | yield (u, e, s) | ||||
| for x in repo.store.topfiles(): | for x in repo.store.topfiles(): | ||||
| if shallowtrees and x[0][:15] == '00manifesttree.': | if shallowtrees and x[0][:15] == '00manifesttree.': | ||||
| continue | continue | ||||
| if state.noflatmf and x[0][:11] == '00manifest.': | |||||
| continue | |||||
| yield x | yield x | ||||
| elif shallowrepo.requirement in repo.requirements: | elif shallowrepo.requirement in repo.requirements: | ||||
| # don't allow cloning from a shallow repo to a full repo | # don't allow cloning from a shallow repo to a full repo | ||||
| # since it would require fetching every version of every | # since it would require fetching every version of every | ||||
| # file in order to create the revlogs. | # file in order to create the revlogs. | ||||
| raise error.Abort(_("Cannot clone from a shallow repo " | raise error.Abort(_("Cannot clone from a shallow repo " | ||||
| "to a full repo.")) | "to a full repo.")) | ||||
| > [extensions] | > [extensions] | ||||
| > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py | > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py | ||||
| > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py | > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py | ||||
| > treemanifest=$TESTDIR/../treemanifest | > treemanifest=$TESTDIR/../treemanifest | ||||
| > [treemanifest] | > [treemanifest] | ||||
| > server=True | > server=True | ||||
| > [remotefilelog] | > [remotefilelog] | ||||
| > server=True | > server=True | ||||
| > shallowtrees=True | |||||
| > EOF | > EOF | ||||
| Make local commits on the server | Make local commits on the server | ||||
| $ mkdir subdir | $ mkdir subdir | ||||
| $ echo x > subdir/x | $ echo x > subdir/x | ||||
| $ hg commit -qAm 'add subdir/x' | $ hg commit -qAm 'add subdir/x' | ||||
| The following will simulate the transition from flat to tree-only | The following will simulate the transition from flat to tree-only | ||||
| | | | | ||||
| o add y | o add y | ||||
| | | | | ||||
| ~ | ~ | ||||
| Test peer-to-peer push/pull of tree only commits | Test peer-to-peer push/pull of tree only commits | ||||
| $ cd .. | $ cd .. | ||||
| $ clearcache | $ clearcache | ||||
| # TODO: Test tree only clone | $ hgcloneshallow ssh://user@dummy/master client2 -q --config treemanifest.treeonly=True --config extensions.treemanifest= | ||||
| $ hgcloneshallow ssh://user@dummy/master client2 -q | 2 trees fetched over * (glob) | ||||
| 1 trees fetched over * (glob) | |||||
| 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) | 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) | ||||
| $ cd client2 | $ cd client2 | ||||
| $ ls_l .hg/store | |||||
| -rw-r--r-- 277 00changelog.i | |||||
| drwxr-xr-x data | |||||
| -rw-r--r-- 0 undo | |||||
| -rw-r--r-- 2 undo.backupfiles | |||||
| -rw-r--r-- 0 undo.phaseroots | |||||
| $ rm -rf $CACHEDIR | |||||
| $ cp ../client/.hg/hgrc .hg/hgrc | $ cp ../client/.hg/hgrc .hg/hgrc | ||||
| # Test pulling from a treeonly peer | # Test pulling from a treeonly peer | ||||
| $ hg pull -r tip ssh://user@dummy/client --debug 2>&1 | egrep "(payload|treegroup)" | $ hg pull -r tip ssh://user@dummy/client --debug 2>&1 | egrep "(payload|treegroup)" | ||||
| bundle2-input-part: total payload size 823 | bundle2-input-part: total payload size 823 | ||||
| bundle2-input-part: total payload size 171 | bundle2-input-part: total payload size 171 | ||||
| bundle2-input-part: "b2x:treegroup2" (params: 3 mandatory) supported | bundle2-input-part: "b2x:treegroup2" (params: 3 mandatory) supported | ||||
| bundle2-input-part: total payload size 663 | bundle2-input-part: total payload size 663 | ||||