Wed, 18 Feb 2015 16:45:16 -0800 error.LookupError: rename 'message' property to something else
Siddharth Agarwal <sid0@fb.com> [Wed, 18 Feb 2015 16:45:16 -0800] rev 24137
error.LookupError: rename 'message' property to something else At least some installs of Python 2.6+ complain with: mercurial/error.py:26: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6 This patch renames the property away from 'message' so that Python no longer complains.
Thu, 19 Feb 2015 19:32:06 +0800 hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru> [Thu, 19 Feb 2015 19:32:06 +0800] rev 24136
hgweb: use introrev() for finding parents (issue4506) The issue is titled "filtered revision 'XXX' (not in 'served' subset)" and that is the error message you sometimes get when trying to look at a file (/file or /annotate) in hgweb. For example: http://hg.intevation.org/mercurial/crew/file/90cf454edd70/mercurial/cmdutil.py This happens when a parent revision for a file is hidden, thus it is not 'served' and isn't accessible in hgweb by default. When hgweb tries to access such changeset, it produces the error and HTTP status code 404. Another detail is that the parents() function, that is used in multiple places in hgweb, sometimes returned changesets that were obsoleted by the current changeset for the file. For example, when using rebase with evolve and rebasing a divergent changeset that introduces a file on top of current branch. Or grafting a change and making the new grafted changeset obsolete the source (shown in the test case). The result is the same - the obsoleted changeset was mistakingly returned from parents(), even though it's not a parent and the only link to the new changeset is an obsoletion marker (and rebase/graft metadata? not sure it matters). The problem is fixed by using introrev() instead of linkrev() for finding parents. This prevents parents() function from returning unrelated obsolete changesets. The test case prepares a separate repo because (afaict) all other test cases never reuse file names, so there are no files that were changed in multiple changesets. So no previously available files have obsolete changesets in their history.
Sun, 08 Feb 2015 00:56:40 -0500 subrepo: drop unused pattern initialization in hgsubrepo revert
Matt Harbison <matt_harbison@yahoo.com> [Sun, 08 Feb 2015 00:56:40 -0500] rev 24135
subrepo: drop unused pattern initialization in hgsubrepo revert This passed an empty list to filerevert() if '--all' was specified, otherwise the set of modified files. But then filerevert() immediately switched this and reinitialized 'pats' to an empty list if '--all' was *not* specified.
Sat, 07 Feb 2015 21:47:28 -0500 revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Feb 2015 21:47:28 -0500] rev 24134
revert: display full subrepo output with --dry-run Since the point of --dry-run is to show what will happen, the output with and without it should agree. And since revert wasn't being called on subrepos with --dry-run before, revert in the subrepo had to be defanged in this case.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 tip