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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Augie Fackler - - Load All Authors

File last commit:

r20684:2761a791 default


                r24995:0579b0c2

default

Download file

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

      #!/usr/bin/env python

      """

      Tests the behaviour of filelog w.r.t. data starting with '\1\n'

      """

      from mercurial import ui, hg

      from mercurial.node import nullid, hex

      myui = ui.ui()

      repo = hg.repository(myui, path='.', create=True)

      fl = repo.file('foobar')

      def addrev(text, renamed=False):

          if renamed:

              # data doesn't matter. Just make sure filelog.renamed() returns True

              meta = {'copyrev': hex(nullid), 'copy': 'bar'}

          else:

              meta = {}

          lock = t = None

          try:

              lock = repo.lock()

              t = repo.transaction('commit')

              node = fl.add(text, meta, t, 0, nullid, nullid)

              return node

          finally:

              if t:

                  t.close()

              if lock:

                  lock.release()

      def error(text):

          print 'ERROR: ' + text

      textwith = '\1\nfoo'

      without = 'foo'

      node = addrev(textwith)

      if not textwith == fl.read(node):

          error('filelog.read for data starting with \\1\\n')

      if fl.cmp(node, textwith) or not fl.cmp(node, without):

          error('filelog.cmp for data starting with \\1\\n')

      if fl.size(0) != len(textwith):

          error('FIXME: This is a known failure of filelog.size for data starting '

              'with \\1\\n')

      node = addrev(textwith, renamed=True)

      if not textwith == fl.read(node):

          error('filelog.read for a renaming + data starting with \\1\\n')

      if fl.cmp(node, textwith) or not fl.cmp(node, without):

          error('filelog.cmp for a renaming + data starting with \\1\\n')

      if fl.size(1) != len(textwith):

          error('filelog.size for a renaming + data starting with \\1\\n')

      print 'OK.'

	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
				"""
				Tests the behaviour of filelog w.r.t. data starting with '\1\n'
				"""
				from mercurial import ui, hg
				from mercurial.node import nullid, hex

				myui = ui.ui()
				repo = hg.repository(myui, path='.', create=True)

				fl = repo.file('foobar')

				def addrev(text, renamed=False):
				if renamed:
				# data doesn't matter. Just make sure filelog.renamed() returns True
				meta = {'copyrev': hex(nullid), 'copy': 'bar'}
				else:
				meta = {}

				lock = t = None
				try:
				lock = repo.lock()
				t = repo.transaction('commit')
				node = fl.add(text, meta, t, 0, nullid, nullid)
				return node
				finally:
				if t:
				t.close()
				if lock:
				lock.release()

				def error(text):
				print 'ERROR: ' + text

				textwith = '\1\nfoo'
				without = 'foo'

				node = addrev(textwith)
				if not textwith == fl.read(node):
				error('filelog.read for data starting with \\1\\n')
				if fl.cmp(node, textwith) or not fl.cmp(node, without):
				error('filelog.cmp for data starting with \\1\\n')
				if fl.size(0) != len(textwith):
				error('FIXME: This is a known failure of filelog.size for data starting '
				'with \\1\\n')

				node = addrev(textwith, renamed=True)
				if not textwith == fl.read(node):
				error('filelog.read for a renaming + data starting with \\1\\n')
				if fl.cmp(node, textwith) or not fl.cmp(node, without):
				error('filelog.cmp for a renaming + data starting with \\1\\n')
				if fl.size(1) != len(textwith):
				error('filelog.size for a renaming + data starting with \\1\\n')

				print 'OK.'