This is an archive of the discontinued Mercurial Phabricator instance.

Differential D456

revset: provide a way to check ordering support
AbandonedPublic

Authored by quark on Aug 20 2017, 3:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Ordering support issues could be tricky to discover since they may be hidden
behind other side effects.

This patch implements debugrevspec --check-ordering so it can be used to
test ordering support of revset implementations. Handy for extension
developers.

A test was added showing that command is able to detect a lot of ordering
issues in core hg.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 1117

mercurial/debugcommands.py

[('', 'optimize', None, [('', 'optimize', None,
_('print parsed tree after optimizing (DEPRECATED)')), _('print parsed tree after optimizing (DEPRECATED)')),
('', 'show-revs', True, _('print list of result revisions (default)')), ('', 'show-revs', True, _('print list of result revisions (default)')),
('s', 'show-set', None, _('print internal representation of result set')), ('s', 'show-set', None, _('print internal representation of result set')),
('p', 'show-stage', [], ('p', 'show-stage', [],
_('print parsed tree at the given stage'), _('NAME')), _('print parsed tree at the given stage'), _('NAME')),
('', 'no-optimized', False, _('evaluate tree without optimization')), ('', 'no-optimized', False, _('evaluate tree without optimization')),
('', 'verify-optimized', False, _('verify optimized result')), ('', 'verify-optimized', False, _('verify optimized result')),
('', 'check-ordering', False, _('try to detect ordering issues')),
], ],
('REVSPEC')) ('REVSPEC'))
def debugrevspec(ui, repo, expr, **opts): def debugrevspec(ui, repo, expr, **opts):
"""parse and apply a revision specification """parse and apply a revision specification
Use -p/--show-stage option to print the parsed tree at the given stages. Use -p/--show-stage option to print the parsed tree at the given stages.
Use -p all to print tree at every stage. Use -p all to print tree at every stage.
for n, f in stages: for n, f in stages:
treebystage[n] = tree = f(tree) treebystage[n] = tree = f(tree)
if n in showalways or (n in showchanged and tree != printedtree): if n in showalways or (n in showchanged and tree != printedtree):
if opts['show_stage'] or n != 'parsed': if opts['show_stage'] or n != 'parsed':
ui.write(("* %s:\n") % n) ui.write(("* %s:\n") % n)
ui.write(revsetlang.prettyformat(tree), "\n") ui.write(revsetlang.prettyformat(tree), "\n")
printedtree = tree printedtree = tree
if opts['check_ordering']:
problematic = []
for name in ('defineorder', 'followorder'):
m = revset.makematcher(tree, order=getattr(revset, name))
s = smartset.fullreposet(repo)
revs1 = list(m(repo, s))
s.reverse()
revs2 = list(m(repo, s))
if len(revs1) <= 1:
ui.write(('ordering: cannot detect issues if len(revs) <= 1\n'))
break
if ((revs1 == revs2 and name == 'followorder') or
(revs1 != revs2 and name == 'defineorder')):
problematic.append(name)
if problematic:
ui.write(('ordering: %s not respected\n')
% (' and '.join(problematic)))
return 1
if opts['verify_optimized']: if opts['verify_optimized']:
arevs = revset.makematcher(treebystage['analyzed'])(repo) arevs = revset.makematcher(treebystage['analyzed'])(repo)
brevs = revset.makematcher(treebystage['optimized'])(repo) brevs = revset.makematcher(treebystage['optimized'])(repo)
if opts['show_set'] or (opts['show_set'] is None and ui.verbose): if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
ui.write(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n") ui.write(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n")
ui.write(("* optimized set:\n"), smartset.prettyformat(brevs), "\n") ui.write(("* optimized set:\n"), smartset.prettyformat(brevs), "\n")
arevs = list(arevs) arevs = list(arevs)
brevs = list(brevs) brevs = list(brevs)

tests/test-completion.t

debugpathcomplete: full, normal, added, removed debugpathcomplete: full, normal, added, removed
debugpickmergetool: rev, changedelete, include, exclude, tool debugpickmergetool: rev, changedelete, include, exclude, tool
debugpushkey: debugpushkey:
debugpvec: debugpvec:
debugrebuilddirstate: rev, minimal debugrebuilddirstate: rev, minimal
debugrebuildfncache: debugrebuildfncache:
debugrename: rev debugrename: rev
debugrevlog: changelog, manifest, dir, dump debugrevlog: changelog, manifest, dir, dump
debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized, check-ordering
debugsetparents: debugsetparents:
debugssl: debugssl:
debugsub: rev debugsub: rev
debugsuccessorssets: closest debugsuccessorssets: closest
debugtemplate: rev, define debugtemplate: rev, define
debugupdatecaches: debugupdatecaches:
debugupgraderepo: optimize, run debugupgraderepo: optimize, run
debugwalk: include, exclude debugwalk: include, exclude

tests/test-revset-ordering.t

  • This file was added.
Check if revset predicates respect order as told
$ check() {
> hg debugrevspec --no-show-revs --check-ordering "$@"; :
> }
$ cat >> $HGRCPATH <<EOF
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> EOF
$ hg init repo1
$ hg clone repo1 repo2 -q
$ cd repo2
$ hg debugdrawdag <<'EOS'
> C E # B/A = A1
> |/| # C/A = A2
> B D # D/A = A3
> |/| # E/A = A4
> A Z X Y
> EOS
$ for i in A B D; do
> hg bookmark -ir $i book-$i
> done
$ hg phase -r B --public -q
$ hg phase -r E+C --secret -f -q
$ hg update A -q
$ hg graft X -q
$ hg update B -q
$ hg graft Y -q
$ hg rm *
$ hg commit -m REMOVEALL1
$ hg update C -q
$ hg rm *
$ hg commit -m REMOVEALL2
$ hg commit -m CLOSE1 --close-branch
$ hg update E -q
$ hg commit -m CLOSE2 --close-branch
$ hg bisect --good A -q
$ hg bisect --bad E -q >/dev/null
$ check '3+1+2'
$ check '(3+1+2)-1'
$ check '(3+1+2) & (1+3+4)'
$ check 'A::E'
$ check 'E:A'
$ check 'E % C'
$ check 'not E'
ordering: defineorder not respected
$ check 'adds("*")'
ordering: defineorder not respected
$ check 'all()'
$ check 'ancestors(E)'
$ check 'author(test)'
ordering: defineorder not respected
$ check 'bisect(untested)'
$ check 'bookmark()'
$ check 'branch(default)'
ordering: defineorder not respected
$ check 'branchpoint()'
ordering: defineorder not respected
$ check 'children(A)'
$ check 'closed()'
ordering: defineorder not respected
$ check 'contains(A)'
ordering: defineorder not respected
$ check 'date("0 0")'
ordering: defineorder not respected
$ check 'desc("")'
ordering: defineorder not respected
$ check 'descendants(A)'
$ check 'destination()'
ordering: defineorder not respected
$ check 'draft()'
$ check 'file("*")'
ordering: defineorder not respected
$ check 'filelog("A")'
$ check 'follow()'
$ check 'grep("A")'
ordering: defineorder not respected
$ check 'head()'
$ check 'heads(E+C)'
ordering: followorder not respected
$ check 'merge()'
ordering: defineorder not respected
$ check 'modifies("A")'
ordering: defineorder not respected
$ check 'named("tags")'
$ check 'origin()'
$ check 'outgoing()'
$ check 'p1(B+E+D)'
$ check 'p2(B+E+D)'
$ check 'parents(E)'
$ check 'public()'
ordering: defineorder not respected
$ check 'reverse(B+E+D)'
$ check 'removes("A")'
ordering: defineorder not respected
$ check 'roots(B+E+D)'
$ check 'secret()'
$ check 'sort(all())'
$ check 'tagged()'