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

Yuya Nishihara - - Load All Authors

File last commit:

r30559:d83ca854 default


                r32255:7e35d31b

default

Download file

             test-status-inprocess.py
        
                    35 lines
            
             | 666 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-status-inprocess.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      from __future__ import absolute_import, print_function

      from mercurial import (

          commands,

          localrepo,

          ui as uimod,

      )

      u = uimod.ui.load()

      print('% creating repo')

      repo = localrepo.localrepository(u, '.', create=True)

      f = open('test.py', 'w')

      try:

          f.write('foo\n')

      finally:

          f.close

      print('% add and commit')

      commands.add(u, repo, 'test.py')

      commands.commit(u, repo, message='*')

      commands.status(u, repo, clean=True)

      print('% change')

      f = open('test.py', 'w')

      try:

          f.write('bar\n')

      finally:

          f.close()

      # this would return clean instead of changed before the fix

      commands.status(u, repo, clean=True, modified=True)

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

				from mercurial import (
				commands,
				localrepo,
				ui as uimod,
				)

				u = uimod.ui.load()

				print('% creating repo')
				repo = localrepo.localrepository(u, '.', create=True)

				f = open('test.py', 'w')
				try:
				f.write('foo\n')
				finally:
				f.close

				print('% add and commit')
				commands.add(u, repo, 'test.py')
				commands.commit(u, repo, message='*')
				commands.status(u, repo, clean=True)


				print('% change')
				f = open('test.py', 'w')
				try:
				f.write('bar\n')
				finally:
				f.close()

				# this would return clean instead of changed before the fix
				commands.status(u, repo, clean=True, modified=True)