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

obsstore: refactor v1 logic to fix 32 byte hash support...

obsstore: refactor v1 logic to fix 32 byte hash support Refactor the v1 logic to determine the node parsing based on the flag. Move the predecessor out of the fixed part and handle it like the other nodes, removing most of the duplicated code for parsing 20/32 bytes hashes. Differential Revision: https://phab.mercurial-scm.org/D8801

Martin von Zweigbergk - - Load All Authors

File last commit:

r43387:8ff1ecfa default


                r46035:145cfe84

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'),
				)