This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1062

tweakdefaults: make commands.update.check be `noconflict`
ClosedPublic

Authored by durin42 on Oct 13 2017, 3:59 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG6cd8d8203204: tweakdefaults: make commands.update.check be `noconflict`
Summary

This is the second-safest option we have to offer in updatecheck,
with abort being the safest and linear being the default. At the
sprint we discussed how much none and linear make us all
uncomfortable, and how we'd like to move the default behavior if we can.

I'm not sure we can get away with actually changing the out of the box
default behavior, but we can at *least* do this.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 13 2017, 3:59 PM
quark accepted this revision.Oct 13 2017, 6:11 PM
quark added a subscriber: quark.

It seems a good candidate of [commands].

pulkit added a subscriber: pulkit.Oct 14 2017, 12:15 AM

Open question: should we move this config knob to someplace other than
[experimental] before we put it in tweakdefaults? I think we
should. In that case, where does it move? commands.update.check?

Yes. I also think we should move this config and commands.update.check sounds good.

durin42 edited the summary of this revision. (Show Details)Oct 14 2017, 3:15 AM
durin42 retitled this revision from tweakdefaults: make experimental.updatecheck be `noconflict` to tweakdefaults: make commands.update.check be `noconflict`.
durin42 updated this revision to Diff 2728.
Closed by commit rHG6cd8d8203204: tweakdefaults: make commands.update.check be `noconflict` (authored by durin42). · Explain WhyOct 14 2017, 11:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (2 lines)

Diff 2761

mercurial/ui.py

tweakrc = """ tweakrc = """
[ui] [ui]
# The rollback command is dangerous. As a rule, don't use it. # The rollback command is dangerous. As a rule, don't use it.
rollback = False rollback = False
[commands] [commands]
# Make `hg status` emit cwd-relative paths by default. # Make `hg status` emit cwd-relative paths by default.
status.relative = yes status.relative = yes
# Refuse to perform an `hg update` that would cause a file content merge
update.check = noconflict
[diff] [diff]
git = 1 git = 1
""" """
samplehgrcs = { samplehgrcs = {
'user': 'user':
b"""# example user config (see 'hg help config' for more info) b"""# example user config (see 'hg help config' for more info)