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

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Matt Mackall - - Load All Authors

File last commit:

r20622:352abbb0 default


                r25878:800e090e

stable

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