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

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Matt Mackall - - Load All Authors

File last commit:

r20622:352abbb0 default


                r28189:fac3a24b

default

Download file

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

        Idan Kamara
    
tests: add a test to check for duplicate command options

              r14449
            
      import os

      from mercurial import ui, commands, extensions

        Matt Mackall
    
extensions: remove the inotify extension (BC)...

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

        Idan Kamara
    
tests: add a test to check for duplicate command options

              r14449
            
      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)

        Simon Heimberg
    
test: test for options duplicate with global options...

              r15099
            
      globalshort = set()

      globallong = set()

      for option in commands.globalopts:

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

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

        Idan Kamara
    
tests: add a test to check for duplicate command options

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

        Simon Heimberg
    
test: test for options duplicate with global options...

              r15099
            
          seenshort = globalshort.copy()

          seenlong = globallong.copy()

        Idan Kamara
    
tests: add a test to check for duplicate command options

              r14449
            
          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

Idan Kamara tests: add a test to check for duplicate command options	r14449	import os
		from mercurial import ui, commands, extensions

Matt Mackall extensions: remove the inotify extension (BC)...	r20622	ignore = set(['highlight', 'win32text', 'factotum'])
Idan Kamara tests: add a test to check for duplicate command options	r14449
		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)

Simon Heimberg test: test for options duplicate with global options...	r15099	globalshort = set()
		globallong = set()
		for option in commands.globalopts:
		option[0] and globalshort.add(option[0])
		option[1] and globallong.add(option[1])

Idan Kamara tests: add a test to check for duplicate command options	r14449	for cmd, entry in commands.table.iteritems():
Simon Heimberg test: test for options duplicate with global options...	r15099	seenshort = globalshort.copy()
		seenlong = globallong.copy()
Idan Kamara tests: add a test to check for duplicate command options	r14449	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])