This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3995

fastannotate: write out files from server in a predictable order
ClosedPublic

Authored by durin42 on Aug 1 2018, 11:17 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc8a40b33ce30: fastannotate: write out files from server in a predictable order
Summary

This is mostly for test output stabilization, but it *might* be
slightly better with a ton of annotate caches because we'll write to
one directory at a time rather than bouncing around randomly.

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

durin42 created this revision.Aug 1 2018, 11:17 AM
indygreg accepted this revision.Aug 7 2018, 7:19 PM
This revision is now accepted and ready to land.Aug 7 2018, 7:19 PM
Closed by commit rHGc8a40b33ce30: fastannotate: write out files from server in a predictable order (authored by durin42). · Explain WhyAug 20 2018, 3:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10472

hgext/fastannotate/protocol.py

ui.debug('fastannotate: requesting %d files\n' % len(paths)) ui.debug('fastannotate: requesting %d files\n' % len(paths))
for p in paths: for p in paths:
results.append(batcher.callcommand( results.append(batcher.callcommand(
'getannotate', 'getannotate',
{'path': p, 'lastnode':lastnodemap.get(p)})) {'path': p, 'lastnode':lastnodemap.get(p)}))
ui.debug('fastannotate: server returned\n') ui.debug('fastannotate: server returned\n')
for result in results: for result in results:
for path, content in result.result().iteritems(): r = result.result()
for path in sorted(r):
# ignore malicious paths # ignore malicious paths
if not path.startswith('fastannotate/') or '/../' in (path + '/'): if not path.startswith('fastannotate/') or '/../' in (path + '/'):
ui.debug('fastannotate: ignored malicious path %s\n' % path) ui.debug('fastannotate: ignored malicious path %s\n' % path)
continue continue
content = r[path]
if ui.debugflag: if ui.debugflag:
ui.debug('fastannotate: writing %d bytes to %s\n' ui.debug('fastannotate: writing %d bytes to %s\n'
% (len(content), path)) % (len(content), path))
repo.vfs.makedirs(os.path.dirname(path)) repo.vfs.makedirs(os.path.dirname(path))
with repo.vfs(path, 'wb') as f: with repo.vfs(path, 'wb') as f:
f.write(content) f.write(content)
def _filterfetchpaths(repo, paths): def _filterfetchpaths(repo, paths):

tests/test-fastannotate-protocol.t

sending hello command sending hello command
sending between command sending between command
remote: * (glob) (?) remote: * (glob) (?)
remote: capabilities: * (glob) remote: capabilities: * (glob)
remote: * (glob) (?) remote: * (glob) (?)
sending protocaps command sending protocaps command
fastannotate: requesting 1 files fastannotate: requesting 1 files
sending getannotate command sending getannotate command
fastannotate: writing 112 bytes to fastannotate/default/a.l (?)
fastannotate: server returned fastannotate: server returned
fastannotate: writing 112 bytes to fastannotate/default/a.l (?) fastannotate: writing 112 bytes to fastannotate/default/a.l
fastannotate: writing 94 bytes to fastannotate/default/a.m fastannotate: writing 94 bytes to fastannotate/default/a.m
fastannotate: a: using fast path (resolved fctx: True) fastannotate: a: using fast path (resolved fctx: True)
0: 1 0: 1
1: 2 1: 2
2: 3 2: 3
3: 4 3: 4
the cache could be reused and no download is necessary the cache could be reused and no download is necessary