Patchwork D4071: resolve: graduate resolve.mark-check from experimental, add docs

login
register
mail settings
Submitter phabricator
Date Aug. 3, 2018, 10:48 p.m.
Message ID <2560e8321766061c1b1ec195a4cd2028@localhost.localdomain>
Download mbox | patch
Permalink /patch/33198/
State Not Applicable
Headers show

Comments

phabricator - Aug. 3, 2018, 10:48 p.m.
spectral updated this revision to Diff 9866.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4071?vs=9833&id=9866

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

AFFECTED FILES
  mercurial/commands.py
  mercurial/configitems.py
  mercurial/help/config.txt
  tests/test-resolve.t

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -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
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -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)
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -934,7 +934,7 @@ 
     default=True,
     alias=[('format', 'aggressivemergedeltas')],
 )
-coreconfigitem('experimental', 'resolve.mark-check',
+coreconfigitem('commands', 'resolve.mark-check',
     default=None,
 )
 coreconfigitem('server', 'bookmarks-pushkey-compat',
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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