This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1814

rebase: add experimental.inmemory.nomergedriver to turn off IMM
AbandonedPublic

Authored by phillco on Jan 5 2018, 1:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This gives us an easy way to ensure IMM is disabled automatically if the user configures a
mergedriver script.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Jan 5 2018, 1:01 PM
phillco abandoned this revision.Jan 5 2018, 1:14 PM
durham added a subscriber: durham.Jan 5 2018, 1:14 PM
durham added inline comments.
hgext/rebase.py
812

I think we probably want IMM disabled by default if merge drivers are specified. If the merge-driver does IO during the preprocess step, it could cause problems in an IMM situation. So I don't think we can enable IMM by default in the merge-driver case until merge-driver enforces (or at least documents) that there should be no IO during preprocess.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (13 lines)

Diff 4710

hgext/rebase.py

if opts.get('continue') or opts.get('abort'): if opts.get('continue') or opts.get('abort'):
whynotimm = "--continue or --abort passed" whynotimm = "--continue or --abort passed"
# in-memory rebase cannot currently run within a parent transaction, # in-memory rebase cannot currently run within a parent transaction,
# since the restarting logic will fail the entire transaction. # since the restarting logic will fail the entire transaction.
elif repo.currenttransaction() is not None: elif repo.currenttransaction() is not None:
whynotimm = "rebase run inside a transaction" whynotimm = "rebase run inside a transaction"
# in-memory rebase can be configured not to run if a mergedriver is
# configured; this should be used only if the driver's preprocess()
# scripts might use the working copy.
#
# (Note: Even without this config, IMM will still abort if any files are
# marked by preprocess() to be driver-resolved; however, sometimes the
# preprocess() function itself can't be trusted.)
#
# TODO(phillco): Replace with decorators on the scripts themselves
elif (ui.config('experimental', 'mergedriver') and
ui.configbool('rebase', 'experimental.inmemory.nomergedriver')):
durhamUnsubmitted
Not Done

I think we probably want IMM disabled by default if merge drivers are specified. If the merge-driver does IO during the preprocess step, it could cause problems in an IMM situation. So I don't think we can enable IMM by default in the merge-driver case until merge-driver enforces (or at least documents) that there should be no IO during preprocess.

durham: I think we probably want IMM disabled by default if merge drivers are specified. If the merge…
whynotimm = 'mergedriver enabled'
if whynotimm: if whynotimm:
ui.log("rebase", "disabling IMM because: %s" % whynotimm, ui.log("rebase", "disabling IMM because: %s" % whynotimm,
why_not_imm=whynotimm) why_not_imm=whynotimm)
inmemory = False inmemory = False
if inmemory: if inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort