comparison hgext/inhibit.py @ 1588:983f2e4dbe5d

inhibit: fix compat with rebaseskipobsolete

We wrap _computeobsoletenotrebased and _clearrebased to fix the following case:
- Assuming that we have markers from revisions of  the rebase set and
  destination set and that these markers are inhibited
- At the end of the rebase the nodes are still visible because rebase operate
  without inhibition and skip these nodes
Had we not have those markers to begin with the revisions could be hidden at
the end of the rebase.
We keep track in repo._obsoletenotrebased of the obsolete commits skipped by
the rebase and lift the inhibition at the end of the rebase.
We add three test cases to make sure that the edge cases are covered.

1587:ea7523380efa

    def inhibitposttransaction(transaction):
        # At the end of the transaction we catch all the new visible and
        # obsolete commit to inhibit them
        visibleobsolete = repo.revs('obsolete() - hidden()')
        ignoreset = set(getattr(repo, '_rebaseset', []))
        visibleobsolete = list(r for r in visibleobsolete if r not in ignoreset)
        if visibleobsolete:
            _inhibitmarkers(repo, [repo[r].node() for r in visibleobsolete])
    transaction = orig(repo, desc, *args, **kwargs)
    if desc != 'strip' and _inhibitenabled(repo):
        transaction.addpostclose('inhibitposttransaction',
                                 inhibitposttransaction)
    return transaction

def extsetup(ui):
    # lets wrap the computation of the obsolete set
    # We apply inhibition there
    obsfunc = obsolete.cachefuncs['obsolete']

        if rebase:
            if util.safehasattr(rebase, '_filterobsoleterevs'):
                extensions.wrapfunction(rebase,
                                        '_filterobsoleterevs',
                                        _filterobsoleterevswrap)
    except KeyError:
        pass
    # There are two ways to save bookmark changes during a transation, we
    # wrap both to add inhibition markers.
    extensions.wrapfunction(bookmarks.bmstore, 'recordchange', _bookmarkchanged)

1588:983f2e4dbe5d

    def inhibitposttransaction(transaction):
        # At the end of the transaction we catch all the new visible and
        # obsolete commit to inhibit them
        visibleobsolete = repo.revs('obsolete() - hidden()')
        ignoreset = set(getattr(repo, '_rebaseset', []))
        ignoreset |= set(getattr(repo, '_obsoletenotrebased', []))
        visibleobsolete = list(r for r in visibleobsolete if r not in ignoreset)
        if visibleobsolete:
            _inhibitmarkers(repo, [repo[r].node() for r in visibleobsolete])
    transaction = orig(repo, desc, *args, **kwargs)
    if desc != 'strip' and _inhibitenabled(repo):
        transaction.addpostclose('inhibitposttransaction',
                                 inhibitposttransaction)
    return transaction


# We wrap these two functions to address the following scenario:
# - Assuming that we have markers between commits in the rebase set and
#   destination and that these markers are inhibited
# - At the end of the rebase the nodes are still visible because rebase operate
#   without inhibition and skip these nodes
# We keep track in repo._obsoletenotrebased of the obsolete commits skipped by
# the rebase and lift the inhibition in the end of the rebase.

def _computeobsoletenotrebased(orig, repo, *args, **kwargs):
    r = orig(repo, *args, **kwargs)
    repo._obsoletenotrebased = r.keys()
    return r

def _clearrebased(orig, ui, repo, *args, **kwargs):
    r = orig(ui, repo, *args, **kwargs)
    tonode = repo.changelog.node
    if util.safehasattr(repo, '_obsoletenotrebased'):
        _deinhibitmarkers(repo, [tonode(k) for k in repo._obsoletenotrebased])
    return r


def extsetup(ui):
    # lets wrap the computation of the obsolete set
    # We apply inhibition there
    obsfunc = obsolete.cachefuncs['obsolete']

        if rebase:
            if util.safehasattr(rebase, '_filterobsoleterevs'):
                extensions.wrapfunction(rebase,
                                        '_filterobsoleterevs',
                                        _filterobsoleterevswrap)
            extensions.wrapfunction(rebase, 'clearrebased', _clearrebased)
            if util.safehasattr(rebase, '_computeobsoletenotrebased'):
                extensions.wrapfunction(rebase,
                                        '_computeobsoletenotrebased',
                                        _computeobsoletenotrebased)

    except KeyError:
        pass
    # There are two ways to save bookmark changes during a transation, we
    # wrap both to add inhibition markers.
    extensions.wrapfunction(bookmarks.bmstore, 'recordchange', _bookmarkchanged)