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

context: skip path conflicts by default when clearing unknown file (issue5776)...

context: skip path conflicts by default when clearing unknown file (issue5776) Prior to adding path conflict checking in 989e884d1be9, the test-audit-path.t tests failed as shown here (but it was globbed away). made it fail with a message about the destination manifest containing a conflict (though the no-symlink case wasn't updated). When the path conflict checking was gated behind an experimental config in 2a774cae3a03^::2a774cae3a03, the update started erroneously succeeding here. It turns out that the child of is the origin of this change when path conflict checking is disabled, as shown by grafting the experimental config range on top of it. What's happening here is merge.batchget() is writing the symlink 'back' to wdir (but as a regular file for the no-symlink case), and then tries to write 'back/test', but calls wctx['back/test'].clearunknown() first. The code that's gated here was removing the newly written 'back' file, allowing 'back/test' to succeed. I tried checking for the dir components of 'back/test' in dirstate, and skipping removal if present. But that didn't work because the dirstate isn't updated after each file is written out. This is the last persistent test failure on Windows, so the testbot should start turning green now. \o/

Yuya Nishihara - - Load All Authors

File last commit:

r33927:f4433f27 default


                r37119:656ac240

default

Download file

             compat.h
        
                    45 lines
            
             | 849 B
            
                | 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

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

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