Mercurial > hg

comparison tests/test-hgweb-filelog.t @ 31661:f36dc643ffdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: add a "patch" query parameter to filelog command Add support for a "patch" query parameter in filelog web command similar to --patch option of `hg log` to display the diff of each changeset in the table of revisions. The diff text is displayed in a dedicated row of the table that follows the existing one for each entry and spans over all columns. Only update "paper" template in this patch.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Mon, 13 Mar 2017 10:41:13 +0100
parents eb7de21b15be
children 5e6d44511317
comparison
equal deleted inserted replaced
31660:c2dbd818e884 31661:f36dc643ffdc
219 <td class="description"> 219 <td class="description">
220 <a href="/rev/3f41bc784e7e">second a</a> 220 <a href="/rev/3f41bc784e7e">second a</a>
221 <span class="branchname">a-branch</span> 221 <span class="branchname">a-branch</span>
222 </td> 222 </td>
223 </tr> 223 </tr>
224
224 <tr> 225 <tr>
225 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td> 226 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
226 <td class="author">test</td> 227 <td class="author">test</td>
227 <td class="description"> 228 <td class="description">
228 <a href="/rev/5ed941583260">first a</a> 229 <a href="/rev/5ed941583260">first a</a>
229 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 230 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
230 </td> 231 </td>
231 </tr> 232 </tr>
233
232 234
233 </tbody> 235 </tbody>
234 </table> 236 </table>
235 237
236 <div class="navigate"> 238 <div class="navigate">
338 <td class="description"> 340 <td class="description">
339 <a href="/rev/3f41bc784e7e">second a</a> 341 <a href="/rev/3f41bc784e7e">second a</a>
340 <span class="branchname">a-branch</span> 342 <span class="branchname">a-branch</span>
341 </td> 343 </td>
342 </tr> 344 </tr>
345
343 <tr> 346 <tr>
344 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td> 347 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
345 <td class="author">test</td> 348 <td class="author">test</td>
346 <td class="description"> 349 <td class="description">
347 <a href="/rev/5ed941583260">first a</a> 350 <a href="/rev/5ed941583260">first a</a>
348 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 351 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
349 </td> 352 </td>
350 </tr> 353 </tr>
354
351 355
352 </tbody> 356 </tbody>
353 </table> 357 </table>
354 358
355 <div class="navigate"> 359 <div class="navigate">
457 <td class="description"> 461 <td class="description">
458 <a href="/rev/5ed941583260">first a</a> 462 <a href="/rev/5ed941583260">first a</a>
459 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 463 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
460 </td> 464 </td>
461 </tr> 465 </tr>
466
462 467
463 </tbody> 468 </tbody>
464 </table> 469 </table>
465 470
466 <div class="navigate"> 471 <div class="navigate">
568 <td class="description"> 573 <td class="description">
569 <a href="/rev/5ed941583260">first a</a> 574 <a href="/rev/5ed941583260">first a</a>
570 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span> 575 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
571 </td> 576 </td>
572 </tr> 577 </tr>
578
573 579
574 </tbody> 580 </tbody>
575 </table> 581 </table>
576 582
577 <div class="navigate"> 583 <div class="navigate">
755 761
756 <div class="logo"> 762 <div class="logo">
757 <a href="https://mercurial-scm.org/"> 763 <a href="https://mercurial-scm.org/">
758 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> 764 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
759 </div> 765 </div>
766
767 </body>
768 </html>
769
770
771 filelog with patch
772
773 $ (get-with-headers.py localhost:$HGPORT 'log/4/a?patch=1')
774 200 Script output follows
775
776 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
777 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
778 <head>
779 <link rel="icon" href="/static/hgicon.png" type="image/png" />
780 <meta name="robots" content="index, nofollow" />
781 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
782 <script type="text/javascript" src="/static/mercurial.js"></script>
783
784 <title>test: a history</title>
785 <link rel="alternate" type="application/atom+xml"
786 href="/atom-log/tip/a" title="Atom feed for test:a" />
787 <link rel="alternate" type="application/rss+xml"
788 href="/rss-log/tip/a" title="RSS feed for test:a" />
789 </head>
790 <body>
791
792 <div class="container">
793 <div class="menu">
794 <div class="logo">
795 <a href="https://mercurial-scm.org/">
796 <img src="/static/hglogo.png" alt="mercurial" /></a>
797 </div>
798 <ul>
799 <li><a href="/shortlog/4">log</a></li>
800 <li><a href="/graph/4">graph</a></li>
801 <li><a href="/tags">tags</a></li>
802 <li><a href="/bookmarks">bookmarks</a></li>
803 <li><a href="/branches">branches</a></li>
804 </ul>
805 <ul>
806 <li><a href="/rev/4">changeset</a></li>
807 <li><a href="/file/4">browse</a></li>
808 </ul>
809 <ul>
810 <li><a href="/file/4/a">file</a></li>
811 <li><a href="/diff/4/a">diff</a></li>
812 <li><a href="/comparison/4/a">comparison</a></li>
813 <li><a href="/annotate/4/a">annotate</a></li>
814 <li class="active">file log</li>
815 <li><a href="/raw-file/4/a">raw</a></li>
816 </ul>
817 <ul>
818 <li><a href="/help">help</a></li>
819 </ul>
820 <div class="atom-logo">
821 <a href="/atom-log/tip/a" title="subscribe to atom feed">
822 <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
823 </a>
824 </div>
825 </div>
826
827 <div class="main">
828 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
829 <h3>
830 log a @ 4:<a href="/rev/3f41bc784e7e">3f41bc784e7e</a>
831 <span class="branchname">a-branch</span>
832 </h3>
833
834 <form class="search" action="/log">
835
836 <p><input name="rev" id="search1" type="text" size="30" /></p>
837 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
838 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
839 </form>
840
841 <div class="navigate">
842 <a href="/log/4/a?patch=1&revcount=30">less</a>
843 <a href="/log/4/a?patch=1&revcount=120">more</a>
844 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div>
845
846 <table class="bigtable">
847 <thead>
848 <tr>
849 <th class="age">age</th>
850 <th class="author">author</th>
851 <th class="description">description</th>
852 </tr>
853 </thead>
854 <tbody class="stripes2">
855 <tr>
856 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
857 <td class="author">test</td>
858 <td class="description">
859 <a href="/rev/3f41bc784e7e">second a</a>
860 <span class="branchname">a-branch</span>
861 </td>
862 </tr>
863 <tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
864 <span id="l1.1" class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
865 <span id="l1.2" class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
866 <span id="l1.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.3"></a>
867 <span id="l1.4" class="plusline">+b</span><a href="#l1.4"></a></pre></div></td></tr>
868 <tr>
869 <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td>
870 <td class="author">test</td>
871 <td class="description">
872 <a href="/rev/5ed941583260">first a</a>
873 <span class="tag">a-tag</span> <span class="tag">a-bookmark</span>
874 </td>
875 </tr>
876 <tr><td colspan="3"><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
877 <span id="l1.1" class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
878 <span id="l1.2" class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
879 <span id="l1.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.3"></a>
880 <span id="l1.4" class="plusline">+a</span><a href="#l1.4"></a></pre></div></td></tr>
881
882 </tbody>
883 </table>
884
885 <div class="navigate">
886 <a href="/log/4/a?patch=1&revcount=30">less</a>
887 <a href="/log/4/a?patch=1&revcount=120">more</a>
888 | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a>
889 </div>
890
891 </div>
892 </div>
893
894
760 895
761 </body> 896 </body>
762 </html> 897 </html>
763 898
764 899