merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 07 May 2015 14:19:20 -0500
changeset 24957 17ba4ccd20b4
parent 24956 48583a1e44f3 (current diff)
parent 24952 169d2470d283 (diff)
child 24961 8d81b36fa6ce
merge with stable
--- a/mercurial/templates/paper/shortlog.tmpl	Tue May 05 08:40:59 2015 -0700
+++ b/mercurial/templates/paper/shortlog.tmpl	Thu May 07 14:19:20 2015 -0500
@@ -80,7 +80,7 @@
                 var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
                 return m ? m[1] : null;
             },
-            '.bigtable > tbody:nth-of-type(2)',
+            '.bigtable > tbody',
             '<tr class="%class%">\\
             <td colspan="3" style="text-align: center;">%text%</td>\\
             </tr>'
--- a/tests/test-hgweb-commands.t	Tue May 05 08:40:59 2015 -0700
+++ b/tests/test-hgweb-commands.t	Thu May 07 14:19:20 2015 -0500
@@ -797,7 +797,7 @@
                   var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
                   return m ? m[1] : null;
               },
-              '.bigtable > tbody:nth-of-type(2)',
+              '.bigtable > tbody',
               '<tr class="%class%">\
               <td colspan="3" style="text-align: center;">%text%</td>\
               </tr>'
--- a/tests/test-hgweb-empty.t	Tue May 05 08:40:59 2015 -0700
+++ b/tests/test-hgweb-empty.t	Thu May 07 14:19:20 2015 -0500
@@ -99,7 +99,7 @@
                   var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
                   return m ? m[1] : null;
               },
-              '.bigtable > tbody:nth-of-type(2)',
+              '.bigtable > tbody',
               '<tr class="%class%">\
               <td colspan="3" style="text-align: center;">%text%</td>\
               </tr>'
@@ -210,7 +210,7 @@
                   var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
                   return m ? m[1] : null;
               },
-              '.bigtable > tbody:nth-of-type(2)',
+              '.bigtable > tbody',
               '<tr class="%class%">\
               <td colspan="3" style="text-align: center;">%text%</td>\
               </tr>'