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

dirstate: ignore symlinks when fs cannot handle them (issue1888)...

dirstate: ignore symlinks when fs cannot handle them (issue1888) When the filesystem cannot handle the executable bit, we currently ignore it completely when looking for modified files. Similarly, it is impossible to set or clear the bit when the filesystem ignores it. This patch makes Mercurial treat symbolic links the same way. Symlinks are a little different since they manifest themselves as small files containing a filename (the symlink target). On Windows, these files show up as regular files, and on Linux and Mac they show up as real symlinks. Issue1888 presents a case where the symlink files are better ignored from the Windows side. A Linux client creates symlinks in a working copy which is shared over a network between Linux and Windows clients. The Samba server is helpful and defererences the symlink when the Windows client looks at it. This means that Mercurial on the Windows side sees file content instead of a file name in the symlink, and hence flags the link as modified. Ignoring the change would be much more helpful, similarly to how Mercurial does not report any changes when executable bits are ignored in a checkout on Windows. An initial checkout of a symbolic link on a file system that cannot handle symbolic links will still result in a regular file containing the target file name as its content. Sharing such a checkout with a Linux client will not turn the file into a symlink automatically, but 'hg revert' can fix that. After the revert, the Windows client will see the correct file content (provided by the Samba server when it follows the link on the Linux side) and otherwise ignore the change. Running 'hg perfstatus' 10 times gives these results: Before: After: min: 0.544703 min: 0.546549 med: 0.547592 med: 0.548881 avg: 0.549146 avg: 0.548549 max: 0.564112 max: 0.551504 The median time is increased about 0.24%.

Renato Cunha - - Load All Authors

File last commit:

r11535:09cb56b7 default


                r11769:ca6cebd8

stable

Download file

             util.h
        
                    63 lines
            
             | 2.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / util.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       util.h - utility functions for interfacing with the various python APIs.

       This software may be used and distributed according to the terms of

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_UTIL_H_

      #define _HG_UTIL_H_

      #if PY_MAJOR_VERSION >= 3

      #define IS_PY3K

      #define PyInt_FromLong PyLong_FromLong

      #endif /* PY_MAJOR_VERSION */

      /* Backports from 2.6 */

      #if PY_VERSION_HEX < 0x02060000

      #define Py_TYPE(ob) (ob)->ob_type

      #define Py_SIZE(ob) (ob)->ob_size

      #define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,

      /* Shamelessly stolen from bytesobject.h */

      #define PyBytesObject PyStringObject

      #define PyBytes_Type PyString_Type

      #define PyBytes_Check PyString_Check

      #define PyBytes_CheckExact PyString_CheckExact

      #define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED

      #define PyBytes_AS_STRING PyString_AS_STRING

      #define PyBytes_GET_SIZE PyString_GET_SIZE

      #define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS

      #define PyBytes_FromStringAndSize PyString_FromStringAndSize

      #define PyBytes_FromString PyString_FromString

      #define PyBytes_FromFormatV PyString_FromFormatV

      #define PyBytes_FromFormat PyString_FromFormat

      #define PyBytes_Size PyString_Size

      #define PyBytes_AsString PyString_AsString

      #define PyBytes_Repr PyString_Repr

      #define PyBytes_Concat PyString_Concat

      #define PyBytes_ConcatAndDel PyString_ConcatAndDel

      #define _PyBytes_Resize _PyString_Resize

      #define _PyBytes_Eq _PyString_Eq

      #define PyBytes_Format PyString_Format

      #define _PyBytes_FormatLong _PyString_FormatLong

      #define PyBytes_DecodeEscape PyString_DecodeEscape

      #define _PyBytes_Join _PyString_Join

      #define PyBytes_Decode PyString_Decode

      #define PyBytes_Encode PyString_Encode

      #define PyBytes_AsEncodedObject PyString_AsEncodedObject

      #define PyBytes_AsEncodedString PyString_AsEncodedString

      #define PyBytes_AsDecodedObject PyString_AsDecodedObject

      #define PyBytes_AsDecodedString PyString_AsDecodedString

      #define PyBytes_AsStringAndSize PyString_AsStringAndSize

      #define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping

      #endif /* PY_VERSION_HEX */

      #endif /* _HG_UTIL_H_ */

	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

				/*
				util.h - utility functions for interfacing with the various python APIs.

				This software may be used and distributed according to the terms of
				the GNU General Public License, incorporated herein by reference.
				*/

				#ifndef _HG_UTIL_H_
				#define _HG_UTIL_H_

				#if PY_MAJOR_VERSION >= 3

				#define IS_PY3K
				#define PyInt_FromLong PyLong_FromLong

				#endif /* PY_MAJOR_VERSION */

				/* Backports from 2.6 */
				#if PY_VERSION_HEX < 0x02060000

				#define Py_TYPE(ob) (ob)->ob_type
				#define Py_SIZE(ob) (ob)->ob_size
				#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,

				/* Shamelessly stolen from bytesobject.h */
				#define PyBytesObject PyStringObject
				#define PyBytes_Type PyString_Type

				#define PyBytes_Check PyString_Check
				#define PyBytes_CheckExact PyString_CheckExact
				#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
				#define PyBytes_AS_STRING PyString_AS_STRING
				#define PyBytes_GET_SIZE PyString_GET_SIZE
				#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS

				#define PyBytes_FromStringAndSize PyString_FromStringAndSize
				#define PyBytes_FromString PyString_FromString
				#define PyBytes_FromFormatV PyString_FromFormatV
				#define PyBytes_FromFormat PyString_FromFormat
				#define PyBytes_Size PyString_Size
				#define PyBytes_AsString PyString_AsString
				#define PyBytes_Repr PyString_Repr
				#define PyBytes_Concat PyString_Concat
				#define PyBytes_ConcatAndDel PyString_ConcatAndDel
				#define _PyBytes_Resize _PyString_Resize
				#define _PyBytes_Eq _PyString_Eq
				#define PyBytes_Format PyString_Format
				#define _PyBytes_FormatLong _PyString_FormatLong
				#define PyBytes_DecodeEscape PyString_DecodeEscape
				#define _PyBytes_Join _PyString_Join
				#define PyBytes_Decode PyString_Decode
				#define PyBytes_Encode PyString_Encode
				#define PyBytes_AsEncodedObject PyString_AsEncodedObject
				#define PyBytes_AsEncodedString PyString_AsEncodedString
				#define PyBytes_AsDecodedObject PyString_AsDecodedObject
				#define PyBytes_AsDecodedString PyString_AsDecodedString
				#define PyBytes_AsStringAndSize PyString_AsStringAndSize
				#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping

				#endif /* PY_VERSION_HEX */

				#endif /* _HG_UTIL_H_ */