##// END OF EJS Templates
remotefilelog: remove most of the debugwait* command in the tests...
remotefilelog: remove most of the debugwait* command in the tests Since we use a dedicated developer config, we do not need them anymore. Differential Revision: https://phab.mercurial-scm.org/D7589

File last commit:

r43387:8ff1ecfa default
r44302:4f40dc19 stable
Show More
mergeutil.py
24 lines | 697 B | text/x-python | PythonLexer
Augie Fackler
checkunresolved: move to new package to help avoid import cycles...
r30494 # mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from .i18n import _
Augie Fackler
formatting: blacken the codebase...
r43346 from . import error
Augie Fackler
checkunresolved: move to new package to help avoid import cycles...
r30494
def checkunresolved(ms):
if list(ms.unresolved()):
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 _(b"unresolved merge conflicts (see 'hg help resolve')")
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ms.mdstate() != b's' or list(ms.driverresolved()):
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'driver-resolved merge conflicts'),
hint=_(b'run "hg resolve --all" to resolve'),
Augie Fackler
formatting: blacken the codebase...
r43346 )