[PATCH] rebase: turn rebase revs into set before filtering obsolete

Yuya Nishihara yuya at tcha.org
Tue Jul 19 09:23:30 EDT 2016


On Tue, 19 Jul 2016 03:39:43 -0700, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar at fb.com>
> # Date 1468924193 25200
> #      Tue Jul 19 03:29:53 2016 -0700
> # Branch stable
> # Node ID 39ca6ff7183e4a42fea832e0fedfe65de9b70ffa
> # Parent  02a8fea4289b51992b2495a06d4b12cbda876cf1
> rebase: turn rebase revs into set before filtering obsolete
> 
> When the inhibit extension from mutable-history is enabled, it attempts to
> iterate over the rebaseset to prevent the nodes being rebased from being
> marked obsolete. This happens at the same time as rebase's
> _filterobsoleterevs function trying to iterate over the rebaseset to figure
> out which ones are obsolete. The two of these iterating over the same
> revset generatorset cause a 'generator already executing' exception. This is
> probably a flaw in the revset implementation, since iterating over the same
> set twice should be supported.

Perhaps, revset, repoview or obsolete?

The fix is simple enough for stable. Queued, thanks.


More information about the Mercurial-devel mailing list