Mercurial > public > mercurial-scm > hg
comparison tests/test-hgweb-commands.t @ 13868:38906cf9d15c
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Apr 2011 08:26:08 -0500 |
parents | b51bf961b3cb fd8a6ca3a750 |
children | 4788923a2b33 |
comparison
equal
deleted
inserted
replaced
13867:28f557e8b419 | 13868:38906cf9d15c |
---|---|
638 summary | | 638 summary | |
639 <a href="/shortlog?style=gitweb">shortlog</a> | | 639 <a href="/shortlog?style=gitweb">shortlog</a> | |
640 <a href="/log?style=gitweb">changelog</a> | | 640 <a href="/log?style=gitweb">changelog</a> | |
641 <a href="/graph?style=gitweb">graph</a> | | 641 <a href="/graph?style=gitweb">graph</a> | |
642 <a href="/tags?style=gitweb">tags</a> | | 642 <a href="/tags?style=gitweb">tags</a> | |
643 <a href="/bookmarks?style=gitweb">bookmarks</a> | | |
643 <a href="/branches?style=gitweb">branches</a> | | 644 <a href="/branches?style=gitweb">branches</a> | |
644 <a href="/file/1d22e65f027e?style=gitweb">files</a> | | 645 <a href="/file/1d22e65f027e?style=gitweb">files</a> | |
645 <a href="/help?style=gitweb">help</a> | 646 <a href="/help?style=gitweb">help</a> |
646 <br/> | 647 <br/> |
647 </div> | 648 </div> |
660 <td class="age"><i>1970-01-01</i></td> | 661 <td class="age"><i>1970-01-01</i></td> |
661 <td><i>test</i></td> | 662 <td><i>test</i></td> |
662 <td> | 663 <td> |
663 <a class="list" href="/rev/1d22e65f027e?style=gitweb"> | 664 <a class="list" href="/rev/1d22e65f027e?style=gitweb"> |
664 <b>branch</b> | 665 <b>branch</b> |
665 <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> </span> | 666 <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> <span class="bookmarktag" title="something">something</span> </span> |
666 </a> | 667 </a> |
667 </td> | 668 </td> |
668 <td class="link" nowrap> | 669 <td class="link" nowrap> |
669 <a href="/rev/1d22e65f027e?style=gitweb">changeset</a> | | 670 <a href="/rev/1d22e65f027e?style=gitweb">changeset</a> | |
670 <a href="/file/1d22e65f027e?style=gitweb">files</a> | 671 <a href="/file/1d22e65f027e?style=gitweb">files</a> |
790 <a href="/summary?style=gitweb">summary</a> | | 791 <a href="/summary?style=gitweb">summary</a> | |
791 <a href="/shortlog?style=gitweb">shortlog</a> | | 792 <a href="/shortlog?style=gitweb">shortlog</a> | |
792 <a href="/log/2?style=gitweb">changelog</a> | | 793 <a href="/log/2?style=gitweb">changelog</a> | |
793 graph | | 794 graph | |
794 <a href="/tags?style=gitweb">tags</a> | | 795 <a href="/tags?style=gitweb">tags</a> | |
796 <a href="/bookmarks?style=gitweb">bookmarks</a> | | |
795 <a href="/branches?style=gitweb">branches</a> | | 797 <a href="/branches?style=gitweb">branches</a> | |
796 <a href="/file/1d22e65f027e?style=gitweb">files</a> | | 798 <a href="/file/1d22e65f027e?style=gitweb">files</a> | |
797 <a href="/help?style=gitweb">help</a> | 799 <a href="/help?style=gitweb">help</a> |
798 <br/> | 800 <br/> |
799 <a href="/graph/2?style=gitweb&revcount=30">less</a> | 801 <a href="/graph/2?style=gitweb&revcount=30">less</a> |
851 item = item.replace(/_DESC/, cur[3]); | 853 item = item.replace(/_DESC/, cur[3]); |
852 item = item.replace(/_USER/, cur[4]); | 854 item = item.replace(/_USER/, cur[4]); |
853 item = item.replace(/_DATE/, cur[5]); | 855 item = item.replace(/_DATE/, cur[5]); |
854 | 856 |
855 var tagspan = ''; | 857 var tagspan = ''; |
856 if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) { | 858 if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) { |
857 tagspan = '<span class="logtags">'; | 859 tagspan = '<span class="logtags">'; |
858 if (cur[6][1]) { | 860 if (cur[6][1]) { |
859 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; | 861 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; |
860 tagspan += cur[6][0] + '</span> '; | 862 tagspan += cur[6][0] + '</span> '; |
861 } else if (!cur[6][1] && cur[6][0] != 'default') { | 863 } else if (!cur[6][1] && cur[6][0] != 'default') { |
864 } | 866 } |
865 if (cur[7].length) { | 867 if (cur[7].length) { |
866 for (var t in cur[7]) { | 868 for (var t in cur[7]) { |
867 var tag = cur[7][t]; | 869 var tag = cur[7][t]; |
868 tagspan += '<span class="tagtag">' + tag + '</span> '; | 870 tagspan += '<span class="tagtag">' + tag + '</span> '; |
871 } | |
872 } | |
873 if (cur[8].length) { | |
874 for (var t in cur[8]) { | |
875 var bookmark = cur[8][t]; | |
876 tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; | |
869 } | 877 } |
870 } | 878 } |
871 tagspan += '</span>'; | 879 tagspan += '</span>'; |
872 } | 880 } |
873 | 881 |