upstream/mercurial-mirror Files · mercurial/templates/paper/manifest.tmpl

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.

av6 - - Load All Authors

File last commit:

r25617:63be4640 default


                r26567:f18646cf

default

Download file

             manifest.tmpl
        
                    64 lines
            
             | 1.8 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / manifest.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

      <title>{repo|escape}: {node|short} {path|escape}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
      <li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>

      <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>

      <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

      <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </ul>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
      <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <li class="active">browse</li>

      </ul>

      <ul>

      {archives%archiveentry}

      </ul>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
       <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </ul>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <div class="main">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      <h3>

       directory {path|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>

       {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}

      </h3>

        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
            
      <form class="search" action="{url|urlescape}log">

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

        Alexander Plavin
    
paper: define searchhint message in map file and use it in other templates

              r19795
            
      <div id="hint">{searchhint}</div>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </form>

      <table class="bigtable">

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      <thead>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <tr>

        <th class="name">name</th>

        <th class="size">size</th>

        <th class="permissions">permissions</th>

      </tr>

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      </thead>

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
      <tbody class="stripes2">

      <tr class="fileline">

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
        <td class="name"><a href="{url|urlescape}file/{symrev}{up|urlescape}{sessionvars%urlparameter}">[up]</a></td>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        <td class="size"></td>

        <td class="permissions">drwxr-xr-x</td>

      </tr>

      {dentries%direntry}

      {fentries%fileentry}

        Alexander Plavin
    
hgweb: make stripes in directory view with CSS

              r19447
            
      </tbody>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </table>

      </div>

      </div>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {node\|short} {path\|escape}</title>
		</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="active">browse</li>
		</ul>
		<ul>
		{archives%archiveentry}
		</ul>
Augie Fackler web: add a help view for getting hg help output	r12666	<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
av6 hgweb: link to revision by node hash in paper & coal...	r25617	<h3>
		directory {path\|escape} @ {rev}:<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>
		{branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}
		</h3>
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	<form class="search" action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin paper: define searchhint message in map file and use it in other templates	r19795	<div id="hint">{searchhint}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</form>

		<table class="bigtable">
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	<thead>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th class="name">name</th>
		<th class="size">size</th>
		<th class="permissions">permissions</th>
		</tr>
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	</thead>
Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	<tbody class="stripes2">
		<tr class="fileline">
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<td class="name"><a href="{url\|urlescape}file/{symrev}{up\|urlescape}{sessionvars%urlparameter}">[up]</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<td class="size"></td>
		<td class="permissions">drwxr-xr-x</td>
		</tr>
		{dentries%direntry}
		{fentries%fileentry}
Alexander Plavin hgweb: make stripes in directory view with CSS	r19447	</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>
		</div>
		</div>
		{footer}