--- a/tests/printrevset.py Sat Sep 12 16:19:01 2020 +0900
+++ b/tests/printrevset.py Sat Sep 12 21:06:16 2020 +0900
@@ -1,4 +1,5 @@
from __future__ import absolute_import
+from mercurial.thirdparty import attr
from mercurial import (
cmdutil,
commands,
@@ -11,26 +12,27 @@
from mercurial.utils import stringutil
-def logrevset(repo, pats, opts):
- revs = logcmdutil._initialrevs(repo, opts)
+def logrevset(repo, wopts):
+ revs = logcmdutil._initialrevs(repo, wopts)
if not revs:
return None
- match, pats, slowpath = logcmdutil._makematcher(repo, revs, pats, opts)
- return logcmdutil._makerevset(repo, pats, slowpath, opts)
+ match, pats, slowpath = logcmdutil._makematcher(repo, revs, wopts)
+ wopts = attr.evolve(wopts, pats=pats)
+ return logcmdutil._makerevset(repo, wopts, slowpath)
def uisetup(ui):
- def printrevset(orig, repo, pats, opts):
- revs, filematcher = orig(repo, pats, opts)
- if opts.get(b'print_revset'):
- expr = logrevset(repo, pats, opts)
+ def printrevset(orig, repo, wopts):
+ revs, filematcher = orig(repo, wopts)
+ if wopts.opts.get(b'print_revset'):
+ expr = logrevset(repo, wopts)
if expr:
tree = revsetlang.parse(expr)
tree = revsetlang.analyze(tree)
else:
tree = []
ui = repo.ui
- ui.write(b'%s\n' % stringutil.pprint(opts.get(b'rev', [])))
+ ui.write(b'%s\n' % stringutil.pprint(wopts.opts.get(b'rev', [])))
ui.write(revsetlang.prettyformat(tree) + b'\n')
ui.write(stringutil.prettyrepr(revs) + b'\n')
revs = smartset.baseset() # display no revisions