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

patch: better handling of sequence of offset patch hunks (issue1941)...

patch: better handling of sequence of offset patch hunks (issue1941) The built-in patch implementation applied the hunks to the wrong lines of the file if the file in the repo has been modified to skew the patch line numbers and the file contains repetitive sequences of lines.

Zhigang Wang - - Load All Authors

File last commit:

r9882:b3b57ecb default


                r10135:9a4034b6

stable

Download file

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

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      {header}

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

        Robert Bachmann
    
Added support for the Atom syndication format

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

        Dirkjan Ochtman
    
git: use newer template syntax everywhere

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

        Brendan Cully
    
gitweb: add file diff view

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

        Kevin Christen
    
Fixed numerous XHTML problems that caused validation errors and warnings....

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

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      </head>

      <body>

      <div class="page_header">

        Dirkjan Ochtman
    
change wiki/bts URLs to point to new hostname

              r8936
            
      <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      </div>

      <div class="page_nav">

        Thomas Arendsen Hein
    
hgweb: Apply the new method of passing session variables to links.

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

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

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

        Augie Fackler
    
hgweb: Fix up non-coal styles to support graph.

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

        Thomas Arendsen Hein
    
hgweb: Apply the new method of passing session variables to links.

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

        Sune Foldager
    
gitweb: add branches page

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

        Thomas Arendsen Hein
    
Renamed "manifest" to "files" in web templates....

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

        Thomas Arendsen Hein
    
hgweb: Apply the new method of passing session variables to links.

              r3363
            
      <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}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |

        Thomas Arendsen Hein
    
Fixed typo in gitweb templates.

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

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      diff |

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

      </div>

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

      <table>

        Florent Guillaume
    
gitweb: show branches in most of the templates

              r6250
            
      {branch%filerevbranch}

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      <tr>

        Josef "Jeff" Sipek
    
gitweb: file diff: Display metadata in same order as changeset does

              r4467
            
       <td>changeset {rev}</td>

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

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      {parent%filediffparent}

      {child%filediffchild}

      </table>

        Josef "Jeff" Sipek
    
gitweb: file diff: Display metadata in same order as changeset does

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

        Brendan Cully
    
gitweb: add file diff view

              r3353
            
      <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

Brendan Cully gitweb: add file diff view	r3353	{header}
		<title>{repo\|escape}: diff {file\|escape}</title>
Robert Bachmann Added support for the Atom syndication format	r5269	<link rel="alternate" type="application/atom+xml"
Dirkjan Ochtman git: use newer template syntax everywhere	r8427	href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
Brendan Cully gitweb: add file diff view	r3353	<link rel="alternate" type="application/rss+xml"
Kevin Christen Fixed numerous XHTML problems that caused validation errors and warnings....	r5820	href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
Brendan Cully gitweb: add file diff view	r3353	</head>
		<body>

		<div class="page_header">
Dirkjan Ochtman change wiki/bts URLs to point to new hostname	r8936	<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / diff
Brendan Cully gitweb: add file diff view	r3353	</div>

		<div class="page_nav">
Thomas Arendsen Hein hgweb: Apply the new method of passing session variables to links.	r3363	<a href="{url}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url}log{sessionvars%urlparameter}">changelog</a> \|
Augie Fackler hgweb: Fix up non-coal styles to support graph.	r6693	<a href="{url}graph{sessionvars%urlparameter}">graph</a> \|
Thomas Arendsen Hein hgweb: Apply the new method of passing session variables to links.	r3363	<a href="{url}tags{sessionvars%urlparameter}">tags</a> \|
Sune Foldager gitweb: add branches page	r8356	<a href="{url}branches{sessionvars%urlparameter}">branches</a> \|
Thomas Arendsen Hein Renamed "manifest" to "files" in web templates....	r6177	<a href="{url}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a> \|
Thomas Arendsen Hein hgweb: Apply the new method of passing session variables to links.	r3363	<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}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a> \|
Thomas Arendsen Hein Fixed typo in gitweb templates.	r3364	<a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a> \|
Brendan Cully gitweb: add file diff view	r3353	diff \|
		<a href="{url}raw-diff/{node\|short}/{file\|urlescape}">raw</a><br/>
		</div>

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

		<table>
Florent Guillaume gitweb: show branches in most of the templates	r6250	{branch%filerevbranch}
Brendan Cully gitweb: add file diff view	r3353	<tr>
Josef "Jeff" Sipek gitweb: file diff: Display metadata in same order as changeset does	r4467	<td>changeset {rev}</td>
		<td style="font-family:monospace"><a class="list" href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td></tr>
Brendan Cully gitweb: add file diff view	r3353	{parent%filediffparent}
		{child%filediffchild}
		</table>

Josef "Jeff" Sipek gitweb: file diff: Display metadata in same order as changeset does	r4467	<div class="list_head"></div>

Brendan Cully gitweb: add file diff view	r3353	<div class="page_body">
		{diff}
		</div>

		{footer}