This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4071

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

Authored by spectral on Aug 3 2018, 4:56 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG96d0795bd0bd: resolve: graduate resolve.mark-check from experimental, add docs
Summary

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.

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

spectral created this revision.Aug 3 2018, 4:56 PM
pulkit added a subscriber: pulkit.Aug 3 2018, 5:24 PM
pulkit added inline comments.
mercurial/help/config.txt
452

I think here you mean 'none'?

spectral added inline comments.Aug 3 2018, 5:29 PM
mercurial/help/config.txt
452

No, I didn't document the `none` case explicitly. This is saying that "even if it's going to abort, adding --all will bypass the error" (this is part of the hint when it aborts, so maybe it's not useful to mention here?)

Should I remove this last sentence?

pulkit added inline comments.Aug 3 2018, 5:35 PM
mercurial/help/config.txt
452

Maybe rephrase to something like that if --all flag is passed, only warning will be shown and error won't be raised.
(I am not good at english, so feel free to decide how it is better and let me know, I will push then.)

spectral updated this revision to Diff 9866.Aug 3 2018, 6:47 PM
spectral marked an inline comment as done.Aug 3 2018, 6:48 PM
spectral added inline comments.
mercurial/help/config.txt
452

Please take another look.

pulkit accepted this revision.Aug 4 2018, 1:04 PM
pulkit added inline comments.
mercurial/configitems.py
945–946

Moved this up in order to maintain alphabetical order.

mercurial/help/config.txt
452

Fixed -all to --all in flight.

spectral marked an inline comment as done.Aug 4 2018, 1:13 PM
Closed by commit rHG96d0795bd0bd: resolve: graduate resolve.mark-check from experimental, add docs (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 5 2018, 2:24 AM
martinvonz added inline comments.
mercurial/configitems.py
197

Unrelated to this patch, but should the default be 'none` as the documentation says? It also looks like the code doesn't handle that value.

spectral marked an inline comment as done.Aug 5 2018, 4:20 AM
spectral added inline comments.
mercurial/configitems.py
197

D4121, good catch.

Revision Contents
Changeset List

Diff 9901

mercurial/commands.py

m = scmutil.match(wctx, pats, opts) m = scmutil.match(wctx, pats, opts)
ret = 0 ret = 0
didwork = False didwork = False
runconclude = False runconclude = False
tocomplete = [] tocomplete = []
hasconflictmarkers = [] hasconflictmarkers = []
if mark: if mark:
markcheck = ui.config('experimental', 'resolve.mark-check') markcheck = ui.config('commands', 'resolve.mark-check')
for f in ms: for f in ms:
if not m(f): if not m(f):
continue continue
didwork = True didwork = True
# don't let driver-resolved files be marked, and run the conclude # don't let driver-resolved files be marked, and run the conclude
# step if asked to resolve # step if asked to resolve

mercurial/configitems.py

default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('commands', 'grep.all-files', coreconfigitem('commands', 'grep.all-files',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.confirm', coreconfigitem('commands', 'resolve.confirm',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.mark-check',
default=None,
martinvonzUnsubmitted
Not Done

Unrelated to this patch, but should the default be 'none` as the documentation says? It also looks like the code doesn't handle that value.

martinvonz: Unrelated to this patch, but should the default be `'none`` as the documentation says? It also…
spectralAuthorUnsubmitted
Not Done

D4121, good catch.

spectral: D4121, good catch.
)
coreconfigitem('commands', 'show.aliasprefix', coreconfigitem('commands', 'show.aliasprefix',
default=list, default=list,
) )
coreconfigitem('commands', 'status.relative', coreconfigitem('commands', 'status.relative',
default=False, default=False,
) )
coreconfigitem('commands', 'status.skipstates', coreconfigitem('commands', 'status.skipstates',
default=[], default=[],
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('push', 'pushvars.server', coreconfigitem('push', 'pushvars.server',
default=False, default=False,
) )
coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', coreconfigitem('storage', 'revlog.optimize-delta-parent-choice',
default=True, default=True,
alias=[('format', 'aggressivemergedeltas')], alias=[('format', 'aggressivemergedeltas')],
) )
coreconfigitem('experimental', 'resolve.mark-check',
default=None,
)
coreconfigitem('server', 'bookmarks-pushkey-compat', coreconfigitem('server', 'bookmarks-pushkey-compat',
pulkitUnsubmitted
Not Done

Moved this up in order to maintain alphabetical order.

pulkit: Moved this up in order to maintain alphabetical order.
default=True, default=True,
) )
coreconfigitem('server', 'bundle1', coreconfigitem('server', 'bundle1',
default=True, default=True,
) )
coreconfigitem('server', 'bundle1gd', coreconfigitem('server', 'bundle1gd',
default=None, default=None,
) )

mercurial/help/config.txt

``commands`` ``commands``
------------ ------------
``resolve.confirm`` ``resolve.confirm``
Confirm before re-merging all unresolved files when running Confirm before re-merging all unresolved files when running
:hg:`resolve --all`. :hg:`resolve --all`.
(default: False) (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
pulkitUnsubmitted
Not Done

I think here you mean 'none'?

pulkit: I think here you mean 'none'?
spectralAuthorUnsubmitted
Not Done

No, I didn't document the `none` case explicitly. This is saying that "even if it's going to abort, adding --all will bypass the error" (this is part of the hint when it aborts, so maybe it's not useful to mention here?)

Should I remove this last sentence?

spectral: No, I didn't document the ``none`` case explicitly. This is saying that "even if it's going to…
pulkitUnsubmitted
Done

Maybe rephrase to something like that if --all flag is passed, only warning will be shown and error won't be raised.
(I am not good at english, so feel free to decide how it is better and let me know, I will push then.)

pulkit: Maybe rephrase to something like that if `--all` flag is passed, only warning will be shown and…
spectralAuthorUnsubmitted
Not Done

Please take another look.

spectral: Please take another look.
pulkitUnsubmitted
Not Done

Fixed -all to --all in flight.

pulkit: Fixed `-all` to `--all` in flight.
shown (an error will not be raised).
(default: ``none``)
``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)
``status.terse`` ``status.terse``
Default value for the --terse flag, which condenes status output. Default value for the --terse flag, which condenes status output.
(default: empty) (default: empty)

tests/test-resolve.t

$ hg merge -q --tool=internal:merge 1 $ hg merge -q --tool=internal:merge 1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
[1] [1]
$ hg resolve -l $ hg resolve -l
U file1 U file1
U file2 U file2
$ echo 'remove markers' > file1 $ 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: warning: the following files still have conflict markers:
file2 file2
abort: conflict markers detected abort: conflict markers detected
(use --all to mark anyway) (use --all to mark anyway)
[255] [255]
$ hg resolve -l $ hg resolve -l
U file1 U file1
U file2 U file2
Try with --all from the hint 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: warning: the following files still have conflict markers:
file2 file2
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
R file2 R file2
$ hg resolve --unmark $ hg resolve --unmark
$ hg resolve -l $ hg resolve -l
U file1 U file1
U file2 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: warning: the following files still have conflict markers:
file2 file2
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
R file2 R file2
If the file is already marked as resolved, we don't warn about it If the file is already marked as resolved, we don't warn about it
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ hg resolve -l $ hg resolve -l
U file1 U file1
R file2 R file2
$ hg --config experimental.resolve.mark-check=warn resolve -m $ hg --config commands.resolve.mark-check=warn resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
R file2 R file2
$ cd .. $ cd ..
====================================================== ======================================================