##// END OF EJS Templates
filemerge: call premerge directly from main merge function...
filemerge: call premerge directly from main merge function The merge code currently does (in pseudocode): for f in tomerge: premerge f merge f We'd like to change this to look more like: for f in tomerge: premerge f for f in tomerge: merge f This makes sure as many files are resolved as possible before prompting for the others. This restructuring is also necessary for custom merge drivers. This function separates out the premerge step from the merge step. In future patches we'll actually turn these into separate steps in the merge driver. The 'if r:' occurrences will be cleaned up in subsequent patches.

File last commit:

r25779:cd842821 default
r26567:f18646cf default
Show More
map
258 lines | 8.9 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
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}">
{topic|escape}
</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
searchentry = 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}'
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 = '
Alexander Plavin
hgweb: highlight line which is linked to at annotate view
r19463 <tr id="{lineid}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="annotate">
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}#l{targetline}"
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
</td>
Alexander Plavin
hgweb: highlight line which is linked to at annotate view
r19463 <td class="source"><a href="#{lineid}">{linenumber}</a> {line|escape}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>'
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>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changelogparent = '
<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>'
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 changelogchild = '
<tr>
<th class="child">child</th>
<td class="child">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {node|short}
</a>
</td>
</tr>'
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>'
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> '
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>'
filelogparent = '
<tr>
<th>parent {rev}:</th>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{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>'
filelogchild = '
<tr>
<th>child {rev}:</th>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </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
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>.'