upstream/mercurial-mirror Files · mercurial/txnutil.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

FUJIWARA Katsunori - - Load All Authors

File last commit:

r31050:20653270 default


                r38829:6c8e3c84

default

Download file

             txnutil.py
        
                    36 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / txnutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # txnutil.py - transaction related utilities

      #

      #  Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      import errno

      from . import (

          encoding,

      )

      def mayhavepending(root):

          '''return whether 'root' may have pending changes, which are

          visible to this process.

          '''

          return root == encoding.environ.get('HG_PENDING')

      def trypending(root, vfs, filename, **kwargs):

          '''Open  file to be read according to HG_PENDING environment variable

          This opens '.pending' of specified 'filename' only when HG_PENDING

          is equal to 'root'.

          This returns '(fp, is_pending_opened)' tuple.

          '''

          if mayhavepending(root):

              try:

                  return (vfs('%s.pending' % filename, **kwargs), True)

              except IOError as inst:

                  if inst.errno != errno.ENOENT:

                      raise

          return (vfs(filename, **kwargs), False)

	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

				# txnutil.py - transaction related utilities
				#
				# Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				import errno

				from . import (
				encoding,
				)

				def mayhavepending(root):
				'''return whether 'root' may have pending changes, which are
				visible to this process.
				'''
				return root == encoding.environ.get('HG_PENDING')

				def trypending(root, vfs, filename, **kwargs):
				'''Open file to be read according to HG_PENDING environment variable

				This opens '.pending' of specified 'filename' only when HG_PENDING
				is equal to 'root'.

				This returns '(fp, is_pending_opened)' tuple.
				'''
				if mayhavepending(root):
				try:
				return (vfs('%s.pending' % filename, **kwargs), True)
				except IOError as inst:
				if inst.errno != errno.ENOENT:
				raise
				return (vfs(filename, **kwargs), False)