##// 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:

r38640:f4a21430 default
r38817:bb54db4a @96 default
Show More
basic_test_result.py
52 lines | 1.4 KiB | text/x-python | PythonLexer
/ tests / basic_test_result.py
from __future__ import absolute_import, print_function
import unittest
class TestResult(unittest._TextTestResult):
def __init__(self, options, *args, **kwargs):
super(TestResult, self).__init__(*args, **kwargs)
self._options = options
# unittest.TestResult didn't have skipped until 2.7. We need to
# polyfill it.
self.skipped = []
# We have a custom "ignored" result that isn't present in any Python
# unittest implementation. It is very similar to skipped. It may make
# sense to map it into skip some day.
self.ignored = []
self.times = []
self._firststarttime = None
# Data stored for the benefit of generating xunit reports.
self.successes = []
self.faildata = {}
def addFailure(self, test, reason):
print("FAILURE!", test, reason)
def addSuccess(self, test):
print("SUCCESS!", test)
def addError(self, test, err):
print("ERR!", test, err)
# Polyfill.
def addSkip(self, test, reason):
print("SKIP!", test, reason)
def addIgnore(self, test, reason):
print("IGNORE!", test, reason)
def onStart(self, test):
print("ON_START!", test)
def onEnd(self):
print("ON_END!")
def addOutputMismatch(self, test, ret, got, expected):
return False
def stopTest(self, test, interrupted=False):
super(TestResult, self).stopTest(test)