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

Boris Feld - - Load All Authors

File last commit:

r35784:72fdd99e default


                r38829:6c8e3c84

default

Download file

             cacheutil.py
        
                    21 lines
            
             | 814 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cacheutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Boris Feld
    
caches: make 'cachetocopy' available in scmutil...

              r35784
            
      # scmutil.py - Mercurial core utility functions

      #

      #  Copyright Matt Mackall <mpm@selenic.com> and other

      #

      # 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

      from . import repoview

      def cachetocopy(srcrepo):

          """return the list of cache file valuable to copy during a clone"""

          # In local clones we're copying all nodes, not just served

          # ones. Therefore copy all branch caches over.

          cachefiles = ['branch2']

          cachefiles += ['branch2-%s' % f for f in repoview.filtertable]

          cachefiles += ['rbc-names-v1', 'rbc-revs-v1']

          cachefiles += ['tags2']

          cachefiles += ['tags2-%s' % f for f in repoview.filtertable]

          cachefiles += ['hgtagsfnodes1']

          return cachefiles

	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

Boris Feld caches: make 'cachetocopy' available in scmutil...	r35784	# scmutil.py - Mercurial core utility functions
		#
		# Copyright Matt Mackall <mpm@selenic.com> and other
		#
		# 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

		from . import repoview

		def cachetocopy(srcrepo):
		"""return the list of cache file valuable to copy during a clone"""
		# In local clones we're copying all nodes, not just served
		# ones. Therefore copy all branch caches over.
		cachefiles = ['branch2']
		cachefiles += ['branch2-%s' % f for f in repoview.filtertable]
		cachefiles += ['rbc-names-v1', 'rbc-revs-v1']
		cachefiles += ['tags2']
		cachefiles += ['tags2-%s' % f for f in repoview.filtertable]
		cachefiles += ['hgtagsfnodes1']
		return cachefiles