upstream/mercurial-mirror Files · tests/failfilemerge.py

windows: add win32com.shell to demandimport ignore list...

windows: add win32com.shell to demandimport ignore list Module 'appdirs' tries to import win32com.shell (and catch ImportError as an indication of failure) to check whether some further functionality should be implemented one or another way [1]. Of course, demandimport lets it down, so if we want appdirs to work we have to add it to demandimport's ignore list. The reason we want appdirs to work is becuase it is used by setuptools [2] to determine egg cache location. Only fairly recent versions of setuptools depend on this so people don't see this often. [1] https://github.com/ActiveState/appdirs/blob/master/appdirs.py#L560 [2] https://github.com/pypa/setuptools/blob/aae0a928119d2a178882c32bded02270e30d0273/pkg_resources/__init__.py#L1369

Mads Kiilerich - - Load All Authors

File last commit:

r30332:318a24b5 default


                r31990:3e03a4b9

default

Download file

             failfilemerge.py
        
                    18 lines
            
             | 494 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / failfilemerge.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
spelling: fixes of non-dictionary words

              r30332
            
      # extension to emulate interrupting filemerge._filemerge

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      from __future__ import absolute_import

      from mercurial import (

        Yuya Nishihara
    
tests: sort import lines in failfilemerge.py

              r28772
            
          error,

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
          extensions,

        Yuya Nishihara
    
tests: sort import lines in failfilemerge.py

              r28772
            
          filemerge,

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
      )

      def failfilemerge(filemergefn,

        Simon Farnsworth
    
merge: use labels in prompts to the user...

              r29774
            
                        premerge, repo, mynode, orig, fcd, fco, fca, labels=None):

        timeless
    
rebase: update working directory when aborting (issue5084)

              r27988
            
          raise error.Abort("^C")

          return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

      def extsetup(ui):

          extensions.wrapfunction(filemerge, '_filemerge',

                                  failfilemerge)

	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

Mads Kiilerich spelling: fixes of non-dictionary words	r30332	# extension to emulate interrupting filemerge._filemerge
timeless rebase: update working directory when aborting (issue5084)	r27988
		from __future__ import absolute_import

		from mercurial import (
Yuya Nishihara tests: sort import lines in failfilemerge.py	r28772	error,
timeless rebase: update working directory when aborting (issue5084)	r27988	extensions,
Yuya Nishihara tests: sort import lines in failfilemerge.py	r28772	filemerge,
timeless rebase: update working directory when aborting (issue5084)	r27988	)

		def failfilemerge(filemergefn,
Simon Farnsworth merge: use labels in prompts to the user...	r29774	premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
timeless rebase: update working directory when aborting (issue5084)	r27988	raise error.Abort("^C")
		return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

		def extsetup(ui):
		extensions.wrapfunction(filemerge, '_filemerge',
		failfilemerge)