annotate templates/filediff.tmpl @ 174:23057dc57d1b

hg merge: abort if there are outstanding changes in the working directory We currently don't support merging from the tip into the working directory, so merge with outstanding local changes is asking for trouble.
author mpm@selenic.com
date Thu, 26 May 2005 22:54:48 -0800
parents e9b1147db448
children f918a6fa2572
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
1 #header#
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
2 <title>#repo#: #file# diff</title>
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
3 </head>
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
4 <body>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
5
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
6 <div class="buttons">
153
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents: 142
diff changeset
7 <a href="?cmd=changelog;rev=#rev#">changelog</a>
168
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 167
diff changeset
8 <a href="?cmd=tags">tags</a>
153
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents: 142
diff changeset
9 <a href="?cmd=changeset;node=#node#">changeset</a>
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents: 142
diff changeset
10 <a href="?cmd=file;file=#file#;filenode=#filenode#">file</a>
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents: 142
diff changeset
11 <a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a>
e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents: 142
diff changeset
12 <a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
13 </div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
14
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
15 <h2>#file#</h2>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
16
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
17 <table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
18 <tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
19 <td class="metatag">revision #rev#:</td>
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
20 <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
21 <tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
22 <td class="metatag">parent #p1rev#:</td>
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
23 <td><a href="?cmd=changeset;node=#p1#">#p1#</a></td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
24 </table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
25
172
e9b1147db448 hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents: 168
diff changeset
26 <pre>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
27 #diff#
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
28 </pre>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
29
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
30 #footer#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
31
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
32