Mercurial > hg-stable
changeset 38896:96d0795bd0bd
resolve: graduate resolve.mark-check from experimental, add docs
Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.
Differential Revision: https://phab.mercurial-scm.org/D4071
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 03 Aug 2018 12:57:44 -0700 |
| parents | a01200b25da6 |
| children | e9740c07158d |
| files | mercurial/commands.py mercurial/configitems.py mercurial/help/config.txt tests/test-resolve.t |
| diffstat | 4 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Apr 16 23:49:38 2018 -0700 +++ b/mercurial/commands.py Fri Aug 03 12:57:44 2018 -0700 @@ -4603,7 +4603,7 @@ tocomplete = [] hasconflictmarkers = [] if mark: - markcheck = ui.config('experimental', 'resolve.mark-check') + markcheck = ui.config('commands', 'resolve.mark-check') for f in ms: if not m(f): continue
--- a/mercurial/configitems.py Mon Apr 16 23:49:38 2018 -0700 +++ b/mercurial/configitems.py Fri Aug 03 12:57:44 2018 -0700 @@ -193,6 +193,9 @@ coreconfigitem('commands', 'resolve.confirm', default=False, ) +coreconfigitem('commands', 'resolve.mark-check', + default=None, +) coreconfigitem('commands', 'show.aliasprefix', default=list, ) @@ -940,9 +943,6 @@ default=True, alias=[('format', 'aggressivemergedeltas')], ) -coreconfigitem('experimental', 'resolve.mark-check', - default=None, -) coreconfigitem('server', 'bookmarks-pushkey-compat', default=True, )
--- a/mercurial/help/config.txt Mon Apr 16 23:49:38 2018 -0700 +++ b/mercurial/help/config.txt Fri Aug 03 12:57:44 2018 -0700 @@ -443,6 +443,16 @@ :hg:`resolve --all`. (default: False) +``resolve.mark-check`` + Determines what level of checking :hg:`resolve --mark` will perform before + marking files as resolved. Valid values are ``none`, ``warn``, and + ``abort``. ``warn`` will output a warning listing the file(s) that still + have conflict markers in them, but will still mark everything resolved. + ``abort`` will output the same warning but will not mark things as resolved. + If --all is passed and this is set to ``abort``, only a warning will be + shown (an error will not be raised). + (default: ``none``) + ``status.relative`` Make paths in :hg:`status` output relative to the current directory. (default: False)
--- a/tests/test-resolve.t Mon Apr 16 23:49:38 2018 -0700 +++ b/tests/test-resolve.t Fri Aug 03 12:57:44 2018 -0700 @@ -383,7 +383,7 @@ U file1 U file2 $ echo 'remove markers' > file1 - $ hg --config experimental.resolve.mark-check=abort resolve -m + $ hg --config commands.resolve.mark-check=abort resolve -m warning: the following files still have conflict markers: file2 abort: conflict markers detected @@ -393,7 +393,7 @@ U file1 U file2 Try with --all from the hint - $ hg --config experimental.resolve.mark-check=abort resolve -m --all + $ hg --config commands.resolve.mark-check=abort resolve -m --all warning: the following files still have conflict markers: file2 (no more unresolved files) @@ -404,7 +404,7 @@ $ hg resolve -l U file1 U file2 - $ hg --config experimental.resolve.mark-check=warn resolve -m + $ hg --config commands.resolve.mark-check=warn resolve -m warning: the following files still have conflict markers: file2 (no more unresolved files) @@ -416,7 +416,7 @@ $ hg resolve -l U file1 R file2 - $ hg --config experimental.resolve.mark-check=warn resolve -m + $ hg --config commands.resolve.mark-check=warn resolve -m (no more unresolved files) $ hg resolve -l R file1