upstream/mercurial-mirror Files · tests/test-config-env.py

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Matt Harbison - - Load All Authors

File last commit:

r31857:08fbc97d default


                r32255:7e35d31b

default

Download file

             test-config-env.py
        
                    49 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-config-env.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Test the config layer generated by environment variables

      from __future__ import absolute_import, print_function

      import os

      from mercurial import (

          encoding,

          rcutil,

          ui as uimod,

          util,

      )

      testtmp = encoding.environ['TESTTMP']

      # prepare hgrc files

      def join(name):

          return os.path.join(testtmp, name)

      with open(join('sysrc'), 'w') as f:

          f.write('[ui]\neditor=e0\n[pager]\npager=p0\n')

      with open(join('userrc'), 'w') as f:

          f.write('[ui]\neditor=e1')

      # replace rcpath functions so they point to the files above

      def systemrcpath():

          return [join('sysrc')]

      def userrcpath():

          return [join('userrc')]

      rcutil.systemrcpath = systemrcpath

      rcutil.userrcpath = userrcpath

      os.path.isdir = lambda x: False # hack: do not load default.d/*.rc

      # utility to print configs

      def printconfigs(env):

          encoding.environ = env

          rcutil._rccomponents = None # reset cache

          ui = uimod.ui.load()

          for section, name, value in ui.walkconfig():

              source = ui.configsource(section, name)

              print('%s.%s=%s # %s' % (section, name, value, util.pconvert(source)))

          print('')

      # environment variable overrides

      printconfigs({})

      printconfigs({'EDITOR': 'e2', 'PAGER': 'p2'})

	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

				# Test the config layer generated by environment variables

				from __future__ import absolute_import, print_function

				import os

				from mercurial import (
				encoding,
				rcutil,
				ui as uimod,
				util,
				)

				testtmp = encoding.environ['TESTTMP']

				# prepare hgrc files
				def join(name):
				return os.path.join(testtmp, name)

				with open(join('sysrc'), 'w') as f:
				f.write('[ui]\neditor=e0\n[pager]\npager=p0\n')

				with open(join('userrc'), 'w') as f:
				f.write('[ui]\neditor=e1')

				# replace rcpath functions so they point to the files above
				def systemrcpath():
				return [join('sysrc')]

				def userrcpath():
				return [join('userrc')]

				rcutil.systemrcpath = systemrcpath
				rcutil.userrcpath = userrcpath
				os.path.isdir = lambda x: False # hack: do not load default.d/*.rc

				# utility to print configs
				def printconfigs(env):
				encoding.environ = env
				rcutil._rccomponents = None # reset cache
				ui = uimod.ui.load()
				for section, name, value in ui.walkconfig():
				source = ui.configsource(section, name)
				print('%s.%s=%s # %s' % (section, name, value, util.pconvert(source)))
				print('')

				# environment variable overrides
				printconfigs({})
				printconfigs({'EDITOR': 'e2', 'PAGER': 'p2'})