upstream/mercurial-mirror Files · contrib/casesmash.py

merge: do the trivial resolution after updating sparse checkout...

merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

Pulkit Goyal - - Load All Authors

File last commit:

r28351:42a7301f default


                r39017:d49e490a

@94 stable

Download file

             casesmash.py
        
                    38 lines
            
             | 938 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / casesmash.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import __builtin__

      import os

      from mercurial import (

          util,

      )

      def lowerwrap(scope, funcname):

          f = getattr(scope, funcname)

          def wrap(fname, *args, **kwargs):

              d, base = os.path.split(fname)

              try:

                  files = os.listdir(d or '.')

              except OSError:

                  files = []

              if base in files:

                  return f(fname, *args, **kwargs)

              for fn in files:

                  if fn.lower() == base.lower():

                      return f(os.path.join(d, fn), *args, **kwargs)

              return f(fname, *args, **kwargs)

          scope.__dict__[funcname] = wrap

      def normcase(path):

          return path.lower()

      os.path.normcase = normcase

      for f in 'file open'.split():

          lowerwrap(__builtin__, f)

      for f in "chmod chown open lstat stat remove unlink".split():

          lowerwrap(os, f)

      for f in "exists lexists".split():

          lowerwrap(os.path, f)

      lowerwrap(util, 'posixfile')

	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

				from __future__ import absolute_import
				import __builtin__
				import os
				from mercurial import (
				util,
				)

				def lowerwrap(scope, funcname):
				f = getattr(scope, funcname)
				def wrap(fname, args, *kwargs):
				d, base = os.path.split(fname)
				try:
				files = os.listdir(d or '.')
				except OSError:
				files = []
				if base in files:
				return f(fname, args, *kwargs)
				for fn in files:
				if fn.lower() == base.lower():
				return f(os.path.join(d, fn), args, *kwargs)
				return f(fname, args, *kwargs)
				scope.__dict__[funcname] = wrap

				def normcase(path):
				return path.lower()

				os.path.normcase = normcase

				for f in 'file open'.split():
				lowerwrap(__builtin__, f)

				for f in "chmod chown open lstat stat remove unlink".split():
				lowerwrap(os, f)

				for f in "exists lexists".split():
				lowerwrap(os.path, f)

				lowerwrap(util, 'posixfile')