This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1787

rebase: turn off IMM if any rebased paths match a config
AcceptedPublic

Authored by phillco on Dec 28 2017, 5:35 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Summary

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Dec 28 2017, 5:35 PM
quark accepted this revision.Dec 28 2017, 5:41 PM
quark added a subscriber: quark.
quark added inline comments.
hgext/rebase.py
914

Could you make this a regular expression?

This revision is now accepted and ready to land.Dec 28 2017, 5:41 PM
phillco updated this revision to Diff 4664.Dec 28 2017, 6:13 PM
phillco updated this revision to Diff 4678.Dec 28 2017, 8:46 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (15 lines)

Diff 4663

hgext/rebase.py

For more information: For more information:
https://mercurial-scm.org/wiki/RebaseExtension https://mercurial-scm.org/wiki/RebaseExtension
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
import itertools
import os import os
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
nullid, nullid,
nullrev, nullrev,
short, short,
) )
rebasingwcp = repo['.'].rev() in rebaseset rebasingwcp = repo['.'].rev() in rebaseset
ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp)
if rebasingwcp: if rebasingwcp:
whynotimm = "wcp in rebaseset" whynotimm = "wcp in rebaseset"
ui.log("rebase", "disabling IMM because: %s" % whynotimm, ui.log("rebase", "disabling IMM because: %s" % whynotimm,
why_not_imm=whynotimm) why_not_imm=whynotimm)
return True return True
# Check for paths in the rebaseset that are likely to later trigger
# conflicts or a mergedriver run (and thus cause the whole rebase to later
# be restarted).
badpaths = ui.configlist("rebase", "experimental.inmemory_disallowed_paths")
quarkUnsubmitted
Not Done

Could you make this a regular expression?

quark: Could you make this a regular expression?
if badpaths:
rebasepaths = set(itertools.chain(*[repo[rev].files() for rev
in rebaseset]))
intersection = set(badpaths).intersection(rebasepaths)
if intersection:
whynotimm = "paths matched inmemory_disallowed_paths"
ui.log("rebase", "disabling IMM because: %s" % whynotimm,
why_not_imm=whynotimm)
return True
return False # no change return False # no change
def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None, def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None,
revf=None, destspace=None): revf=None, destspace=None):
"""use revisions argument to define destmap {srcrev: destrev}""" """use revisions argument to define destmap {srcrev: destrev}"""
if revf is None: if revf is None:
revf = [] revf = []