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

Idan Kamara - - Load All Authors

File last commit:

r14438:08bfec2e default


                r24995:0579b0c2

default

Download file

             test-dispatch.py
        
                    33 lines
            
             | 786 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-dispatch.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os

      from mercurial import dispatch

      def testdispatch(cmd):

          """Simple wrapper around dispatch.dispatch()

          Prints command and result value, but does not handle quoting.

          """

          print "running: %s" % (cmd,)

          req = dispatch.request(cmd.split())

          result = dispatch.dispatch(req)

          print "result: %r" % (result,)

      testdispatch("init test1")

      os.chdir('test1')

      # create file 'foo', add and commit

      f = open('foo', 'wb')

      f.write('foo\n')

      f.close()

      testdispatch("add foo")

      testdispatch("commit -m commit1 -d 2000-01-01 foo")

      # append to file 'foo' and commit

      f = open('foo', 'ab')

      f.write('bar\n')

      f.close()

      testdispatch("commit -m commit2 -d 2000-01-02 foo")

      # check 88803a69b24 (fancyopts modified command table)

      testdispatch("log -r 0")

      testdispatch("log -r tip")

	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
				from mercurial import dispatch

				def testdispatch(cmd):
				"""Simple wrapper around dispatch.dispatch()

				Prints command and result value, but does not handle quoting.
				"""
				print "running: %s" % (cmd,)
				req = dispatch.request(cmd.split())
				result = dispatch.dispatch(req)
				print "result: %r" % (result,)


				testdispatch("init test1")
				os.chdir('test1')

				# create file 'foo', add and commit
				f = open('foo', 'wb')
				f.write('foo\n')
				f.close()
				testdispatch("add foo")
				testdispatch("commit -m commit1 -d 2000-01-01 foo")

				# append to file 'foo' and commit
				f = open('foo', 'ab')
				f.write('bar\n')
				f.close()
				testdispatch("commit -m commit2 -d 2000-01-02 foo")

				# check 88803a69b24 (fancyopts modified command table)
				testdispatch("log -r 0")
				testdispatch("log -r tip")