templates/gitweb/filediff.tmpl
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 5266 46c5e1ee8aaa
permissions -rw-r--r--
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3350
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     1
{header}
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     2
<title>{repo|escape}: diff {file|escape}</title>
5266
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4466
diff changeset
     3
<link rel="alternate" type="application/atom+xml"
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4466
diff changeset
     4
   href="{url}atom-log" title="Atom feed for #repo|escape#">
3350
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     5
<link rel="alternate" type="application/rss+xml"
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     6
   href="{url}rss-log" title="RSS feed for {repo|escape}">
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     7
</head>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     8
<body>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     9
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    10
<div class="page_header">
4466
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
    11
<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
3350
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    12
</div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    13
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    14
<div class="page_nav">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    15
<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    16
<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    17
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    18
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    19
<a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">manifest</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    20
<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    21
<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
    22
<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
3364
537a93cafa79 Fixed typo in gitweb templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3363
diff changeset
    23
<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
3350
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    24
diff |
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    25
<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    26
</div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    27
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    28
<div class="title">{file|escape}</div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    29
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    30
<table>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    31
<tr>
4466
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
    32
 <td>changeset {rev}</td>
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
    33
 <td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>
3350
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    34
{parent%filediffparent}
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    35
{child%filediffchild}
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    36
</table>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    37
4466
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
    38
<div class="list_head"></div>
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
    39
3350
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    40
<div class="page_body">
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    41
{diff}
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    42
</div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    43
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    44
{footer}