diff --git a/contrib/perf.py b/contrib/perf.py --- a/contrib/perf.py +++ b/contrib/perf.py @@ -744,7 +744,7 @@ # perf commands -@command(b'perf--walk', formatteropts) +@command(b'perf::walk|perfwalk', formatteropts) def perfwalk(ui, repo, *pats, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -759,7 +759,7 @@ fm.end() -@command(b'perf--annotate', formatteropts) +@command(b'perf::annotate|perfannotate', formatteropts) def perfannotate(ui, repo, f, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -769,7 +769,7 @@ @command( - b'perf--status', + b'perf::status|perfstatus', [ (b'u', b'unknown', False, b'ask status to look for unknown files'), (b'', b'dirstate', False, b'benchmark the internal dirstate call'), @@ -806,7 +806,7 @@ fm.end() -@command(b'perf--addremove', formatteropts) +@command(b'perf::addremove|perfaddremove', formatteropts) def perfaddremove(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -837,7 +837,7 @@ cl._nodepos = None -@command(b'perf--heads', formatteropts) +@command(b'perf::heads|perfheads', formatteropts) def perfheads(ui, repo, **opts): """benchmark the computation of a changelog heads""" opts = _byteskwargs(opts) @@ -855,7 +855,7 @@ @command( - b'perf--tags', + b'perf::tags|perftags', formatteropts + [ (b'', b'clear-revlogs', False, b'refresh changelog and manifest'), @@ -880,7 +880,7 @@ fm.end() -@command(b'perf--ancestors', formatteropts) +@command(b'perf::ancestors|perfancestors', formatteropts) def perfancestors(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -894,7 +894,7 @@ fm.end() -@command(b'perf--ancestorset', formatteropts) +@command(b'perf::ancestorset|perfancestorset', formatteropts) def perfancestorset(ui, repo, revset, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -910,7 +910,7 @@ fm.end() -@command(b'perf--discovery', formatteropts, b'PATH') +@command(b'perf::discovery|perfdiscovery', formatteropts, b'PATH') def perfdiscovery(ui, repo, path, **opts): """benchmark discovery between local repo and the peer at given path""" repos = [repo, None] @@ -928,7 +928,7 @@ @command( - b'perf--bookmarks', + b'perf::bookmarks|perfbookmarks', formatteropts + [ (b'', b'clear-revlogs', False, b'refresh changelog and manifest'), @@ -953,7 +953,7 @@ fm.end() -@command(b'perf--bundleread', formatteropts, b'BUNDLE') +@command(b'perf::bundleread|perfbundleread', formatteropts, b'BUNDLE') def perfbundleread(ui, repo, bundlepath, **opts): """Benchmark reading of bundle files. @@ -1080,7 +1080,7 @@ @command( - b'perf--changegroupchangelog', + b'perf::changegroupchangelog|perfchangegroupchangelog', formatteropts + [ (b'', b'cgversion', b'02', b'changegroup version'), @@ -1116,7 +1116,7 @@ fm.end() -@command(b'perf--dirs', formatteropts) +@command(b'perf::dirs|perfdirs', formatteropts) def perfdirs(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -1132,7 +1132,7 @@ @command( - b'perf--dirstate', + b'perf::dirstate|perfdirstate', [ ( b'', @@ -1195,7 +1195,7 @@ fm.end() -@command(b'perf--dirstatedirs', formatteropts) +@command(b'perf::dirstatedirs|perfdirstatedirs', formatteropts) def perfdirstatedirs(ui, repo, **opts): """benchmap a 'dirstate.hasdir' call from an empty `dirs` cache""" opts = _byteskwargs(opts) @@ -1212,7 +1212,7 @@ fm.end() -@command(b'perf--dirstatefoldmap', formatteropts) +@command(b'perf::dirstatefoldmap|perfdirstatefoldmap', formatteropts) def perfdirstatefoldmap(ui, repo, **opts): """benchmap a `dirstate._map.filefoldmap.get()` request @@ -1233,7 +1233,7 @@ fm.end() -@command(b'perf--dirfoldmap', formatteropts) +@command(b'perf::dirfoldmap|perfdirfoldmap', formatteropts) def perfdirfoldmap(ui, repo, **opts): """benchmap a `dirstate._map.dirfoldmap.get()` request @@ -1255,7 +1255,7 @@ fm.end() -@command(b'perf--dirstatewrite', formatteropts) +@command(b'perf::dirstatewrite|perfdirstatewrite', formatteropts) def perfdirstatewrite(ui, repo, **opts): """benchmap the time it take to write a dirstate on disk""" opts = _byteskwargs(opts) @@ -1297,7 +1297,7 @@ @command( - b'perf--mergecalculate', + b'perf::mergecalculate|perfmergecalculate', [ (b'r', b'rev', b'.', b'rev to merge against'), (b'', b'from', b'', b'rev to merge from'), @@ -1330,7 +1330,7 @@ @command( - b'perf--mergecopies', + b'perf::mergecopies|perfmergecopies', [ (b'r', b'rev', b'.', b'rev to merge against'), (b'', b'from', b'', b'rev to merge from'), @@ -1353,7 +1353,7 @@ fm.end() -@command(b'perf--pathcopies', [], b"REV REV") +@command(b'perf::pathcopies|perfpathcopies', [], b"REV REV") def perfpathcopies(ui, repo, rev1, rev2, **opts): """benchmark the copy tracing logic""" opts = _byteskwargs(opts) @@ -1369,7 +1369,7 @@ @command( - b'perf--phases', + b'perf::phases|perfphases', [ (b'', b'full', False, b'include file reading time too'), ], @@ -1394,7 +1394,7 @@ fm.end() -@command(b'perf--phasesremote', [], b"[DEST]") +@command(b'perf::phasesremote|perfphasesremote', [], b"[DEST]") def perfphasesremote(ui, repo, dest=None, **opts): """benchmark time needed to analyse phases of the remote server""" from mercurial.node import bin @@ -1455,7 +1455,7 @@ @command( - b'perf--manifest', + b'perf::manifest|perfmanifest', [ (b'm', b'manifest-rev', False, b'Look up a manifest node revision'), (b'', b'clear-disk', False, b'clear on-disk caches too'), @@ -1499,7 +1499,7 @@ fm.end() -@command(b'perf--changeset', formatteropts) +@command(b'perf::changeset|perfchangeset', formatteropts) def perfchangeset(ui, repo, rev, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -1513,7 +1513,7 @@ fm.end() -@command(b'perf--ignore', formatteropts) +@command(b'perf::ignore|perfignore', formatteropts) def perfignore(ui, repo, **opts): """benchmark operation related to computing ignore""" opts = _byteskwargs(opts) @@ -1532,7 +1532,7 @@ @command( - b'perf--index', + b'perf::index|perfindex', [ (b'', b'rev', [], b'revision to be looked up (default tip)'), (b'', b'no-lookup', None, b'do not revision lookup post creation'), @@ -1596,7 +1596,7 @@ @command( - b'perf--nodemap', + b'perf::nodemap|perfnodemap', [ (b'', b'rev', [], b'revision to be looked up (default tip)'), (b'', b'clear-caches', True, b'clear revlog cache between calls'), @@ -1667,7 +1667,7 @@ fm.end() -@command(b'perf--startup', formatteropts) +@command(b'perf::startup|perfstartup', formatteropts) def perfstartup(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -1685,7 +1685,7 @@ fm.end() -@command(b'perf--parents', formatteropts) +@command(b'perf::parents|perfparents', formatteropts) def perfparents(ui, repo, **opts): """benchmark the time necessary to fetch one changeset's parents. @@ -1712,7 +1712,7 @@ fm.end() -@command(b'perf--ctxfiles', formatteropts) +@command(b'perf::ctxfiles|perfctxfiles', formatteropts) def perfctxfiles(ui, repo, x, **opts): opts = _byteskwargs(opts) x = int(x) @@ -1725,7 +1725,7 @@ fm.end() -@command(b'perf--rawfiles', formatteropts) +@command(b'perf::rawfiles|perfrawfiles', formatteropts) def perfrawfiles(ui, repo, x, **opts): opts = _byteskwargs(opts) x = int(x) @@ -1739,7 +1739,7 @@ fm.end() -@command(b'perf--lookup', formatteropts) +@command(b'perf::lookup|perflookup', formatteropts) def perflookup(ui, repo, rev, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -1748,7 +1748,7 @@ @command( - b'perf--linelogedits', + b'perf::linelogedits|perflinelogedits', [ (b'n', b'edits', 10000, b'number of edits'), (b'', b'max-hunk-lines', 10, b'max lines in a hunk'), @@ -1786,7 +1786,7 @@ fm.end() -@command(b'perf--revrange', formatteropts) +@command(b'perf::revrange|perfrevrange', formatteropts) def perfrevrange(ui, repo, *specs, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -1795,7 +1795,7 @@ fm.end() -@command(b'perf--nodelookup', formatteropts) +@command(b'perf::nodelookup|perfnodelookup', formatteropts) def perfnodelookup(ui, repo, rev, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -1814,7 +1814,7 @@ @command( - b'perf--log', + b'perf::log|perflog', [(b'', b'rename', False, b'ask log to follow renames')] + formatteropts, ) def perflog(ui, repo, rev=None, **opts): @@ -1832,7 +1832,7 @@ fm.end() -@command(b'perf--moonwalk', formatteropts) +@command(b'perf::moonwalk|perfmoonwalk', formatteropts) def perfmoonwalk(ui, repo, **opts): """benchmark walking the changelog backwards @@ -1851,7 +1851,7 @@ @command( - b'perf--templating', + b'perf::templating|perftemplating', [ (b'r', b'rev', [], b'revisions to run the template on'), ] @@ -1941,7 +1941,7 @@ @command( - b'perf--helper-mergecopies', + b'perf::helper-mergecopies|perfhelper-mergecopies', formatteropts + [ (b'r', b'revs', [], b'restrict search to these revisions'), @@ -2124,7 +2124,7 @@ @command( - b'perf--helper-pathcopies', + b'perf::helper-pathcopies|perfhelper-pathcopies', formatteropts + [ (b'r', b'revs', [], b'restrict search to these revisions'), @@ -2263,7 +2263,7 @@ _displaystats(ui, opts, entries, alldata) -@command(b'perf--cca', formatteropts) +@command(b'perf::cca|perfcca', formatteropts) def perfcca(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -2271,7 +2271,7 @@ fm.end() -@command(b'perf--fncacheload', formatteropts) +@command(b'perf::fncacheload|perffncacheload', formatteropts) def perffncacheload(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -2284,7 +2284,7 @@ fm.end() -@command(b'perf--fncachewrite', formatteropts) +@command(b'perf::fncachewrite|perffncachewrite', formatteropts) def perffncachewrite(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -2304,7 +2304,7 @@ fm.end() -@command(b'perf--fncacheencode', formatteropts) +@command(b'perf::fncacheencode|perffncacheencode', formatteropts) def perffncacheencode(ui, repo, **opts): opts = _byteskwargs(opts) timer, fm = gettimer(ui, opts) @@ -2348,7 +2348,7 @@ @command( - b'perf--bdiff', + b'perf::bdiff|perfbdiff', revlogopts + formatteropts + [ @@ -2464,7 +2464,7 @@ @command( - b'perf--unidiff', + b'perf::unidiff|perfunidiff', revlogopts + formatteropts + [ @@ -2543,7 +2543,7 @@ fm.end() -@command(b'perf--diffwd', formatteropts) +@command(b'perf::diffwd|perfdiffwd', formatteropts) def perfdiffwd(ui, repo, **opts): """Profile diff of working directory changes""" opts = _byteskwargs(opts) @@ -2568,7 +2568,7 @@ fm.end() -@command(b'perf--revlogindex', revlogopts + formatteropts, b'-c|-m|FILE') +@command(b'perf::revlogindex|perfrevlogindex', revlogopts + formatteropts, b'-c|-m|FILE') def perfrevlogindex(ui, repo, file_=None, **opts): """Benchmark operations against a revlog index. @@ -2704,7 +2704,7 @@ @command( - b'perf--revlogrevisions', + b'perf::revlogrevisions|perfrevlogrevisions', revlogopts + formatteropts + [ @@ -2754,7 +2754,7 @@ @command( - b'perf--revlogwrite', + b'perf::revlogwrite|perfrevlogwrite', revlogopts + formatteropts + [ @@ -3047,7 +3047,7 @@ @command( - b'perf--revlogchunks', + b'perf::revlogchunks|perfrevlogchunks', revlogopts + formatteropts + [ @@ -3176,7 +3176,7 @@ @command( - b'perf--revlogrevision', + b'perf::revlogrevision|perfrevlogrevision', revlogopts + formatteropts + [(b'', b'cache', False, b'use caches instead of clearing')], @@ -3319,7 +3319,7 @@ @command( - b'perf--revset', + b'perf::revset|perfrevset', [ (b'C', b'clear', False, b'clear volatile cache between each call.'), (b'', b'contexts', False, b'obtain changectx for each revision'), @@ -3352,7 +3352,7 @@ @command( - b'perf--volatilesets', + b'perf::volatilesets|perfvolatilesets', [ (b'', b'clear-obsstore', False, b'drop obsstore between each call.'), ] @@ -3401,7 +3401,7 @@ @command( - b'perf--branchmap', + b'perf::branchmap|perfbranchmap', [ (b'f', b'full', False, b'Includes build time of subset'), ( @@ -3492,7 +3492,7 @@ @command( - b'perf--branchmapupdate', + b'perf::branchmapupdate|perfbranchmapupdate', [ (b'', b'base', [], b'subset of revision to start from'), (b'', b'target', [], b'subset of revision to end with'), @@ -3602,7 +3602,7 @@ @command( - b'perf--branchmapload', + b'perf::branchmapload|perfbranchmapload', [ (b'f', b'filter', b'', b'Specify repoview filter'), (b'', b'list', False, b'List brachmap filter caches'), @@ -3661,7 +3661,7 @@ fm.end() -@command(b'perf--loadmarkers') +@command(b'perf::loadmarkers|perfloadmarkers') def perfloadmarkers(ui, repo): """benchmark the time to parse the on-disk markers for a repo @@ -3673,7 +3673,7 @@ @command( - b'perf--lrucachedict', + b'perf::lrucachedict|perflrucachedict', formatteropts + [ (b'', b'costlimit', 0, b'maximum total cost of items in cache'), @@ -3829,7 +3829,7 @@ @command( - b'perf--write', + b'perf::write|perfwrite', formatteropts + [ (b'', b'write-method', b'write', b'ui write method'), @@ -3892,7 +3892,7 @@ @command( - b'perf--progress', + b'perf::progress|perfprogress', formatteropts + [ (b'', b'topic', b'topic', b'topic for progress messages'), diff --git a/tests/test-contrib-perf.t b/tests/test-contrib-perf.t --- a/tests/test-contrib-perf.t +++ b/tests/test-contrib-perf.t @@ -78,126 +78,126 @@ list of commands: - perf--addremove + perf::addremove (no help text available) - perf--ancestors + perf::ancestors (no help text available) - perf--ancestorset + perf::ancestorset (no help text available) - perf--annotate + perf::annotate (no help text available) - perf--bdiff benchmark a bdiff between revisions - perf--bookmarks + perf::bdiff benchmark a bdiff between revisions + perf::bookmarks benchmark parsing bookmarks from disk to memory - perf--branchmap + perf::branchmap benchmark the update of a branchmap - perf--branchmapload + perf::branchmapload benchmark reading the branchmap - perf--branchmapupdate + perf::branchmapupdate benchmark branchmap update from for revs to revs - perf--bundleread + perf::bundleread Benchmark reading of bundle files. - perf--cca (no help text available) - perf--changegroupchangelog + perf::cca (no help text available) + perf::changegroupchangelog Benchmark producing a changelog group for a changegroup. - perf--changeset + perf::changeset (no help text available) - perf--ctxfiles + perf::ctxfiles (no help text available) - perf--diffwd Profile diff of working directory changes - perf--dirfoldmap + perf::diffwd Profile diff of working directory changes + perf::dirfoldmap benchmap a 'dirstate._map.dirfoldmap.get()' request - perf--dirs (no help text available) - perf--dirstate + perf::dirs (no help text available) + perf::dirstate benchmap the time of various distate operations - perf--dirstatedirs + perf::dirstatedirs benchmap a 'dirstate.hasdir' call from an empty 'dirs' cache - perf--dirstatefoldmap + perf::dirstatefoldmap benchmap a 'dirstate._map.filefoldmap.get()' request - perf--dirstatewrite + perf::dirstatewrite benchmap the time it take to write a dirstate on disk - perf--discovery + perf::discovery benchmark discovery between local repo and the peer at given path - perf--fncacheencode + perf::fncacheencode (no help text available) - perf--fncacheload + perf::fncacheload (no help text available) - perf--fncachewrite + perf::fncachewrite (no help text available) - perf--heads benchmark the computation of a changelog heads - perf--helper-mergecopies + perf::heads benchmark the computation of a changelog heads + perf::helper-mergecopies find statistics about potential parameters for 'perfmergecopies' - perf--helper-pathcopies + perf::helper-pathcopies find statistic about potential parameters for the 'perftracecopies' - perf--ignore benchmark operation related to computing ignore - perf--index benchmark index creation time followed by a lookup - perf--linelogedits + perf::ignore benchmark operation related to computing ignore + perf::index benchmark index creation time followed by a lookup + perf::linelogedits (no help text available) - perf--loadmarkers + perf::loadmarkers benchmark the time to parse the on-disk markers for a repo - perf--log (no help text available) - perf--lookup (no help text available) - perf--lrucachedict + perf::log (no help text available) + perf::lookup (no help text available) + perf::lrucachedict (no help text available) - perf--manifest + perf::manifest benchmark the time to read a manifest from disk and return a usable - perf--mergecalculate + perf::mergecalculate (no help text available) - perf--mergecopies + perf::mergecopies measure runtime of 'copies.mergecopies' - perf--moonwalk + perf::moonwalk benchmark walking the changelog backwards - perf--nodelookup + perf::nodelookup (no help text available) - perf--nodemap + perf::nodemap benchmark the time necessary to look up revision from a cold nodemap - perf--parents + perf::parents benchmark the time necessary to fetch one changeset's parents. - perf--pathcopies + perf::pathcopies benchmark the copy tracing logic - perf--phases benchmark phasesets computation - perf--phasesremote + perf::phases benchmark phasesets computation + perf::phasesremote benchmark time needed to analyse phases of the remote server - perf--progress + perf::progress printing of progress bars - perf--rawfiles + perf::rawfiles (no help text available) - perf--revlogchunks + perf::revlogchunks Benchmark operations on revlog chunks. - perf--revlogindex + perf::revlogindex Benchmark operations against a revlog index. - perf--revlogrevision + perf::revlogrevision Benchmark obtaining a revlog revision. - perf--revlogrevisions + perf::revlogrevisions Benchmark reading a series of revisions from a revlog. - perf--revlogwrite + perf::revlogwrite Benchmark writing a series of revisions to a revlog. - perf--revrange + perf::revrange (no help text available) - perf--revset benchmark the execution time of a revset - perf--startup + perf::revset benchmark the execution time of a revset + perf::startup (no help text available) - perf--status benchmark the performance of a single status call - perf--tags (no help text available) - perf--templating + perf::status benchmark the performance of a single status call + perf::tags (no help text available) + perf::templating test the rendering time of a given template - perf--unidiff + perf::unidiff benchmark a unified diff between revisions - perf--volatilesets + perf::volatilesets benchmark the computation of various volatile set - perf--walk (no help text available) - perf--write microbenchmark ui.write (and others) + perf::walk (no help text available) + perf::write microbenchmark ui.write (and others) (use 'hg help -v perf' to show built-in aliases and global options) $ hg help perfaddremove - hg perf--addremove + hg perf::addremove aliases: perfaddremove