Show More
@@ -36,6 +36,7 b' from .. import (' | |||||
36 | scmutil, |
|
36 | scmutil, | |
37 | smartset, |
|
37 | smartset, | |
38 | templater, |
|
38 | templater, | |
|
39 | templateutil, | |||
39 | ) |
|
40 | ) | |
40 |
|
41 | |||
41 | from ..utils import ( |
|
42 | from ..utils import ( | |
@@ -287,7 +288,7 b' def _search(web):' | |||||
287 | LookupError): |
|
288 | LookupError): | |
288 | return MODE_KEYWORD, query |
|
289 | return MODE_KEYWORD, query | |
289 |
|
290 | |||
290 |
def changelist( |
|
291 | def changelist(context): | |
291 | count = 0 |
|
292 | count = 0 | |
292 |
|
293 | |||
293 | for ctx in searchfunc[0](funcarg): |
|
294 | for ctx in searchfunc[0](funcarg): | |
@@ -303,7 +304,7 b' def _search(web):' | |||||
303 | 'changelogtag': showtags, |
|
304 | 'changelogtag': showtags, | |
304 | 'files': files, |
|
305 | 'files': files, | |
305 | }) |
|
306 | }) | |
306 | yield web.tmpl.generate('searchentry', lm) |
|
307 | yield lm | |
307 |
|
308 | |||
308 | if count >= revcount: |
|
309 | if count >= revcount: | |
309 | break |
|
310 | break | |
@@ -349,7 +350,7 b' def _search(web):' | |||||
349 | query=query, |
|
350 | query=query, | |
350 | node=tip.hex(), |
|
351 | node=tip.hex(), | |
351 | symrev='tip', |
|
352 | symrev='tip', | |
352 | entries=changelist, |
|
353 | entries=templateutil.mappinggenerator(changelist, name='searchentry'), | |
353 | archives=web.archivelist('tip'), |
|
354 | archives=web.archivelist('tip'), | |
354 | morevars=morevars, |
|
355 | morevars=morevars, | |
355 | lessvars=lessvars, |
|
356 | lessvars=lessvars, |
@@ -57,7 +57,6 b" filenav = '{before%filenaventry}{after%f" | |||||
57 |
|
57 | |||
58 | fileellipses = '...' |
|
58 | fileellipses = '...' | |
59 | changelogentry = changelogentry.tmpl |
|
59 | changelogentry = changelogentry.tmpl | |
60 | searchentry = changelogentry.tmpl |
|
|||
61 | changeset = changeset.tmpl |
|
60 | changeset = changeset.tmpl | |
62 | manifest = manifest.tmpl |
|
61 | manifest = manifest.tmpl | |
63 | direntry = ' |
|
62 | direntry = ' |
@@ -30,6 +30,6 b'' | |||||
30 |
|
30 | |||
31 | <div class="title">searching for {query|escape}</div> |
|
31 | <div class="title">searching for {query|escape}</div> | |
32 |
|
32 | |||
33 | {entries} |
|
33 | {entries%changelogentry} | |
34 |
|
34 | |||
35 | {footer} |
|
35 | {footer} |
@@ -18,9 +18,8 b" lineentry = '\\{" | |||||
18 | search = '\{ |
|
18 | search = '\{ | |
19 | "node": {node|json}, |
|
19 | "node": {node|json}, | |
20 | "query": {query|json}, |
|
20 | "query": {query|json}, | |
21 |
"entries": [{join(entries% |
|
21 | "entries": [{join(entries%changelistentry, ", ")}] | |
22 | }' |
|
22 | }' | |
23 | searchentry = '{changelistentry}' |
|
|||
24 | # changelog and shortlog are the same web API but with different |
|
23 | # changelog and shortlog are the same web API but with different | |
25 | # number of entries. |
|
24 | # number of entries. | |
26 | changelog = changelist.tmpl |
|
25 | changelog = changelist.tmpl |
@@ -57,7 +57,6 b" filenav = '{before%filenaventry}{after%f" | |||||
57 |
|
57 | |||
58 | fileellipses = '...' |
|
58 | fileellipses = '...' | |
59 | changelogentry = changelogentry.tmpl |
|
59 | changelogentry = changelogentry.tmpl | |
60 | searchentry = changelogentry.tmpl |
|
|||
61 | changeset = changeset.tmpl |
|
60 | changeset = changeset.tmpl | |
62 | manifest = manifest.tmpl |
|
61 | manifest = manifest.tmpl | |
63 | direntry = ' |
|
62 | direntry = ' |
@@ -26,6 +26,6 b'' | |||||
26 | </div> |
|
26 | </div> | |
27 |
|
27 | |||
28 | <h2 class="no-link no-border">searching for {query|escape}</h2> |
|
28 | <h2 class="no-link no-border">searching for {query|escape}</h2> | |
29 | {entries} |
|
29 | {entries%changelogentry} | |
30 |
|
30 | |||
31 | {footer} |
|
31 | {footer} |
@@ -33,7 +33,6 b" fileellipses = '...'" | |||||
33 | diffstatlink = diffstat.tmpl |
|
33 | diffstatlink = diffstat.tmpl | |
34 | diffstatnolink = diffstat.tmpl |
|
34 | diffstatnolink = diffstat.tmpl | |
35 | changelogentry = shortlogentry.tmpl |
|
35 | changelogentry = shortlogentry.tmpl | |
36 | searchentry = shortlogentry.tmpl |
|
|||
37 | changeset = changeset.tmpl |
|
36 | changeset = changeset.tmpl | |
38 | manifest = manifest.tmpl |
|
37 | manifest = manifest.tmpl | |
39 |
|
38 |
@@ -49,7 +49,7 b" Use {showunforcekw}</a> instead.')}" | |||||
49 | </tr> |
|
49 | </tr> | |
50 | </thead> |
|
50 | </thead> | |
51 | <tbody class="stripes2"> |
|
51 | <tbody class="stripes2"> | |
52 | {entries} |
|
52 | {entries%changelogentry} | |
53 | </tbody> |
|
53 | </tbody> | |
54 | </table> |
|
54 | </table> | |
55 |
|
55 |
@@ -3,7 +3,6 b' shortlog = "\'raw\' is not a browsable sty' | |||||
3 | changelog = changelog.tmpl |
|
3 | changelog = changelog.tmpl | |
4 | changelogentry = logentry.tmpl |
|
4 | changelogentry = logentry.tmpl | |
5 | search = search.tmpl |
|
5 | search = search.tmpl | |
6 | searchentry = logentry.tmpl |
|
|||
7 | mimetype = 'text/plain; charset={encoding}' |
|
6 | mimetype = 'text/plain; charset={encoding}' | |
8 | header = '' |
|
7 | header = '' | |
9 | footer = '' |
|
8 | footer = '' |
@@ -17,7 +17,6 b' filenodelink = \'<a href="{url|urlescape}' | |||||
17 | filenolink = '{file|escape} ' |
|
17 | filenolink = '{file|escape} ' | |
18 | fileellipses = '...' |
|
18 | fileellipses = '...' | |
19 | changelogentry = changelogentry.tmpl |
|
19 | changelogentry = changelogentry.tmpl | |
20 | searchentry = changelogentry.tmpl |
|
|||
21 | changeset = changeset.tmpl |
|
20 | changeset = changeset.tmpl | |
22 | manifest = manifest.tmpl |
|
21 | manifest = manifest.tmpl | |
23 |
|
22 |
General Comments 0
You need to be logged in to leave comments.
Login now