##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r37961:32bc3815 default
r38817:bb54db4a @96 default
Show More
test-ui-color.py
40 lines | 1023 B | text/x-python | PythonLexer
Pulkit Goyal
tests: make test-ui-color use absolute_import
r28915 from __future__ import absolute_import, print_function
Simon Heimberg
cleanup: remove unused imports...
r19322 import os
Pulkit Goyal
tests: make test-ui-color use absolute_import
r28915 from mercurial import (
dispatch,
ui as uimod,
)
Augie Fackler
tests: port test-ui-color.py to Python 3...
r37944 from mercurial.utils import (
stringutil,
)
Brodie Rao
color: call correct superclass method in write_err...
r11732
# ensure errors aren't buffered
Pierre-Yves David
color: drop the 'colorui' class...
r31095 testui = uimod.ui()
Brodie Rao
color: call correct superclass method in write_err...
r11732 testui.pushbuffer()
Pulkit Goyal
py3: add b'' to test-ui-color.py...
r36354 testui.write((b'buffered\n'))
testui.warn((b'warning\n'))
testui.write_err(b'error\n')
Yuya Nishihara
stringutil: flip the default of pprint() to bprefix=False...
r37961 print(stringutil.pprint(testui.popbuffer(), bprefix=True).decode('ascii'))
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516
# test dispatch.dispatch with the same ui object
Pulkit Goyal
py3: make sure we open file in bytes mode...
r36355 hgrc = open(os.environ["HGRCPATH"], 'wb')
Pulkit Goyal
py3: add b'' to test-ui-color.py...
r36354 hgrc.write(b'[extensions]\n')
hgrc.write(b'color=\n')
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516 hgrc.close()
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
r30559 ui_ = uimod.ui.load()
Pulkit Goyal
py3: add b'' to test-ui-color.py...
r36354 ui_.setconfig(b'ui', b'formatted', b'True')
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516
Idan Kamara
ui: use I/O descriptors internally...
r14614 # we're not interested in the output, so write that to devnull
Pulkit Goyal
py3: make sure we open file in bytes mode...
r36355 ui_.fout = open(os.devnull, 'wb')
Idan Kamara
ui: use I/O descriptors internally...
r14614
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516 # call some arbitrary command just so we go through
# color's wrapped _runcommand twice.
def runcmd():
Pulkit Goyal
py3: add b'' to test-ui-color.py...
r36354 dispatch.dispatch(dispatch.request([b'version', b'-q'], ui_))
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516
runcmd()
Pierre-Yves David
color: drop the 'colorui' class...
r31095 print("colored? %s" % (ui_._colormode is not None))
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516 runcmd()
Pierre-Yves David
color: drop the 'colorui' class...
r31095 print("colored? %s" % (ui_._colormode is not None))