upstream/mercurial-mirror Files · mercurial/bitmanipulation.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

Augie Fackler - - Load All Authors

File last commit:

r38322:1fb2510c @40 default


                r46724:bdc2bf68

default

Download file

             bitmanipulation.h
        
                    51 lines
            
             | 989 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bitmanipulation.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r29444
            
      #ifndef _HG_BITMANIPULATION_H_

      #define _HG_BITMANIPULATION_H_

        Martin von Zweigbergk
    
bitmanipulation: add missing include of string.h...

              r32646
            
      #include <string.h>

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

              r29444
            
      #include "compat.h"

      static inline uint32_t getbe32(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

        Augie Fackler
    
bitmanipulation: fix undefined behavior in bit shift in getbe32...

              r38322
            
      	return ((((uint32_t)d[0]) << 24) | (((uint32_t)d[1]) << 16) |

      	        (((uint32_t)d[2]) << 8) | (d[3]));

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

              r29444
            
      }

      static inline int16_t getbeint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	return ((d[0] << 8) | (d[1]));

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

              r29444
            
      }

      static inline uint16_t getbeuint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	return ((d[0] << 8) | (d[1]));

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

              r29444
            
      }

      static inline void putbe32(uint32_t x, char *c)

      {

      	c[0] = (x >> 24) & 0xff;

      	c[1] = (x >> 16) & 0xff;

      	c[2] = (x >> 8) & 0xff;

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      	c[3] = (x)&0xff;

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

              r29444
            
      }

      static inline double getbefloat64(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	double ret;

      	int i;

      	uint64_t t = 0;

      	for (i = 0; i < 8; i++) {

        Augie Fackler
    
bitmanipulation: reformat with clang-format...

              r34698
            
      		t = (t << 8) + d[i];

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

              r29444
            
      	}

      	memcpy(&ret, &t, sizeof(t));

      	return ret;

      }

      #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_BITMANIPULATION_H_
		#define _HG_BITMANIPULATION_H_

Martin von Zweigbergk bitmanipulation: add missing include of string.h...	r32646	#include <string.h>

Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	#include "compat.h"

		static inline uint32_t getbe32(const char *c)
		{
		const unsigned char d = (const unsigned char )c;

Augie Fackler bitmanipulation: fix undefined behavior in bit shift in getbe32...	r38322	return ((((uint32_t)d[0]) << 24) \| (((uint32_t)d[1]) << 16) \|
		(((uint32_t)d[2]) << 8) \| (d[3]));
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline int16_t getbeint16(const char *c)
		{
		const unsigned char d = (const unsigned char )c;

Augie Fackler bitmanipulation: reformat with clang-format...	r34698	return ((d[0] << 8) \| (d[1]));
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline uint16_t getbeuint16(const char *c)
		{
		const unsigned char d = (const unsigned char )c;

Augie Fackler bitmanipulation: reformat with clang-format...	r34698	return ((d[0] << 8) \| (d[1]));
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline void putbe32(uint32_t x, char *c)
		{
		c[0] = (x >> 24) & 0xff;
		c[1] = (x >> 16) & 0xff;
		c[2] = (x >> 8) & 0xff;
Augie Fackler bitmanipulation: reformat with clang-format...	r34698	c[3] = (x)&0xff;
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}

		static inline double getbefloat64(const char *c)
		{
		const unsigned char d = (const unsigned char )c;
		double ret;
		int i;
		uint64_t t = 0;
		for (i = 0; i < 8; i++) {
Augie Fackler bitmanipulation: reformat with clang-format...	r34698	t = (t << 8) + d[i];
Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	}
		memcpy(&ret, &t, sizeof(t));
		return ret;
		}

		#endif