This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1070

config: graduate experimental.updatecheck to commands.update.check
ClosedPublic

Authored by durin42 on Oct 14 2017, 3:15 AM.

Details

Reviewers
lothiraldan
indygreg
Group Reviewers
hg-reviewers
Commits
rHG23ed47a895d5: config: graduate experimental.updatecheck to commands.update.check
Summary

.. feature::

New `commands.update.check` feature to adjust constraints on when
`hg update` will allow updates with a dirty working copy.

also

.. bc::

The `experimental.updatecheck` name for the new `commands.update.check`
feature is now deprecated, and will be removed after this release.

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 14 2017, 3:15 AM
morisgi added a subscriber: morisgi.Oct 14 2017, 3:53 AM
morisgi added inline comments.
mercurial/configitems.py
182

Should it be documented in the help then?

lothiraldan requested changes to this revision.Oct 14 2017, 11:45 AM
lothiraldan added a subscriber: lothiraldan.

Could you add an alias to experimental.updatecheck so old configurations will not break. I'm not saying to keep it forever but at least have it when we change it.

+1 on documenting the option now that it's not experimental anymore

This revision now requires changes to proceed.Oct 14 2017, 11:45 AM
durin42 edited the summary of this revision. (Show Details)Oct 14 2017, 4:33 PM
durin42 updated this revision to Diff 2745.
durin42 marked an inline comment as done.Oct 14 2017, 4:40 PM

Added some docs.

In D1070#17994, @lothiraldan wrote:

Could you add an alias to experimental.updatecheck so old configurations will not break. I'm not saying to keep it forever but at least have it when we change it.
+1 on documenting the option now that it's not experimental anymore

Done.

indygreg accepted this revision.Oct 14 2017, 4:48 PM
indygreg added a subscriber: indygreg.

I'm not crazy about the code style. But since this code only lives for a release, I'm OK taking it. I'll accept this but will defer to someone else to queue it in case there are strong opinions about the style.

mercurial/hg.py
764–767

How do you feel about this alternative approach?

updatecheck = ui.config('commands', 'update.check')
if updatecheck is None:
    updatecheck = ui.config('experimental', 'updatecheck')
if updatecheck not in ('abort', ...):
    updatecheck = 'linear'
durin42 updated this revision to Diff 2749.Oct 14 2017, 4:50 PM
durin42 added inline comments.Oct 14 2017, 4:50 PM
mercurial/hg.py
764–767

Sure, that seems strictly better. Done.

indygreg accepted this revision.Oct 14 2017, 5:25 PM
Closed by commit rHG23ed47a895d5: config: graduate experimental.updatecheck to commands.update.check (authored by durin42). · Explain WhyOct 14 2017, 5:26 PM
This revision was automatically updated to reflect the committed changes.
lothiraldan added a comment.Oct 16 2017, 4:57 AM

Sorry, I was not clear, I was thinking about adding an alias in the config registration, like that:

coreconfigitem('commands', 'update.check',
    default=None,
    alias=[('experimental', 'updatecheck')]
)

Should I send a follow-up?

durin42 added a comment.Oct 16 2017, 9:50 AM

Ugh, please send a follow-up, sorry about that.

Revision Contents
Changeset List

Diff 2759

mercurial/configitems.py

default=False, default=False,
) )
coreconfigitem('commands', 'status.skipstates', coreconfigitem('commands', 'status.skipstates',
default=[], default=[],
) )
coreconfigitem('commands', 'status.verbose', coreconfigitem('commands', 'status.verbose',
default=False, default=False,
) )
coreconfigitem('commands', 'update.check',
morisgiUnsubmitted
Done

Should it be documented in the help then?

morisgi: Should it be documented in the help then?
default=None,
)
coreconfigitem('commands', 'update.requiredest', coreconfigitem('commands', 'update.requiredest',
default=False, default=False,
) )
coreconfigitem('committemplate', '.*', coreconfigitem('committemplate', '.*',
default=None, default=None,
generic=True, generic=True,
) )
coreconfigitem('debug', 'dirstate.delaywrite', coreconfigitem('debug', 'dirstate.delaywrite',
default=None, default=None,
) )
coreconfigitem('experimental', 'spacemovesdown', coreconfigitem('experimental', 'spacemovesdown',
default=False, default=False,
) )
coreconfigitem('experimental', 'treemanifest', coreconfigitem('experimental', 'treemanifest',
default=False, default=False,
) )
# Deprecated, remove after 4.4 release
coreconfigitem('experimental', 'updatecheck', coreconfigitem('experimental', 'updatecheck',
default=None, default=None,
) )
coreconfigitem('extensions', '.*', coreconfigitem('extensions', '.*',
default=None, default=None,
generic=True, generic=True,
) )
coreconfigitem('format', 'aggressivemergedeltas', coreconfigitem('format', 'aggressivemergedeltas',

mercurial/help/config.txt

``commands`` ``commands``
------------ ------------
``status.relative`` ``status.relative``
Make paths in :hg:`status` output relative to the current directory. Make paths in :hg:`status` output relative to the current directory.
(default: False) (default: False)
``update.check``
Determines what level of checking :hg:`update` will perform before moving
to a destination revision. Valid values are ``abort``, ``none``,
``linear``, and ``noconflict``. ``abort`` always fails if the working
directory has uncommitted changes. ``none`` performs no checking, and may
result in a merge with uncommitted changes. ``linear`` allows any update
as long as it follows a straight line in the revision history, and may
trigger a merge with uncommitted changes. ``noconflict`` will allow any
update which would not trigger a merge with uncommitted changes, if any
are present.
(default: ``linear``)
``update.requiredest`` ``update.requiredest``
Require that the user pass a destination when running :hg:`update`. Require that the user pass a destination when running :hg:`update`.
For example, :hg:`update .::` will be allowed, but a plain :hg:`update` For example, :hg:`update .::` will be allowed, but a plain :hg:`update`
will be disallowed. will be disallowed.
(default: False) (default: False)
``committemplate`` ``committemplate``
------------------ ------------------

mercurial/hg.py

* none: don't check (merge working directory changes into destination) * none: don't check (merge working directory changes into destination)
* linear: check that update is linear before merging working directory * linear: check that update is linear before merging working directory
changes into destination changes into destination
* noconflict: check that the update does not result in file merges * noconflict: check that the update does not result in file merges
This returns whether conflict is detected at updating or not. This returns whether conflict is detected at updating or not.
""" """
if updatecheck is None: if updatecheck is None:
updatecheck = ui.config('commands', 'update.check')
if updatecheck is None:
# pre-4.4 compat on the old spelling of this config item
updatecheck = ui.config('experimental', 'updatecheck') updatecheck = ui.config('experimental', 'updatecheck')
if updatecheck not in ('abort', 'none', 'linear', 'noconflict'): if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):
# If not configured, or invalid value configured # If not configured, or invalid value configured
updatecheck = 'linear' updatecheck = 'linear'
with repo.wlock(): with repo.wlock():
indygregUnsubmitted
Not Done

How do you feel about this alternative approach?

updatecheck = ui.config('commands', 'update.check')
if updatecheck is None:
    updatecheck = ui.config('experimental', 'updatecheck')
if updatecheck not in ('abort', ...):
    updatecheck = 'linear'
indygreg: How do you feel about this alternative approach? ``` updatecheck = ui.config('commands'…
durin42AuthorUnsubmitted
Not Done

Sure, that seems strictly better. Done.

durin42: Sure, that seems strictly better. Done.
movemarkfrom = None movemarkfrom = None
warndest = False warndest = False
if checkout is None: if checkout is None:
updata = destutil.destupdate(repo, clean=clean) updata = destutil.destupdate(repo, clean=clean)
checkout, movemarkfrom, brev = updata checkout, movemarkfrom, brev = updata
warndest = True warndest = True
if clean: if clean:

tests/test-pull-update.t

$ cd ../t $ cd ../t
$ echo 1.2 > foo $ echo 1.2 > foo
$ hg ci -Am m $ hg ci -Am m
Should respect config to disable dirty update Should respect config to disable dirty update
$ hg co -qC 0 $ hg co -qC 0
$ echo 2 > foo $ echo 2 > foo
$ hg --config experimental.updatecheck=abort pull -u ../tt $ hg --config commands.update.check=abort pull -u ../tt
pulling from ../tt pulling from ../tt
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 107cefe13e42 new changesets 107cefe13e42
abort: uncommitted changes abort: uncommitted changes

tests/test-update-branches.t

parent=1 parent=1
M foo M foo
$ revtest '-mC dirty linear' dirty 1 2 -mC $ revtest '-mC dirty linear' dirty 1 2 -mC
abort: can only specify one of -C/--clean, -c/--check, or -m/merge abort: can only specify one of -C/--clean, -c/--check, or -m/merge
parent=1 parent=1
M foo M foo
$ echo '[experimental]' >> .hg/hgrc $ echo '[commands]' >> .hg/hgrc
$ echo 'updatecheck = abort' >> .hg/hgrc $ echo 'update.check = abort' >> .hg/hgrc
$ revtest 'none dirty linear' dirty 1 2 $ revtest 'none dirty linear' dirty 1 2
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 -c $ revtest 'none dirty linear' dirty 1 2 -c
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 -C $ revtest 'none dirty linear' dirty 1 2 -C
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
$ echo 'updatecheck = none' >> .hg/hgrc $ echo 'update.check = none' >> .hg/hgrc
$ revtest 'none dirty cross' dirty 3 4 $ revtest 'none dirty cross' dirty 3 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=4 parent=4
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 $ revtest 'none dirty linear' dirty 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dirty dirty
||||||| base ||||||| base
three three
======= =======
four four
>>>>>>> destination: d047485b3896 b1 - test: 4 >>>>>>> destination: d047485b3896 b1 - test: 4
$ rm a.orig $ rm a.orig
$ echo 'updatecheck = noconflict' >> .hg/hgrc $ echo 'update.check = noconflict' >> .hg/hgrc
$ revtest 'none dirty cross' dirty 3 4 $ revtest 'none dirty cross' dirty 3 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=4 parent=4
M foo M foo
$ revtest 'none dirty linear' dirty 1 2 $ revtest 'none dirty linear' dirty 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm a.orig $ rm a.orig
Change/delete conflict is not allowed Change/delete conflict is not allowed
$ hg up -qC 3 $ hg up -qC 3
$ hg rm foo $ hg rm foo
$ hg up -q 4 $ hg up -q 4
Uses default value of "linear" when value is misspelled Uses default value of "linear" when value is misspelled
$ echo 'updatecheck = linyar' >> .hg/hgrc $ echo 'update.check = linyar' >> .hg/hgrc
$ revtest 'dirty cross' dirty 3 4 $ revtest 'dirty cross' dirty 3 4
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --clean to discard changes)
parent=3 parent=3
M foo M foo
Setup for later tests Setup for later tests