upstream/mercurial-mirror Files · tests/failfilemerge.py

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Phil Cohen - - Load All Authors

File last commit:

r34124:c0ce6045 default


                r38817:bb54db4a

@96 default

Download file

             failfilemerge.py
        
                    19 lines
            
             | 518 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / failfilemerge.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # extension to emulate interrupting filemerge._filemerge

      from __future__ import absolute_import

      from mercurial import (

          error,

          extensions,

          filemerge,

      )

      def failfilemerge(filemergefn,

                        premerge, repo, wctx, mynode, orig, fcd, fco, fca,

                        labels=None):

          raise error.Abort("^C")

          return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

      def extsetup(ui):

          extensions.wrapfunction(filemerge, '_filemerge',

                                  failfilemerge)

	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

				# extension to emulate interrupting filemerge._filemerge

				from __future__ import absolute_import

				from mercurial import (
				error,
				extensions,
				filemerge,
				)

				def failfilemerge(filemergefn,
				premerge, repo, wctx, mynode, orig, fcd, fco, fca,
				labels=None):
				raise error.Abort("^C")
				return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

				def extsetup(ui):
				extensions.wrapfunction(filemerge, '_filemerge',
				failfilemerge)