upstream/mercurial-mirror Files · tests/blackbox-readonly-dispatch.py

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

timeless - - Load All Authors

File last commit:

r28406:0767c2f6 default


                r32255:7e35d31b

default

Download file

             blackbox-readonly-dispatch.py
        
                    36 lines
            
             | 992 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / blackbox-readonly-dispatch.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import, print_function

      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,))

      # 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()

      # remove blackbox.log directory (proxy for readonly log file)

      os.rmdir(".hg/blackbox.log")

      # replace it with the real blackbox.log file

      os.rename(".hg/blackbox.log-", ".hg/blackbox.log")

      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

				from __future__ import absolute_import, print_function
				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,))

				# 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()
				# remove blackbox.log directory (proxy for readonly log file)
				os.rmdir(".hg/blackbox.log")
				# replace it with the real blackbox.log file
				os.rename(".hg/blackbox.log-", ".hg/blackbox.log")
				testdispatch("commit -m commit2 -d 2000-01-02 foo")

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