Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/webcommands.py @ 19396:afc23eddc324
hgweb: show current search query in the input field
author | Alexander Plavin <me@aplavin.ru> |
---|---|
date | Thu, 11 Jul 2013 17:01:54 +0400 |
parents | 7d2a7f8e9da4 |
children | 55b9d98a1ef4 |
comparison
equal
deleted
inserted
replaced
19395:19622224559b | 19396:afc23eddc324 |
---|---|
183 entries=changelist, archives=web.archivelist("tip"), | 183 entries=changelist, archives=web.archivelist("tip"), |
184 morevars=morevars, lessvars=lessvars) | 184 morevars=morevars, lessvars=lessvars) |
185 | 185 |
186 def changelog(web, req, tmpl, shortlog=False): | 186 def changelog(web, req, tmpl, shortlog=False): |
187 | 187 |
188 query = '' | |
188 if 'node' in req.form: | 189 if 'node' in req.form: |
189 ctx = webutil.changectx(web.repo, req) | 190 ctx = webutil.changectx(web.repo, req) |
190 else: | 191 else: |
191 if 'rev' in req.form: | 192 if 'rev' in req.form: |
192 hi = req.form['rev'][0] | 193 query = req.form['rev'][0] |
194 hi = query | |
193 else: | 195 else: |
194 hi = 'tip' | 196 hi = 'tip' |
195 try: | 197 try: |
196 ctx = web.repo[hi] | 198 ctx = web.repo[hi] |
197 except error.RepoError: | 199 except error.RepoError: |
254 return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav, | 256 return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav, |
255 node=ctx.hex(), rev=pos, changesets=count, | 257 node=ctx.hex(), rev=pos, changesets=count, |
256 entries=lambda **x: changelist(latestonly=False, **x), | 258 entries=lambda **x: changelist(latestonly=False, **x), |
257 latestentry=lambda **x: changelist(latestonly=True, **x), | 259 latestentry=lambda **x: changelist(latestonly=True, **x), |
258 archives=web.archivelist("tip"), revcount=revcount, | 260 archives=web.archivelist("tip"), revcount=revcount, |
259 morevars=morevars, lessvars=lessvars) | 261 morevars=morevars, lessvars=lessvars, query=query) |
260 | 262 |
261 def shortlog(web, req, tmpl): | 263 def shortlog(web, req, tmpl): |
262 return changelog(web, req, tmpl, shortlog = True) | 264 return changelog(web, req, tmpl, shortlog = True) |
263 | 265 |
264 def changeset(web, req, tmpl): | 266 def changeset(web, req, tmpl): |