upstream/mercurial-mirror Files · mercurial/mergeutil.py

match: resolve filesets against the passed `cwd`, not the current one...

match: resolve filesets against the passed `cwd`, not the current one This allows filesets to be resolved relative to `repo.root`, the same as other patterns are since f02d3c0eed18. The current example in contrib/ wasn't working from the tests directory because of this. Differential Revision: https://phab.mercurial-scm.org/D7570

Martin von Zweigbergk - - Load All Authors

File last commit:

r43387:8ff1ecfa default


                r44461:e685fac5

default

Download file

             mergeutil.py
        
                    24 lines
            
             | 697 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / mergeutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # mergeutil.py - help for merge processing in mercurial

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

      #

      # 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 .i18n import _

      from . import error

      def checkunresolved(ms):

          if list(ms.unresolved()):

              raise error.Abort(

                  _(b"unresolved merge conflicts (see 'hg help resolve')")

              )

          if ms.mdstate() != b's' or list(ms.driverresolved()):

              raise error.Abort(

                  _(b'driver-resolved merge conflicts'),

                  hint=_(b'run "hg resolve --all" to resolve'),

              )

	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

				# mergeutil.py - help for merge processing in mercurial
				#
				# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
				#
				# 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 .i18n import _

				from . import error


				def checkunresolved(ms):
				if list(ms.unresolved()):
				raise error.Abort(
				_(b"unresolved merge conflicts (see 'hg help resolve')")
				)
				if ms.mdstate() != b's' or list(ms.driverresolved()):
				raise error.Abort(
				_(b'driver-resolved merge conflicts'),
				hint=_(b'run "hg resolve --all" to resolve'),
				)