Mercurial > hg
annotate mercurial/templates/monoblue/filecomparison.tmpl @ 35456:fdbe4eafa9c2
completion: don't suggest clean files to revert
It looks like we used to suggest only modified, added, removed and
deleted files to revert until a821ec835223 (completion: selectively
use debugpathcomplete in bash_completion, 2013-03-21). The reasoning
in that commit was that getting the status was too slow and the
replacement (debugpathcomplete) seems to make sense for the other two
commands (remove and forget), but I'm not sure it was intentional to
change the behavior of completion for revert. Note that "add" and
"diff" already use status-based completion.
Differential Revision: https://phab.mercurial-scm.org/D1715
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 18 Dec 2017 09:58:04 -0800 |
parents | 265196cd7d7f |
children |
rev | line source |
---|---|
7111 | 1 {header} |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
2 <title>{repo|escape}: comparison {file|escape}</title> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
3 <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
4 <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
7111 | 5 </head> |
6 | |
7 <body> | |
8 <div id="container"> | |
9 <div class="page-header"> | |
18258
bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents:
17302
diff
changeset
|
10 <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1> |
7111 | 11 |
32759
265196cd7d7f
hgweb: consolidate search form for monoblue
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26598
diff
changeset
|
12 {searchform} |
7111 | 13 |
14 <ul class="page-nav"> | |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
15 <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
16 <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
17 <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li> |
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
18 <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
19 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
20 <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
21 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> |
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
22 <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a></li> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
23 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> |
7111 | 24 </ul> |
25 </div> | |
26 | |
27 <ul class="submenu"> | |
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
28 <li><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> |
26598
264e88901c44
monoblue: add a link to the latest file revision
Anton Shestakov <av6@dwimlabs.net>
parents:
25604
diff
changeset
|
29 <li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> |
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
30 <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li> |
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
31 <li><a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> |
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
32 <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
33 <li class="current">comparison</li> |
25604
0cdcbc477cac
hgweb: don't dereference symbolic revision in monoblue style
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
34 <li><a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a></li> |
7111 | 35 </ul> |
36 | |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
37 <h2 class="no-link no-border">comparison: {file|escape}</h2> |
7111 | 38 <h3 class="changeset">{file|escape}</h3> |
39 | |
40 <dl class="overview"> | |
41 {branch%filerevbranch} | |
42 <dt>changeset {rev}</dt> | |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
43 <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd> |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
44 {parent%filecompparent} |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
45 {child%filecompchild} |
7111 | 46 </dl> |
47 | |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
48 <div class="legend"> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
49 <span class="legendinfo equal">equal</span> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
50 <span class="legendinfo delete">deleted</span> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
51 <span class="legendinfo insert">inserted</span> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
52 <span class="legendinfo replace">replaced</span> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
53 </div> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
54 |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
13860
diff
changeset
|
55 <div class="comparison"> |
17302
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
56 <table class="bigtable"> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
57 <thead class="header"> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
58 <tr> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
59 <th>{leftrev}:{leftnode|short}</th> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
60 <th>{rightrev}:{rightnode|short}</th> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
61 </tr> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
62 </thead> |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
63 {comparison} |
5c64ce6168da
hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents:
17202
diff
changeset
|
64 </table> |
7111 | 65 </div> |
66 | |
67 {footer} |