comparison mercurial/hgweb/webcommands.py @ 39102:08b2ae9fc030

merge with stable
author Augie Fackler <augie@google.com>
date Wed, 15 Aug 2018 17:06:12 -0400
parents e7aa113b14f7 5caee9f923ae
children 6268fed317d0
comparison
equal deleted inserted replaced
39101:18cbe2d872d3 39102:08b2ae9fc030
274 274
275 funcsused = revsetlang.funcsused(tree) 275 funcsused = revsetlang.funcsused(tree)
276 if not funcsused.issubset(revset.safesymbols): 276 if not funcsused.issubset(revset.safesymbols):
277 return MODE_KEYWORD, query 277 return MODE_KEYWORD, query
278 278
279 mfunc = revset.match(web.repo.ui, revdef,
280 lookup=revset.lookupfn(web.repo))
281 try: 279 try:
280 mfunc = revset.match(web.repo.ui, revdef,
281 lookup=revset.lookupfn(web.repo))
282 revs = mfunc(web.repo) 282 revs = mfunc(web.repo)
283 return MODE_REVSET, revs 283 return MODE_REVSET, revs
284 # ParseError: wrongly placed tokens, wrongs arguments, etc 284 # ParseError: wrongly placed tokens, wrongs arguments, etc
285 # RepoLookupError: no such revision, e.g. in 'revision:' 285 # RepoLookupError: no such revision, e.g. in 'revision:'
286 # Abort: bookmark/tag not exists 286 # Abort: bookmark/tag not exists