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

merge: fix race that could cause wrong size in dirstate...

merge: fix race that could cause wrong size in dirstate The problem is that hg merge/update/etc work the following way: 1. figure out what files to update 2. apply the update to disk 3. apply the update to in-memory dirstate 4. write dirstate where step3 looks at the filesystem and assumes it sees the result of step2. If a file is changed between step2 and step3, step3 will record incorrect information in the dirstate. I avoid this by passing the size step3 needs directly from step2, for the common path (not implemented for change/delete conflicts for instance). I didn't fix the same race for the exec bit for now, because it's less likely to be problematic and I had trouble due to the fact that the dirstate stores the permissions differently from the manifest (st_mode vs '' 'l' 'x'), in combination with tests that pretend that symlinks are not supported. However, I moved the lstat from step3 to step2, which should tighten the race window markedly, both for the exec bit and for the mtime. Differential Revision: https://phab.mercurial-scm.org/D6475

Matt Harbison - - Load All Authors

File last commit:

r39646:11ed2ead default


                r42656:87a34c76

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