upstream/mercurial-mirror Files · mercurial/templates/gitweb/filediff.tmpl

merge: make 'nothing to merge' aborts consistent...

merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

Steven Stallion - - Load All Authors

File last commit:

r13964:616ad3f6 default


                r15619:6c8573dd

default

Download file

             filediff.tmpl
        
                    50 lines
            
             | 1.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / filediff.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: diff {file|escape}</title>

      <link rel="alternate" type="application/atom+xml"

         href="{url}atom-log" title="Atom feed for {repo|escape}"/>

      <link rel="alternate" type="application/rss+xml"

         href="{url}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div class="page_header">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff

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

              r9999
            
      </div>

      <div class="page_nav">

      <a href="{url}summary{sessionvars%urlparameter}">summary</a> |

      <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |

      <a href="{url}log{sessionvars%urlparameter}">changelog</a> |

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

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

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

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

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

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

      <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |

      <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |

      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |

      <a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |

      <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |

      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |

      diff |

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

              r12666
            
      <a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/> |

      <a href="{url}help{sessionvars%urlparameter}">help</a>

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

              r9999
            
      </div>

      <div class="title">{file|escape}</div>

      <table>

      {branch%filerevbranch}

      <tr>

       <td>changeset {rev}</td>

       <td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>

      {parent%filediffparent}

      {child%filediffchild}

      </table>

      <div class="list_head"></div>

      <div class="page_body">

      {diff}

      </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}: diff {file\|escape}</title>
		<link rel="alternate" type="application/atom+xml"
		href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml"
		href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
		</head>
		<body>

		<div class="page_header">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / diff
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_nav">
		<a href="{url}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url}log{sessionvars%urlparameter}">changelog</a> \|
		<a href="{url}graph{sessionvars%urlparameter}">graph</a> \|
		<a href="{url}tags{sessionvars%urlparameter}">tags</a> \|
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<a href="{url}branches{sessionvars%urlparameter}">branches</a> \|
		<a href="{url}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a> \|
		<a href="{url}rev/{node\|short}{sessionvars%urlparameter}">changeset</a> \|
		<a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a> \|
		<a href="{url}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a> \|
		<a href="{url}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a> \|
		<a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a> \|
		diff \|
Augie Fackler web: add a help view for getting hg help output	r12666	<a href="{url}raw-diff/{node\|short}/{file\|urlescape}">raw</a><br/> \|
		<a href="{url}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="title">{file\|escape}</div>

		<table>
		{branch%filerevbranch}
		<tr>
		<td>changeset {rev}</td>
		<td style="font-family:monospace"><a class="list" href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>
		{parent%filediffparent}
		{child%filediffchild}
		</table>

		<div class="list_head"></div>

		<div class="page_body">
		{diff}
		</div>

		{footer}