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

revert: properly revert to ancestor of p2 during merge (issue5052)...

revert: properly revert to ancestor of p2 during merge (issue5052) During merge, added (from one perspective) file can be reported as "modified". To work around that, revert was testing if modified file were present in the parent manifest and marking them as "added" in this case. However, we should be checking against the target revision manifest instead. Otherwise see file as "newly added" even if they exist in the target revision. That revert behavior regressed in 06fbd9518bc5.

Simon Heimberg - - Load All Authors

File last commit:

r19378:9de689d2 default


                r28192:cb6a952e

stable

Download file

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

      import os, __builtin__

      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

				import os, __builtin__
				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')