Mercurial > hg

annotate mercurial/templates/monoblue/helptopics.tmpl @ 24213:e0c1328df872

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
workingctx: use normal dirs() instead of dirstate.dirs() The workingctx class was using dirstate.dirs() as it's implementation. The sparse extension maintains a pruned down version of the dirstate, so this resulted in the workingctx reporting an incorrect listing of directories during merge calculations (it was detecting directory renames when it shouldn't have). The fix is to use the default implementation, which uses workingctx._manifest, which unions the manifest with the dirstate to produce the correct overall picture. This also produces more accurate output since it will no longer return directories that have been entirely deleted in the dirstate. Tests will be added to the sparse extension to detect regressions for this.
author Durham Goode <durham@fb.com>
date Thu, 05 Mar 2015 22:16:28 -0800
parents 3fc86f1c39d8
children bcc02516f384
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8430
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset
1 {header}
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset
2 <title>{repo|escape}: Branches</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}"/>
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
5 </head>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
6
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
7 <body>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
8 <div id="container">
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
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: 17286
diff changeset
10 <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
11
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
12 <form action="{url|urlescape}log">
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
13 {sessionvars%hiddenformentry}
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
14 <dl class="search">
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
15 <dt><label>Search: </label></dt>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
16 <dd><input type="text" name="rev" /></dd>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
17 </dl>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
18 </form>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
19
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
20 <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
21 <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
22 <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
23 <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
24 <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
25 <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
26 <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
27 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">branches</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
28 <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a></li>
24129
3fc86f1c39d8 hgweb: don't mix tabs and spaces in monoblue templates
Anton Shestakov <engored@ya.ru>
parents: 18526
diff changeset
29 <li class="current">help</li>
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
30 </ul>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
31 </div>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
32
10137
daec0f64656e monoblue: fix title for branches page
Johan Samyn <johan.samyn@gmail.com>
parents: 8430
diff changeset
33 <h2 class="no-link no-border">branches</h2>
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
34 <table cellspacing="0">
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
35 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
36 {topics % helpentry}
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
37
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
38 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
39 {earlycommands % helpentry}
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
40
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
41 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 10138
diff changeset
42 {othercommands % helpentry}
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
43 </table>
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
diff changeset
44
8430
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset
45 {footer}