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

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076

Matt Harbison - - Load All Authors

File last commit:

r39646:11ed2ead default


                r46132:feffeb18

default

Download file

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

      #ifndef _HG_COMPAT_H_

      #define _HG_COMPAT_H_

      #ifdef _WIN32

      #ifdef _MSC_VER

      #if _MSC_VER < 1900

      /* msvc 6.0 has problems */

      #define inline __inline

      #if defined(_WIN64)

      typedef __int64 ssize_t;

      typedef unsigned __int64 uintptr_t;

      #else

      typedef int ssize_t;

      typedef unsigned int uintptr_t;

      #endif

      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

      /* 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 */

      #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

				#ifndef _HG_COMPAT_H_
				#define _HG_COMPAT_H_

				#ifdef _WIN32
				#ifdef _MSC_VER
				#if _MSC_VER < 1900
				/* msvc 6.0 has problems */
				#define inline __inline
				#if defined(_WIN64)
				typedef __int64 ssize_t;
				typedef unsigned __int64 uintptr_t;
				#else
				typedef int ssize_t;
				typedef unsigned int uintptr_t;
				#endif
				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
				/* 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 */
				#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