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

typing: restore `encoding.encoding` and `encoding.encodingmode` to bytes...

typing: restore `encoding.encoding` and `encoding.encodingmode` to bytes Somewhere between hg and hg 8e3f6b5bf720, pytype determined the signature of these fields changed from `bytes` to `Any`. Not sure why- the type of `environ` then and now is: `Union[WindowsEnviron, Dict[bytes, bytes], os._Environ[bytes]]` That said, PyCharm wasn't able to figure out the type of `environ`, and the `WindowsEnviron` class extends `MutableMapping` without specifying bytes for the key and value types in py3.9. But that's not changed in my setup, so I can't explain it.

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r52566:f70f61a8

default

Download file

             mergeutil.py
        
                    18 lines
            
             | 463 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 Olivia Mackall <olivia@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 .i18n import _

      from . import error

      def checkunresolved(ms):

          if ms.unresolvedcount():

              raise error.StateError(

                  _(b"unresolved merge conflicts (see 'hg help 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 Olivia Mackall <olivia@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 .i18n import _

				from . import error


				def checkunresolved(ms):
				if ms.unresolvedcount():
				raise error.StateError(
				_(b"unresolved merge conflicts (see 'hg help resolve')")
				)