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

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r49404:c9141848

default

Download file

             casesmash.py
        
                    41 lines
            
             | 934 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')