upstream/mercurial-mirror Files · mercurial/revlogutils/constants.py

mergetools: add new conflict marker format with diffs in...

mergetools: add new conflict marker format with diffs in I use 3-way conflict markers. Often when I resolve them, I manually compare one the base with one side and apply the differences to the other side. That can be hard when the conflict marker is large. This patch introduces a new type of conflict marker, which I'm hoping will make it easier to resolve conflicts. The new format uses `<<<<<<<` and `>>>>>>>` to open and close the markers, just like our existing 2-way and 3-way conflict markers. Instead of having 2 or 3 snapshots (left+right or left+base+right), it has a sequence of diffs. A diff looks like this: ``` ------- base +++++++ left a -b +c d ``` A diff that adds one side ("diff from nothing") has a `=======` header instead and does not have have `+` prefixed on its lines. A regular 3-way merge can be viewed as adding one side plus a diff between the base and the other side. It thus has two ways of being represented, depending on which side is being diffed: ``` <<<<<<< ======= left contents on left ------- base +++++++ right contents on -left +right >>>>>>> ``` or ``` <<<<<<< ------- base +++++++ left contents on -right +left ======= right contents on right >>>>>>> ``` I've made it so the new merge tool tries to pick a version that has the most common lines (no difference in the example above). I've called the new tool "mergediff" to stick to the convention of starting with "merge" if the tool tries a regular 3-way merge. The idea came from my pet VCS (placeholder name `jj`), which has support for octopus merges and other ways of ending up with merges of more than 3 versions. I wanted to be able to represent such conflicts in the working copy and therefore thought of this format (although I have not yet implemented it in my VCS). I then attended a meeting with Larry McVoy, who said BitKeeper has an option (`bk smerge -g`) for showing a similar format, which reminded me to actually attempt this in Mercurial. Differential Revision: https://phab.mercurial-scm.org/D9551

marmoute - - Load All Authors

File last commit:

r46245:c398c798 default


                r46724:bdc2bf68

default

Download file

             constants.py
        
                    60 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / revlogutils / constants.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # revlogdeltas.py - constant used for revlog logic

      #

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

      # Copyright 2018 Octobus <contact@octobus.net>

      #

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

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

      """Helper class to compute deltas stored inside revlogs"""

      from __future__ import absolute_import

      from ..interfaces import repository

      # revlog header flags

      REVLOGV0 = 0

      REVLOGV1 = 1

      # Dummy value until file format is finalized.

      # Reminder: change the bounds check in revlog.__init__ when this is changed.

      REVLOGV2 = 0xDEAD

      # Shared across v1 and v2.

      FLAG_INLINE_DATA = 1 << 16

      # Only used by v1, implied by v2.

      FLAG_GENERALDELTA = 1 << 17

      REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA

      REVLOG_DEFAULT_FORMAT = REVLOGV1

      REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS

      REVLOGV1_FLAGS = FLAG_INLINE_DATA | FLAG_GENERALDELTA

      REVLOGV2_FLAGS = FLAG_INLINE_DATA

      # revlog index flags

      # For historical reasons, revlog's internal flags were exposed via the

      # wire protocol and are even exposed in parts of the storage APIs.

      # revision has censor metadata, must be verified

      REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED

      # revision hash does not match data (narrowhg)

      REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS

      # revision data is stored externally

      REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED

      # revision data contains extra metadata not part of the official digest

      REVIDX_SIDEDATA = repository.REVISION_FLAG_SIDEDATA

      # revision changes files in a way that could affect copy tracing.

      REVIDX_HASCOPIESINFO = repository.REVISION_FLAG_HASCOPIESINFO

      REVIDX_DEFAULT_FLAGS = 0

      # stable order in which flags need to be processed and their processors applied

      REVIDX_FLAGS_ORDER = [

          REVIDX_ISCENSORED,

          REVIDX_ELLIPSIS,

          REVIDX_EXTSTORED,

          REVIDX_SIDEDATA,

          REVIDX_HASCOPIESINFO,

      ]

      # bitmark for flags that could cause rawdata content change

      REVIDX_RAWTEXT_CHANGING_FLAGS = (

          REVIDX_ISCENSORED | REVIDX_EXTSTORED | REVIDX_SIDEDATA

      )

      SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000

	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

				# revlogdeltas.py - constant used for revlog logic
				#
				# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
				# Copyright 2018 Octobus <contact@octobus.net>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.
				"""Helper class to compute deltas stored inside revlogs"""

				from __future__ import absolute_import

				from ..interfaces import repository

				# revlog header flags
				REVLOGV0 = 0
				REVLOGV1 = 1
				# Dummy value until file format is finalized.
				# Reminder: change the bounds check in revlog.__init__ when this is changed.
				REVLOGV2 = 0xDEAD
				# Shared across v1 and v2.
				FLAG_INLINE_DATA = 1 << 16
				# Only used by v1, implied by v2.
				FLAG_GENERALDELTA = 1 << 17
				REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA
				REVLOG_DEFAULT_FORMAT = REVLOGV1
				REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS
				REVLOGV1_FLAGS = FLAG_INLINE_DATA \| FLAG_GENERALDELTA
				REVLOGV2_FLAGS = FLAG_INLINE_DATA

				# revlog index flags

				# For historical reasons, revlog's internal flags were exposed via the
				# wire protocol and are even exposed in parts of the storage APIs.

				# revision has censor metadata, must be verified
				REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED
				# revision hash does not match data (narrowhg)
				REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS
				# revision data is stored externally
				REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED
				# revision data contains extra metadata not part of the official digest
				REVIDX_SIDEDATA = repository.REVISION_FLAG_SIDEDATA
				# revision changes files in a way that could affect copy tracing.
				REVIDX_HASCOPIESINFO = repository.REVISION_FLAG_HASCOPIESINFO
				REVIDX_DEFAULT_FLAGS = 0
				# stable order in which flags need to be processed and their processors applied
				REVIDX_FLAGS_ORDER = [
				REVIDX_ISCENSORED,
				REVIDX_ELLIPSIS,
				REVIDX_EXTSTORED,
				REVIDX_SIDEDATA,
				REVIDX_HASCOPIESINFO,
				]

				# bitmark for flags that could cause rawdata content change
				REVIDX_RAWTEXT_CHANGING_FLAGS = (
				REVIDX_ISCENSORED \| REVIDX_EXTSTORED \| REVIDX_SIDEDATA
				)

				SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000