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

cg4: introduce protocol flag to signify the presence of sidedata...

cg4: introduce protocol flag to signify the presence of sidedata We need a way of signaling whether the current revision has sidedata or not, and re-using the revision flags would waste potential revlog flags and mix two normally independent layers. In this change, we add a single byte at the start of the ch4 delta header to set potential protocol flags. We also reclaim the revlog flag for sidedata, since it is no longer used, in its place now lives the (also experimental) copytracing flag. When generating deltas, apply the `CG_FLAG_SIDEDATA` flag if there is sidedata. When applying the deltas, if said flag is present, the next chunk contains the sidedata. Differential Revision: https://phab.mercurial-scm.org/D10343

Raphaël Gomès - - Load All Authors

File last commit:

r47575:d4ba4d51 default


                r47843:119790e1

default

Download file

             mergeutil.py
        
                    19 lines
            
             | 502 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 Olivia Mackall <olivia@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 ms.unresolvedcount():

              raise error.StateError(

                  _(b"unresolved merge conflicts (see 'hg help 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 Olivia Mackall <olivia@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 ms.unresolvedcount():
				raise error.StateError(
				_(b"unresolved merge conflicts (see 'hg help resolve')")
				)