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

Gregory Szorc - - Load All Authors

File last commit:

r24505:031947ba default


                r25878:800e090e

stable

Download file

             sitecustomize.py
        
                    16 lines
            
             | 510 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / sitecustomize.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os

      if os.environ.get('COVERAGE_PROCESS_START'):

          try:

              import coverage

              import random

              # uuid is better, but not available in Python 2.4.

              covpath = os.path.join(os.environ['COVERAGE_DIR'],

                                     'cov.%s' % random.randrange(0, 1000000000000))

              cov = coverage.coverage(data_file=covpath, auto_data=True)

              cov._warn_no_data = False

              cov._warn_unimported_source = False

              cov.start()

          except ImportError:

              pass

	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

				if os.environ.get('COVERAGE_PROCESS_START'):
				try:
				import coverage
				import random

				# uuid is better, but not available in Python 2.4.
				covpath = os.path.join(os.environ['COVERAGE_DIR'],
				'cov.%s' % random.randrange(0, 1000000000000))
				cov = coverage.coverage(data_file=covpath, auto_data=True)
				cov._warn_no_data = False
				cov._warn_unimported_source = False
				cov.start()
				except ImportError:
				pass