Patchwork D1062: tweakdefaults: make experimental.updatecheck be `noconflict`

login
register
mail settings
Submitter phabricator
Date Oct. 13, 2017, 7:59 p.m.
Message ID <differential-rev-PHID-DREV-naoeqbhkmtowok22gnbz-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/24855/
State Superseded
Headers show

Comments

phabricator - Oct. 13, 2017, 7:59 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.
  
  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?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1062

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - Oct. 13, 2017, 10:11 p.m.
quark accepted this revision.
quark added a comment.


  It seems a good candidate of `[commands]`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1062

To: durin42, #hg-reviewers, quark
Cc: quark, mercurial-devel
phabricator - Oct. 14, 2017, 4:15 a.m.
pulkit added a comment.


  > 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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1062

To: durin42, #hg-reviewers, quark
Cc: pulkit, quark, mercurial-devel

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -54,6 +54,9 @@ 
 # Make `hg status` emit cwd-relative paths by default.
 status.relative = yes
 
+[experimental]
+updatecheck=noconflict
+
 [diff]
 git = 1
 """