upstream/mercurial-mirror Files · mercurial/compat.h

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

Matt Harbison - - Load All Authors

File last commit:

r39646:11ed2ead default


                r46724:bdc2bf68

default

Download file

             compat.h
        
                    58 lines
            
             | 1.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / compat.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      #ifndef _HG_COMPAT_H_

      #define _HG_COMPAT_H_

      #ifdef _WIN32

      #ifdef _MSC_VER

        Matt Harbison
    
cext: fix warnings when building for py3 on Windows...

              r39646
            
      #if _MSC_VER < 1900

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      /* msvc 6.0 has problems */

      #define inline __inline

        Maciej Fijalkowski
    
compat: provide a declaration of ssize_t, for MS windows

              r29521
            
      #if defined(_WIN64)

      typedef __int64 ssize_t;

        Yuya Nishihara
    
encoding: add function to test if a str consists of ASCII characters...

              r33927
            
      typedef unsigned __int64 uintptr_t;

        Maciej Fijalkowski
    
compat: provide a declaration of ssize_t, for MS windows

              r29521
            
      #else

        Yuya Nishihara
    
compat: define ssize_t as int on 32bit Windows, silences C4142 warning...

              r29549
            
      typedef int ssize_t;

        Yuya Nishihara
    
encoding: add function to test if a str consists of ASCII characters...

              r33927
            
      typedef unsigned int uintptr_t;

        Maciej Fijalkowski
    
compat: provide a declaration of ssize_t, for MS windows

              r29521
            
      #endif

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      typedef signed char int8_t;

      typedef short int16_t;

      typedef long int32_t;

      typedef __int64 int64_t;

      typedef unsigned char uint8_t;

      typedef unsigned short uint16_t;

      typedef unsigned long uint32_t;

      typedef unsigned __int64 uint64_t;

      #else

        Matt Harbison
    
cext: fix warnings when building for py3 on Windows...

              r39646
            
      /* VC++ 14 */

      #include <stdint.h>

      #if defined(_WIN64)

      typedef __int64 ssize_t;

      #else

      typedef int ssize_t;

      #endif

      #endif /* _MSC_VER < 1900 */

      #else

      /* not msvc */

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      #include <stdint.h>

      #endif

      #else

      /* not windows */

      #include <sys/types.h>

      #if defined __BEOS__ && !defined __HAIKU__

      #include <ByteOrder.h>

      #else

      #include <arpa/inet.h>

      #endif

      #include <inttypes.h>

      #endif

      #if defined __hpux || defined __SUNPRO_C || defined _AIX

      #define inline

      #endif

      #ifdef __linux

      #define inline __inline

      #endif

      #endif

	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

Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	#ifndef _HG_COMPAT_H_
		#define _HG_COMPAT_H_

		#ifdef _WIN32
		#ifdef _MSC_VER
Matt Harbison cext: fix warnings when building for py3 on Windows...	r39646	#if _MSC_VER < 1900
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	/* msvc 6.0 has problems */
		#define inline __inline
Maciej Fijalkowski compat: provide a declaration of ssize_t, for MS windows	r29521	#if defined(_WIN64)
		typedef __int64 ssize_t;
Yuya Nishihara encoding: add function to test if a str consists of ASCII characters...	r33927	typedef unsigned __int64 uintptr_t;
Maciej Fijalkowski compat: provide a declaration of ssize_t, for MS windows	r29521	#else
Yuya Nishihara compat: define ssize_t as int on 32bit Windows, silences C4142 warning...	r29549	typedef int ssize_t;
Yuya Nishihara encoding: add function to test if a str consists of ASCII characters...	r33927	typedef unsigned int uintptr_t;
Maciej Fijalkowski compat: provide a declaration of ssize_t, for MS windows	r29521	#endif
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	typedef signed char int8_t;
		typedef short int16_t;
		typedef long int32_t;
		typedef __int64 int64_t;
		typedef unsigned char uint8_t;
		typedef unsigned short uint16_t;
		typedef unsigned long uint32_t;
		typedef unsigned __int64 uint64_t;
		#else
Matt Harbison cext: fix warnings when building for py3 on Windows...	r39646	/* VC++ 14 */
		#include <stdint.h>

		#if defined(_WIN64)
		typedef __int64 ssize_t;
		#else
		typedef int ssize_t;
		#endif
		#endif /* _MSC_VER < 1900 */

		#else
		/* not msvc */
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	#include <stdint.h>
		#endif
		#else
		/* not windows */
		#include <sys/types.h>
		#if defined __BEOS__ && !defined __HAIKU__
		#include <ByteOrder.h>
		#else
		#include <arpa/inet.h>
		#endif
		#include <inttypes.h>
		#endif

		#if defined __hpux \|\| defined __SUNPRO_C \|\| defined _AIX
		#define inline
		#endif

		#ifdef __linux
		#define inline __inline
		#endif

		#endif