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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r12170:581066a3 stable


                r25878:800e090e

stable

Download file

             revlog-formatv0.py
        
                    60 lines
            
             | 1.8 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / revlog-formatv0.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      # Copyright 2010 Intevation GmbH

      # Author(s):

      # Thomas Arendsen Hein <thomas@intevation.de>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      """Create a Mercurial repository in revlog format 0

      changeset:   0:a1ef0b125355

      tag:         tip

      user:        user

      date:        Thu Jan 01 00:00:00 1970 +0000

      files:       empty

      description:

      empty file

      """

      import os, sys

      files = [

          ('formatv0/.hg/00changelog.i',

           '000000000000004400000000000000000000000000000000000000'

           '000000000000000000000000000000000000000000000000000000'

           '0000a1ef0b125355d27765928be600cfe85784284ab3'),

          ('formatv0/.hg/00changelog.d',

           '756163613935613961356635353036303562366138343738336237'

           '61623536363738616436356635380a757365720a3020300a656d70'

           '74790a0a656d7074792066696c65'),

          ('formatv0/.hg/00manifest.i',

           '000000000000003000000000000000000000000000000000000000'

           '000000000000000000000000000000000000000000000000000000'

           '0000aca95a9a5f550605b6a84783b7ab56678ad65f58'),

          ('formatv0/.hg/00manifest.d',

           '75656d707479006238306465356431333837353835343163356630'

           '35323635616431343461623966613836643164620a'),

          ('formatv0/.hg/data/empty.i',

           '000000000000000000000000000000000000000000000000000000'

           '000000000000000000000000000000000000000000000000000000'

           '0000b80de5d138758541c5f05265ad144ab9fa86d1db'),

          ('formatv0/.hg/data/empty.d',

           ''),

      ]

      def makedirs(name):

          """recursive directory creation"""

          parent = os.path.dirname(name)

          if parent:

              makedirs(parent)

          os.mkdir(name)

      makedirs(os.path.join(*'formatv0/.hg/data'.split('/')))

      for name, data in files:

          f = open(name, 'wb')

          f.write(data.decode('hex'))

          f.close()

      sys.exit(0)

	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

				#!/usr/bin/env python
				# Copyright 2010 Intevation GmbH
				# Author(s):
				# Thomas Arendsen Hein <thomas@intevation.de>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				"""Create a Mercurial repository in revlog format 0

				changeset: 0:a1ef0b125355
				tag: tip
				user: user
				date: Thu Jan 01 00:00:00 1970 +0000
				files: empty
				description:
				empty file
				"""

				import os, sys

				files = [
				('formatv0/.hg/00changelog.i',
				'000000000000004400000000000000000000000000000000000000'
				'000000000000000000000000000000000000000000000000000000'
				'0000a1ef0b125355d27765928be600cfe85784284ab3'),
				('formatv0/.hg/00changelog.d',
				'756163613935613961356635353036303562366138343738336237'
				'61623536363738616436356635380a757365720a3020300a656d70'
				'74790a0a656d7074792066696c65'),
				('formatv0/.hg/00manifest.i',
				'000000000000003000000000000000000000000000000000000000'
				'000000000000000000000000000000000000000000000000000000'
				'0000aca95a9a5f550605b6a84783b7ab56678ad65f58'),
				('formatv0/.hg/00manifest.d',
				'75656d707479006238306465356431333837353835343163356630'
				'35323635616431343461623966613836643164620a'),
				('formatv0/.hg/data/empty.i',
				'000000000000000000000000000000000000000000000000000000'
				'000000000000000000000000000000000000000000000000000000'
				'0000b80de5d138758541c5f05265ad144ab9fa86d1db'),
				('formatv0/.hg/data/empty.d',
				''),
				]

				def makedirs(name):
				"""recursive directory creation"""
				parent = os.path.dirname(name)
				if parent:
				makedirs(parent)
				os.mkdir(name)

				makedirs(os.path.join(*'formatv0/.hg/data'.split('/')))

				for name, data in files:
				f = open(name, 'wb')
				f.write(data.decode('hex'))
				f.close()

				sys.exit(0)