Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/templates/paper/changeset.tmpl
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 05 Nov 2014 23:24:47 +0900
changeset 23183 51c9196a6bd0
parent 19795 ac08ff370977
child 23740 9e1f4c65f5f5
permissions -rw-r--r--
largefiles: remove meaningless code path for "hg pull --rebase" This patch removes "--rebase" specific code path for "hg pull" in "overridepull", because previous patch makes it meaningless: now, "rebase.rebase" ("orig" invocation in this patch) can update/commit largefiles safely without "repo._isrebasing = True". As a side effect of removing "rebase.rebase" invocation in "overridepull", this patch removes "nothing to rebase ..." message in "test-largefiles.t", which is shown only when rebase extension is enabled AFTER largefiles: before this patch: 1. "dispatch" invokes "pullrebase" of rebase as "hg pull" at first, because rebase wraps "hg pull" later 2. "pullrebase" invokes "overridepull" of largefiles as "orig", even though rebase assumes that "orig" is "pull" of commands 3. "overridepull" executes "pull" and "rebase" directly 3.1 "pull" pulls changesets and creates new head "X" 3.2 "rebase" rebases current working parent "Y" on "X" 4. "overridepull" returns to "pullrebase" 5. "pullrebase" tries to rebase, but there is nothing to be done, because "Y" is already rebased on "X". then, it shows "nothing to rebase ..." after this patch: 1. "dispatch" invokes "pullrebase" of rebase as "hg pull" 2. "pullrebase" invokes "overridepull" of largefiles as "orig" 3. "overridepull" executes "pull" as "orig" 4. "overridepull" returns to "pullrebase" 5. revision "Y" is not yet rebased, so "pullrebase" doesn't shows "nothing to rebase ..." As another side effect of removing "rebase.rebase" invocation, this patch fixes issue3861, which occurs only when rebase extension is enabled BEFORE largefiles: before this patch: 1. "dispatch" invokes "overridepull" of largefiles at first, because largefiles wrap "hg pull" later 2. "overridepull" executes "pull" and "rebase" explicitly 2.1 "pull" pulls changesets and creates new head "X" 2.2 "rebase" rebases current working parent, but fails because no revision is checked out in issue3861 case 3. "overridepull" returns to "dispatch" with exit code 1 returned from "rebase" at (2.2) 4. "hg pull" terminates with exit code 1 unexpectedly after this patch: 1. "dispatch" invokes "overridepull" of largefiles at first 2. "overridepull" invokes "pullrebase" of rebase as "orig" 3. "pullrebase" invokes "pull" as "orig" 4. "pullrebase" invokes "rebase", and it fails 5. "pullrebase" returns to "overridepull" with exit code 0 (because "pullrebase" ignores result of "pull" and "rebase") 6. "overridepull" returns to "dispatch" with exit code 0 returned from "rebase" at (5) 7. "hg pull" terminates with exit code 0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     1
 
{header}
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     2
 
<title>{repo|escape}: {node|short}</title>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     3
 
</head>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     4
 
<body>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     5
 
<div class="container">
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     6
 
<div class="menu">
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
     7
 
<div class="logo">
13964
616ad3f6fd33 hgweb: support alternate logo url
Steven Stallion <sstallion@gmail.com>
parents: 13934
diff changeset 
     8
 
<a href="{logourl}">
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18517
diff changeset 
     9
 
<img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    10
 
</div>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    11
 
<ul>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18517
diff changeset 
    12
 
 <li><a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18517
diff changeset 
    13
 
 <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: 18517
diff changeset 
    14
 
 <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: 18517
diff changeset 
    15
 
 <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: 18517
diff changeset 
    16
 
 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    17
 
</ul>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    18
 
<ul>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    19
 
 <li class="active">changeset</li>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18517
diff changeset 
    20
 
 <li><a href="{url|urlescape}raw-rev/{node|short}{sessionvars%urlparameter}">raw</a></li>
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18517
diff changeset 
    21
 
 <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">browse</a></li>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    22
 
</ul>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    23
 
<ul>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    24
 
 {archives%archiveentry}
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    25
 
</ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset 
    26
 
<ul>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18517
diff changeset 
    27
 
 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset 
    28
 
</ul>
7411
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    29
 
</div>
b71ee3e00e81 coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset 
    30
 












b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    31


<div class="main">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    32









18258






bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages



Angel Ezquerra <angel.ezquerra at gmail.com>


parents: 
17991

diff
changeset




    33


<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>








13596






270f57d35525
hgweb: add display of bookmarks for changelog and changeset



Alexander Solovyov <alexander@solovyov.net>


parents: 
12666

diff
changeset




    34


<h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag} {changesetbookmark}</h3>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    35









18526






9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
18517

diff
changeset




    36


<form class="search" action="{url|urlescape}log">








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    37


{sessionvars%hiddenformentry}








7725






6a888d491eaf
coal/paper: switch to XHTML 1.1



Benoit Allard <benoit@aeteurope.nl>


parents: 
7411

diff
changeset




    38


<p><input name="rev" id="search1" type="text" size="30" /></p>








19795






ac08ff370977
paper: define searchhint message in map file and use it in other templates



Alexander Plavin <alexander@plav.in>


parents: 
19455

diff
changeset




    39


<div id="hint">{searchhint}</div>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    40


</form>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    41









18628






52305554fd6e
hgweb: apply the websub filter to revision descriptions



Angel Ezquerra <angel.ezquerra@gmail.com>


parents: 
18526

diff
changeset




    42


<div class="description">{desc|strip|escape|websub|nonempty}</div>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    43














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    44


<table id="changesetEntry">













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    45


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    46


 <th class="author">author</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    47


 <td class="author">{author|obfuscate}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    48


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    49


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    50


 <th class="date">date</th>








15375






fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari



Brodie Rao <brodie@bitheap.org>


parents: 
14913

diff
changeset




    51


 <td class="date age">{date|rfc822date}</td></tr>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    52


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    53


 <th class="author">parents</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    54


 <td class="author">{parent%changesetparent}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    55


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    56


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    57


 <th class="author">children</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    58


 <td class="author">{child%changesetchild}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    59


</tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    60


<tr>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    61


 <th class="files">files</th>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    62


 <td class="files">{files}</td>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    63


</tr>








14571






17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    64


<tr>













17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    65


  <th class="diffstat">diffstat</th>













17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    66


  <td class="diffstat">













17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    67


    {diffsummary}








19428






c3cdba6e5d7f
hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat



Alexander Plavin <me@aplavin.ru>


parents: 
18628

diff
changeset




    68


    <a id="diffstatexpand" href="javascript:toggleDiffstat()"/>[<tt>+</tt>]</a>








14571






17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    69


    <div id="diffstatdetails" style="display:none;">








19428






c3cdba6e5d7f
hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat



Alexander Plavin <me@aplavin.ru>


parents: 
18628

diff
changeset




    70


      <a href="javascript:toggleDiffstat()"/>[<tt>-</tt>]</a>








14571






17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    71


      <p>








19455






c229a5e7511e
hgweb: make stripes in diffstat with CSS



Alexander Plavin <me@aplavin.ru>


parents: 
19433

diff
changeset




    72


      <table class="stripes2">{diffstat}</table>








14571






17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    73


    </div>













17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    74


  </td>













17c0cb1045e5
paper, coal: display diffstat on the changeset page



Steven Brown <StevenGBrown@gmail.com>


parents: 
14046

diff
changeset




    75


</tr>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    76


</table>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    77














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    78


<div class="overflow">








19433






a79b21ece345
hgweb: add line wrapping switch to file diff and changeset views



Alexander Plavin <me@aplavin.ru>


parents: 
19432

diff
changeset




    79


<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>








19432






e92d4b8530cb
hgweb: file diff and changesets views behave like file source view



Alexander Plavin <me@aplavin.ru>


parents: 
19428

diff
changeset




    80


<div class="sourcefirst"> line diff</div>













e92d4b8530cb
hgweb: file diff and changesets views behave like file source view



Alexander Plavin <me@aplavin.ru>


parents: 
19428

diff
changeset




    81


<div class="stripes2 diffblocks">








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    82


{diff}













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    83


</div>








19432






e92d4b8530cb
hgweb: file diff and changesets views behave like file source view



Alexander Plavin <me@aplavin.ru>


parents: 
19428

diff
changeset




    84


</div>








7411






b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    85














b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    86


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    87


</div>













b71ee3e00e81
coal/paper: move actual templates from coal to paper



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 

diff
changeset




    88


{footer}















hg-stable