upstream/mercurial-mirror Files · tests/test-demandimport.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.

Augie Fackler - - Load All Authors

File last commit:

r23643:2205d00b stable


                r25878:800e090e

stable

Download file

             test-demandimport.py
        
                    55 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-demandimport.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from mercurial import demandimport

      demandimport.enable()

      import os

      if os.name != 'nt':

          try:

              import distutils.msvc9compiler

              print ('distutils.msvc9compiler needs to be an immediate '

                     'importerror on non-windows platforms')

              distutils.msvc9compiler

          except ImportError:

              pass

      import re

      rsub = re.sub

      def f(obj):

          l = repr(obj)

          l = rsub("0x[0-9a-fA-F]+", "0x?", l)

          l = rsub("from '.*'", "from '?'", l)

          l = rsub("'<[a-z]*>'", "'<whatever>'", l)

          return l

      import os

      print "os =", f(os)

      print "os.system =", f(os.system)

      print "os =", f(os)

      from mercurial import util

      print "util =", f(util)

      print "util.system =", f(util.system)

      print "util =", f(util)

      print "util.system =", f(util.system)

      import re as fred

      print "fred =", f(fred)

      import sys as re

      print "re =", f(re)

      print "fred =", f(fred)

      print "fred.sub =", f(fred.sub)

      print "fred =", f(fred)

      print "re =", f(re)

      print "re.stderr =", f(re.stderr)

      print "re =", f(re)

      demandimport.disable()

      os.environ['HGDEMANDIMPORT'] = 'disable'

      demandimport.enable()

      from mercurial import node

      print "node =", f(node)

	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 mercurial import demandimport
				demandimport.enable()

				import os
				if os.name != 'nt':
				try:
				import distutils.msvc9compiler
				print ('distutils.msvc9compiler needs to be an immediate '
				'importerror on non-windows platforms')
				distutils.msvc9compiler
				except ImportError:
				pass

				import re

				rsub = re.sub
				def f(obj):
				l = repr(obj)
				l = rsub("0x[0-9a-fA-F]+", "0x?", l)
				l = rsub("from '.*'", "from '?'", l)
				l = rsub("'<[a-z]*>'", "'<whatever>'", l)
				return l

				import os

				print "os =", f(os)
				print "os.system =", f(os.system)
				print "os =", f(os)

				from mercurial import util

				print "util =", f(util)
				print "util.system =", f(util.system)
				print "util =", f(util)
				print "util.system =", f(util.system)

				import re as fred
				print "fred =", f(fred)

				import sys as re
				print "re =", f(re)

				print "fred =", f(fred)
				print "fred.sub =", f(fred.sub)
				print "fred =", f(fred)

				print "re =", f(re)
				print "re.stderr =", f(re.stderr)
				print "re =", f(re)

				demandimport.disable()
				os.environ['HGDEMANDIMPORT'] = 'disable'
				demandimport.enable()
				from mercurial import node
				print "node =", f(node)