upstream/mercurial-mirror Files · tests/test-duplicateoptions.py

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Matt Mackall - - Load All Authors

File last commit:

r20622:352abbb0 default


                r22180:17011b36

stable

Download file

             test-duplicateoptions.py
        
                    36 lines
            
             | 964 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-duplicateoptions.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os

      from mercurial import ui, commands, extensions

      ignore = set(['highlight', 'win32text', 'factotum'])

      if os.name != 'nt':

          ignore.add('win32mbcs')

      disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore]

      hgrc = open(os.environ["HGRCPATH"], 'w')

      hgrc.write('[extensions]\n')

      for ext in disabled:

          hgrc.write(ext + '=\n')

      hgrc.close()

      u = ui.ui()

      extensions.loadall(u)

      globalshort = set()

      globallong = set()

      for option in commands.globalopts:

          option[0] and globalshort.add(option[0])

          option[1] and globallong.add(option[1])

      for cmd, entry in commands.table.iteritems():

          seenshort = globalshort.copy()

          seenlong = globallong.copy()

          for option in entry[1]:

              if (option[0] and option[0] in seenshort) or \

                 (option[1] and option[1] in seenlong):

                  print "command '" + cmd + "' has duplicate option " + str(option)

              seenshort.add(option[0])

              seenlong.add(option[1])

	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
				from mercurial import ui, commands, extensions

				ignore = set(['highlight', 'win32text', 'factotum'])

				if os.name != 'nt':
				ignore.add('win32mbcs')

				disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore]

				hgrc = open(os.environ["HGRCPATH"], 'w')
				hgrc.write('[extensions]\n')

				for ext in disabled:
				hgrc.write(ext + '=\n')

				hgrc.close()

				u = ui.ui()
				extensions.loadall(u)

				globalshort = set()
				globallong = set()
				for option in commands.globalopts:
				option[0] and globalshort.add(option[0])
				option[1] and globallong.add(option[1])

				for cmd, entry in commands.table.iteritems():
				seenshort = globalshort.copy()
				seenlong = globallong.copy()
				for option in entry[1]:
				if (option[0] and option[0] in seenshort) or \
				(option[1] and option[1] in seenlong):
				print "command '" + cmd + "' has duplicate option " + str(option)
				seenshort.add(option[0])
				seenlong.add(option[1])