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

r25660:328739ea default


                r25878:800e090e

stable

Download file

             md5sum.py
        
                    42 lines
            
             | 999 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / md5sum.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      #

      # Based on python's Tools/scripts/md5sum.py

      #

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

      # of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is

      # GPL-compatible.

      import sys, os

      try:

          from hashlib import md5

      except ImportError:

          from md5 import md5

      try:

          import msvcrt

          msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

          msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

      except ImportError:

          pass

      for filename in sys.argv[1:]:

          try:

              fp = open(filename, 'rb')

          except IOError as msg:

              sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))

              sys.exit(1)

          m = md5()

          try:

              while True:

                  data = fp.read(8192)

                  if not data:

                      break

                  m.update(data)

          except IOError as msg:

              sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))

              sys.exit(1)

          sys.stdout.write('%s  %s\n' % (m.hexdigest(), filename))

      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
				#
				# Based on python's Tools/scripts/md5sum.py
				#
				# This software may be used and distributed according to the terms
				# of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is
				# GPL-compatible.

				import sys, os

				try:
				from hashlib import md5
				except ImportError:
				from md5 import md5

				try:
				import msvcrt
				msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
				msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
				except ImportError:
				pass

				for filename in sys.argv[1:]:
				try:
				fp = open(filename, 'rb')
				except IOError as msg:
				sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))
				sys.exit(1)

				m = md5()
				try:
				while True:
				data = fp.read(8192)
				if not data:
				break
				m.update(data)
				except IOError as msg:
				sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))
				sys.exit(1)
				sys.stdout.write('%s %s\n' % (m.hexdigest(), filename))

				sys.exit(0)