# HG changeset patch # User Alexander Plavin # Date 1377175330 -14400 # Node ID 299511aabf8578065b3d97be4eb636e15d746738 # Parent cf9e5e45c1d3ad3f665182cb7576a7a515842f38 hgweb: pass arguments which a function depends on explicitly in search This changes makes clearer which arguments can a function depend on. Now all the modified functions depend on the 'query' argument only, but future additions will change it. diff -r cf9e5e45c1d3 -r 299511aabf85 mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Thu Aug 22 16:45:23 2013 +0400 +++ b/mercurial/hgweb/webcommands.py Thu Aug 22 16:42:10 2013 +0400 @@ -110,7 +110,7 @@ def _search(web, req, tmpl): - def keywordsearch(): + def keywordsearch(query): lower = encoding.lower qw = lower(query).split() @@ -142,13 +142,13 @@ 'keyword': keywordsearch, } - def getsearchmode(): - return 'keyword' + def getsearchmode(query): + return 'keyword', query def changelist(**map): count = 0 - for ctx in searchfunc(): + for ctx in searchfunc(funcarg): count += 1 n = ctx.node() showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n) @@ -188,7 +188,7 @@ morevars['revcount'] = revcount * 2 morevars['rev'] = query - mode = getsearchmode() + mode, funcarg = getsearchmode(query) searchfunc = searchfuncs[mode] tip = web.repo['tip']