We imported pushlog into version-control-tools as part of bug 1065041 earlier today. The next step is to hook up its tests to run-mercurial-tests.py so test coverage runs automatically and with little effort.

/r/173 - testing: add silentestrunner.py from Mercurial /r/174 - pushlog: use templates from local repository /r/175 - pushlog: don't use simplejson /r/176 - pushlog: move tests file into tests/ subdirectory (bug 1074491) /r/177 - pushlog: update tests to work in Mercurial testing mode (bug 1074491) Pull down these commits: hg pull review -r bb147fa8d2cac2a32e0befc1a1843f8698e29c0d

/r/174 - pushlog: use templates from local repository /r/175 - pushlog: don't use simplejson /r/176 - pushlog: move tests file into tests/ subdirectory (bug 1074491) /r/177 - pushlog: update tests to work in Mercurial testing mode (bug 1074491) /r/173 - hgtemplates: use proper CDATA syntax /r/178 - pushlog: add better tests for HTML output /r/179 - pushlog: unbust branch display (bug 1071296) Pull down these commits: hg pull review -r e15a58ec17f31fc10d1097e447989a2384a64840

The pushlog tests were previously attempting to clone templates for a separate repository. Since templates are in the same repository as pushlog now, we can just code in the relative path to them. The new code is simpler and always works.

simplejson was required back in the days before Python shipped with a decent json package. Those days are over (json was added in Python 2.6). This patch removes simplejson in favor of the built-in json package.

The pushlog hgweb tests will be integrated with the Mercurial test runner. To prepare for this, we move runtests.py into a location where the test runner will automatically discover it. Tests currently fail due to the changed location.

This patch modifies the pushlog tests to work in the context of Mercurial's test harness. This pretty much boils down to using a different test runner to execute the tests so that tests don't spam output. While we were here, some dead code dealing with Python < 2.6 has been removed.

The CDATA syntax in the pushlog HTML template wasn't proper. By the magic of lenient browser parsers, this was somehow not causing breakage.

Comment on attachment 8502881 [details] [diff] [review] pushlog: update tests to work in Mercurial testing mode () Review of attachment 8502881 [details] [diff] [review]: ----------------------------------------------------------------- r+ as long as '+ os.path.join(here, '..', '..', '..', 'hgtemplates')))' is found to be the right path to HG templates.

8502881 also needs to make sure the silenttestrunner library is also present

Comment on attachment 8502879 [details] [diff] [review] pushlog: don't use simplejson Review of attachment 8502879 [details] [diff] [review]: ----------------------------------------------------------------- r+, straightforward

Comment on attachment 8502880 [details] [diff] [review] pushlog: move tests file into tests/ subdirectory () new location works

Having trouble logging into reviewboard to review the first attachment. Will update when problem is fixed.

I landed these 5 patches. 92fa6ac042cb::2571437fb159 Ignore the RB review. RB is busted.

/r/174 - pushlog: use templates from local repository /r/175 - pushlog: don't use simplejson /r/176 - pushlog: move tests file into tests/ subdirectory (bug 1074491) /r/177 - pushlog: update tests to work in Mercurial testing mode (bug 1074491) /r/173 - hgtemplates: use proper CDATA syntax /r/178 - pushlog: add better tests for HTML output /r/179 - pushlog: unbust branch display (bug 1071296) Pull down these commits: hg pull review -r e15a58ec17f31fc10d1097e447989a2384a64840