mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
Keep session variables when linking from hgwebdir's index to repositories.
This commit is contained in:
parent
2b666e3a4f
commit
10593de67b
@ -90,6 +90,18 @@ class hgwebdir(object):
|
||||
"node": nodeid, "url": url}
|
||||
|
||||
def entries(sortcolumn="", descending=False, **map):
|
||||
def sessionvars(**map):
|
||||
fields = []
|
||||
if req.form.has_key('style'):
|
||||
style = req.form['style'][0]
|
||||
if style != get('web', 'style', ''):
|
||||
fields.append(('style', style))
|
||||
|
||||
separator = url[-1] == '?' and ';' or '?'
|
||||
for name, value in fields:
|
||||
yield dict(name=name, value=value, separator=separator)
|
||||
separator = ';'
|
||||
|
||||
rows = []
|
||||
parity = 0
|
||||
for name, path in self.repos:
|
||||
@ -123,6 +135,7 @@ class hgwebdir(object):
|
||||
description_sort=description.upper() or "unknown",
|
||||
lastchange=d,
|
||||
lastchange_sort=d[1]-d[0],
|
||||
sessionvars=sessionvars,
|
||||
archives=archivelist(u, "tip", url))
|
||||
if (not sortcolumn
|
||||
or (sortcolumn, descending) == self.repos_sorted):
|
||||
|
@ -49,7 +49,7 @@ shortlog = shortlog.tmpl
|
||||
shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
|
||||
filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <!-- FIXME: <a href="{url}diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | --> <a href="{url}annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> #rename%filelogrename#</td></tr>'
|
||||
archiveentry = ' | <a href="{url}archive/{node|short}{extension}">#type|escape#</a> '
|
||||
indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a class="rss_logo" href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
|
||||
indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#{sessionvars%urlparameter}"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a class="rss_logo" href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
|
||||
index = index.tmpl
|
||||
urlparameter = '#separator##name#=#value|urlescape#'
|
||||
hiddenformentry = '<input type="hidden" name="#name#" value="#value|escape#" />'
|
||||
|
@ -46,7 +46,7 @@ filediffparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a
|
||||
filelogparent = '<tr><th>parent #rev#:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
|
||||
filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
|
||||
filelogchild = '<tr><th>child #rev#:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
|
||||
indexentry = '<tr class="parity#parity#"><td><a href="#url#">#name|escape#</a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
|
||||
indexentry = '<tr class="parity#parity#"><td><a href="#url#{sessionvars%urlparameter}">#name|escape#</a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
|
||||
index = index.tmpl
|
||||
archiveentry = '<a href="#url#archive/#node|short##extension|urlescape#">#type|escape#</a> '
|
||||
notfound = notfound.tmpl
|
||||
|
Loading…
Reference in New Issue
Block a user