Mercurial: mercurial/mergeutil.py annotate

annotate mercurial/mergeutil.py @ 45119:19748c73c208

manifest: use the same logic for handling flags in _parse as elsewhere Differential Revision: https://phab.mercurial-scm.org/D8684

author	Joerg Sonnenberger <joerg@bec.de>
date	Mon, 06 Jul 2020 14:49:19 +0200
parents	8ff1ecfadcd1
children	32ce4cbaec4b

rev	line source
30494 c1149533676b checkunresolved: move to new package to help avoid import cycles Augie Fackler <augie@google.com> parents: 30493 diff changeset	1 # mergeutil.py - help for merge processing in mercurial
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10249 diff changeset	6 # GNU General Public License version 2 or any later version.
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	7
28322 ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	8 from __future__ import absolute_import
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	9
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	10 from .i18n import _
ebd0e86bdf89 cmdutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 28313 diff changeset	11
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 30494 diff changeset	12 from . import error
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 30494 diff changeset	13
19211 3bfd7f1e7485 summary: augment output with info from extensions Bryan O'Sullivan <bryano@fb.com> parents: 19129 diff changeset	14
30272 3d38a0bc774f cmdutil: refactor checkunresolved timeless <timeless@mozdev.org> parents: 30182 diff changeset	15 def checkunresolved(ms):
3d38a0bc774f cmdutil: refactor checkunresolved timeless <timeless@mozdev.org> parents: 30182 diff changeset	16 if list(ms.unresolved()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 30494 diff changeset	17 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43077 diff changeset	18 _(b"unresolved merge conflicts (see 'hg help resolve')")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 30494 diff changeset	19 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	20 if ms.mdstate() != b's' or list(ms.driverresolved()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 30494 diff changeset	21 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	22 _(b'driver-resolved merge conflicts'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	23 hint=_(b'run "hg resolve --all" to resolve'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 30494 diff changeset	24 )

Mercurial > hg

annotate mercurial/mergeutil.py @ 45119:19748c73c208