##// END OF EJS Templates
patch: handle filenames with trailing spaces...
patch: handle filenames with trailing spaces I have no idea if this is *actually* supported by the patch file format, but at least when reading from a patch file created by running `hg shelve`, it is written out such that there's a trailing space after the second (`b`) filename. When we read the patch file, we remove the space before parsing the filenames, so it doesn't end up matching the other sources of what files are in the shelve. We observed this internally due to a wrapper around unshelve that called into patch.changedfiles, but `hg patch` is able to reproduce the issue as well, so I've included both tests. Differential Revision: https://phab.mercurial-scm.org/D9729

File last commit:

r38201:c2e3bc99 default
r46863:416ecdaa default
Show More
map
292 lines | 11.6 KiB | text/plain | TextLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 default = 'shortlog'
mimetype = 'text/html; charset={encoding}'
header = header.tmpl
footer = footer.tmpl
search = search.tmpl
changelog = shortlog.tmpl
shortlog = shortlog.tmpl
shortlogentry = shortlogentry.tmpl
graph = graph.tmpl
av6
paper: render changesets server-side on /graph page
r35219 graphentry = graphentry.tmpl
Augie Fackler
web: add a help view for getting hg help output
r12666 help = help.tmpl
helptopics = helptopics.tmpl
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745 helpentry = '
<tr><td>
<a href="{url|urlescape}help/{topic|escape}{sessionvars%urlparameter}">
Gregory Szorc
templates: differentiate between partial and full topic name...
r27579 {if(basename, '{basename|escape}', '{topic|escape}')}
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745 </a>
</td><td>
{summary|escape}
</td></tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
filenodelink = '<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filenolink = '{file|escape} '
fileellipses = '...'
Steven Brown
paper, coal: define the diffstat templates...
r14563 diffstatlink = diffstat.tmpl
diffstatnolink = diffstat.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changelogentry = shortlogentry.tmpl
changeset = changeset.tmpl
manifest = manifest.tmpl
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 nav = '{before%naventry} {after%naventry}'
navshort = '{before%navshortentry}{after%navshortentry}'
navgraph = '{before%navgraphentry}{after%navgraphentry}'
filenav = '{before%filenaventry}{after%filenaventry}'
av6
paper: don't show '[up]' in file view when in root directory already
r38201 updirentry = '
<tr class="fileline">
<td class="name">
<a href="{url|urlescape}file/{symrev}{up|urlescape}{sessionvars%urlparameter}">[up]</a>
</td>
<td class="size"></td>
<td class="permissions">drwxr-xr-x</td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 direntry = '
Alexander Plavin
hgweb: make stripes in directory view with CSS
r19447 <tr class="fileline">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="name">
av6
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...
r25606 <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <img src="{staticurl|urlescape}coal-folder.png" alt="dir."/> {basename|escape}/
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </a>
av6
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...
r25606 <a href="{url|urlescape}file/{symrev}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {emptydirs|escape}
</a>
</td>
<td class="size"></td>
<td class="permissions">drwxr-xr-x</td>
</tr>'
fileentry = '
Alexander Plavin
hgweb: make stripes in directory view with CSS
r19447 <tr class="fileline">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="filename">
av6
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...
r25606 <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <img src="{staticurl|urlescape}coal-file.png" alt="file"/> {basename|escape}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </a>
</td>
<td class="size">{size}</td>
<td class="permissions">{permissions|permissions}</td>
</tr>'
filerevision = filerevision.tmpl
fileannotate = fileannotate.tmpl
filediff = filediff.tmpl
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 filecomparison = filecomparison.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filelog = filelog.tmpl
fileline = '
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 <span id="{lineid}">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filelogentry = filelogentry.tmpl
annotateline = '
Denis Laxalde
hgweb: highlight data of the current revision in annotate view...
r29387 <tr id="{lineid}"{ifeq(node, originalnode, ' class="thisrev"')}>
av6
paper: make different blocks of annotated lines have different colors
r29572 <td class="annotate parity{blockparity}">
Denis Laxalde
hgweb: display blamed revision once per block in annotate view...
r29388 {if(blockhead,
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
Denis Laxalde
hgweb: move author information from left-column to hover-box in annotate view...
r29524 {rev}
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 </a>')}
<div class="annotate-info">
Denis Laxalde
hgweb: add a link on node id in annotate hover-box...
r29525 <div>
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
{node|short}</a>
{desc|escape|firstline}
</div>
Denis Laxalde
hgweb: move author information from left-column to hover-box in annotate view...
r29524 <div><em>{author|obfuscate}</em></div>
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 <div>parents: {parents%annotateparent}</div>
Denis Laxalde
hgweb: add links to diff and changeset in hover-box on annotate view
r29523 <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 </div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 <td class="source followlines-btn-parent"><a href="#{lineid}">{linenumber}</a> {line|escape}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>'
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 annotateparent = '
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>'
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 diffblock = '<div class="bottomline inc-lineno"><pre class="sourcelines wrap">{lines}</pre></div>'
difflineplus = '
<span id="{lineid}" class="plusline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>'
difflineminus = '
<span id="{lineid}" class="minusline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>'
difflineat = '
<span id="{lineid}" class="atline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>'
diffline = '
<span id="{lineid}">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 comparisonblock ='
<tbody class="block">
{lines}
</tbody>'
comparisonline = '
Alexander Plavin
hgweb: highlight line which is linked to at comparison view
r19459 <tr id="{lineid}">
<td class="source {type}"><a href="#{lineid}">{leftlinenumber}</a> {leftline|escape}</td>
<td class="source {type}"><a href="#{lineid}">{rightlinenumber}</a> {rightline|escape}</td>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 </tr>'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 changesetparent = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
Anton Shestakov
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...
r23740 changesetparentdiff = '
{changesetparent}
{ifeq(node, basenode, '(current diff)', '({difffrom})')}'
difffrom = '<a href="{url|urlescape}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">diff</a>'
Weiwen
hgweb: display diff for a changeset against any parents (issue2810)...
r17991
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 filerevparent = '<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
filerevchild = '<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
filerename = '{file|escape}@'
filelogrename = '
Kevin Gessner
hgweb: add base link to file log for paper and coal styles (issue2452)
r13850 <span class="base">
base
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
Kevin Gessner
hgweb: add base link to file log for paper and coal styles (issue2452)
r13850 {file|escape}@{node|short}
</a>
</span>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 fileannotateparent = '
<tr>
<td class="metatag">parent:</td>
<td>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {rename%filerename}{node|short}
</a>
</td>
</tr>'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 changesetchild = ' <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 fileannotatechild = '
<tr>
<td class="metatag">child:</td>
<td>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {node|short}
</a>
</td>
</tr>'
tags = tags.tmpl
tagentry = '
Alexander Plavin
hgweb: make stripes in tag list with CSS
r19448 <tr class="tagEntry">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td>
av6
hgweb: provide links to branches, tags and bookmarks by name (paper and coal)...
r25779 <a href="{url|urlescape}rev/{tag|revescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {tag|escape}
</a>
</td>
<td class="node">
av6
hgweb: provide links to branches, tags and bookmarks by name (paper and coal)...
r25779 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
{node|short}
</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 bookmarks = bookmarks.tmpl
bookmarkentry = '
Alexander Plavin
hgweb: make stripes in bookmark list with CSS
r19446 <tr class="tagEntry">
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 <td>
av6
hgweb: provide links to branches, tags and bookmarks by name (paper and coal)...
r25779 <a href="{url|urlescape}rev/{bookmark|revescape}{sessionvars%urlparameter}">
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 {bookmark|escape}
</a>
</td>
<td class="node">
av6
hgweb: provide links to branches, tags and bookmarks by name (paper and coal)...
r25779 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
{node|short}
</a>
Alexander Solovyov
hgweb: add separate page with bookmarks listing
r13597 </td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 branches = branches.tmpl
branchentry = '
Alexander Plavin
hgweb: make stripes in branch list with CSS
r19451 <tr class="tagEntry">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td>
av6
hgweb: provide links to branches, tags and bookmarks by name (paper and coal)...
r25779 <a href="{url|urlescape}shortlog/{branch|revescape}{sessionvars%urlparameter}" class="{status}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {branch|escape}
</a>
</td>
<td class="node">
av6
hgweb: provide links to branches, tags and bookmarks by name (paper and coal)...
r25779 <a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}">
{node|short}
</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
av6
hgweb: show commit phase if it's not public...
r35064 phasetag = '{ifeq(phase, 'public', '', '<span class="phase">{phase|escape}</span> ')}'
av6
hgweb: show obsolescence status of a commit...
r35088 obsoletetag = '{if(obsolete, '<span class="obsolete">obsolete</span> ')}'
av6
hgweb: rename the main attribute of instabilities...
r35129 instabilitytag = '<span class="instability">{instability|escape}</span> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changelogtag = '<span class="tag">{name|escape}</span> '
changesettag = '<span class="tag">{tag|escape}</span> '
Alexander Solovyov
hgweb: add display of bookmarks for changelog and changeset
r13596 changesetbookmark = '<span class="tag">{bookmark|escape}</span> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
Thomas Arendsen Hein
trailing spaces (and one stray tab)
r10575 changelogbranchname = '<span class="branchname">{name|escape}</span> '
av6
hgweb: show instabilities of a commit...
r35093 alltags = '{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
av6
hgweb: link to successors of obsoleted changesets...
r35502 successorlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}'
av6
hgweb: display fate of obsolete changesets...
r35501 obsfateverb = '{obsfateverb(successors, markers)}'
obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}'
av6
hgweb: show users recorded in obsolescence markers...
r36213 obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}'
av6
hgweb: show dates recorded in obsolescence markers...
r36251 obsfatedate = '{if(obsfatedate(markers), ' {ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), '<span class="age">{min(obsfatedate(markers))|rfc822date}</span>', 'between <span class="age">{min(obsfatedate(markers))|rfc822date}</span> and <span class="age">{max(obsfatedate(markers))|rfc822date}</span>')}')}'
obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}'
av6
hgweb: explain instabilities of unstable changesets
r36973 instabilitychangesetlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
divergentnode = '{instabilitychangesetlink} ({phase})'
whyunstableentry = '{instability}: {if(divergentnodes, divergentnodes%divergentnode)} {reason} {instabilitychangesetlink}'
av6
hgweb: display fate of obsolete changesets...
r35501
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filediffparent = '
<tr>
<th class="parent">parent {rev}:</th>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td class="parent"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>'
filediffchild = '
<tr>
<th class="child">child {rev}:</th>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
indexentry = '
Alexander Plavin
hgweb: make stripes in repo list with CSS
r19450 <tr>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td><a href="{url|urlescape}{sessionvars%urlparameter}">{name|escape}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td>{description}</td>
<td>{contact|obfuscate}</td>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">{lastchange|rfc822date}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="indexlinks">{archives%indexarchiveentry}</td>
Angel Ezquerra
hgweb, paper: add (Atom) subscribe links to the repository index...
r18201 <td>
{if(isdirectory, '',
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 '<a href="{url|urlescape}atom-log" title="subscribe to repository atom feed">
<img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="subscribe to repository atom feed">
Angel Ezquerra
hgweb, paper: add (Atom) subscribe links to the repository index...
r18201 </a>'
)}
</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>\n'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 indexarchiveentry = '<a href="{url|urlescape}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 index = index.tmpl
archiveentry = '
<li>
av6
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...
r25606 <a href="{url|urlescape}archive/{symrev}{extension|urlescape}{ifeq(path,'/','',path|urlescape)}">{type|escape}</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </li>'
notfound = notfound.tmpl
error = error.tmpl
urlparameter = '{separator}{name}={value|urlescape}'
hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 breadcrumb = '&gt; <a href="{url|urlescape}">{name|escape}</a> '
Alexander Plavin
paper: define searchhint message in map file and use it in other templates
r19795
Gregory Szorc
hgweb: consolidate search form for paper...
r32758 searchform = '
<form class="search" action="{url|urlescape}log">
{sessionvars%hiddenformentry}
<p><input name="rev" id="search1" type="text" size="30" value="{query|escape}" /></p>
<div id="hint">{searchhint}</div>
</form>'
Alexander Plavin
paper: edit search hint to include new feature description
r19796 searchhint = 'Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="{url|urlescape}help/revsets">revset expression</a>.'
Gregory Szorc
hgweb: add HTML elements to control whitespace settings for annotate...
r34392
diffoptsform = '
<form id="diffopts-form"
data-ignorews="{if(get(diffopts, 'ignorews'), '1', '0')}"
data-ignorewsamount="{if(get(diffopts, 'ignorewsamount'), '1', '0')}"
data-ignorewseol="{if(get(diffopts, 'ignorewseol'), '1', '0')}"
data-ignoreblanklines="{if(get(diffopts, 'ignoreblanklines'), '1', '0')}">
<span>Ignore whitespace changes - </span>
<span>Everywhere:</span>
<input id="ignorews-checkbox" type="checkbox" />
<span>Within whitespace:</span>
<input id="ignorewsamount-checkbox" type="checkbox" />
<span>At end of lines:</span>
<input id="ignorewseol-checkbox" type="checkbox" />
</form>'