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

setup: fix the py2exe logic to work with py3...

setup: fix the py2exe logic to work with py3 TortoiseHg still uses (the modernized) py2exe packaging, but the build was failing since `py2exe.Distribution` was removed. One thing to note is that later in this module, there's a hack to include `distutils` when building from a virtualenv. While `import distutils` works in `hg debugshell` when built with py2, it doesn't work in py3. I'm not sure why- I don't see it in `library.zip` either. It doesn't seem to break anything though. Differential Revision: https://phab.mercurial-scm.org/D12553

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r49946:11fc5d8a

default

Download file

             mergeutil.py
        
                    18 lines
            
             | 463 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / mergeutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
checkunresolved: move to new package to help avoid import cycles...

              r30494
            
      # mergeutil.py - help for merge processing in mercurial

      #

        Raphaël Gomès
    
contributor: change mentions of mpm to olivia...

              r47575
            
      # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>

        Augie Fackler
    
checkunresolved: move to new package to help avoid import cycles...

              r30494
            
      #

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

        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):

        Augie Fackler
    
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))...

              r47070
            
          if ms.unresolvedcount():

        Martin von Zweigbergk
    
errors: raise StateError when there are unresolves merge conflicts...

              r46528
            
              raise error.StateError(

        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
            
              )

	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

Augie Fackler checkunresolved: move to new package to help avoid import cycles...	r30494	# mergeutil.py - help for merge processing in mercurial
		#
Raphaël Gomès contributor: change mentions of mpm to olivia...	r47575	# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
Augie Fackler checkunresolved: move to new package to help avoid import cycles...	r30494	#
		# 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 _

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):
Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))...	r47070	if ms.unresolvedcount():
Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts...	r46528	raise error.StateError(
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	)