upstream/mercurial-mirror Files · mercurial/mergeutil.py

style: run a patched black on a subset of mercurial...

style: run a patched black on a subset of mercurial This applied black to the 20 smallest files in mercurial/: ls -S1 mercurial/*.py | tail -n20 | xargs black --skip-string-normalization Note that a few files failed to format, presumably due to a bug in my patch. The intent is to be able to compare results to D5064 with https://github.com/python/black/pull/826 applied to black. I skipped string normalization on this patch for clarity - in reality I think we'd want one pass without string normalization, followed by another to normalize strings (which is basically replacing ' with " globally.) # skip-blame mass-reformatting only Differential Revision: https://phab.mercurial-scm.org/D6342

Augie Fackler - - Load All Authors

File last commit:

r30494:c1149533 default


                r43345:57875cf4

default

Download file

             mergeutil.py
        
                    22 lines
            
             | 701 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / mergeutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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 _

      from . import (

          error,

      )

      def checkunresolved(ms):

          if list(ms.unresolved()):

              raise error.Abort(_("unresolved merge conflicts "

                                  "(see 'hg help resolve')"))

          if ms.mdstate() != 's' or list(ms.driverresolved()):

              raise error.Abort(_('driver-resolved merge conflicts'),

                                hint=_('run "hg resolve --all" to resolve'))

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# 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 _

				from . import (
				error,
				)

				def checkunresolved(ms):
				if list(ms.unresolved()):
				raise error.Abort(_("unresolved merge conflicts "
				"(see 'hg help resolve')"))
				if ms.mdstate() != 's' or list(ms.driverresolved()):
				raise error.Abort(_('driver-resolved merge conflicts'),
				hint=_('run "hg resolve --all" to resolve'))