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

patch: deprecate ui.patch / external patcher feature...

patch: deprecate ui.patch / external patcher feature Why? - Mercurial internal patcher works correctly for regular patches and git patches, is much faster at least on Windows and is more extensible. - In theory, the external patcher can be used to handle exotic patch formats. I do not know any and have not heard about any such use in years. - Most patch programs cannot handle git format patches, which makes the API caller to decide either to ignore ui.patch by calling patch.internalpatch() directly, or take the risk of random failures with valid inputs. - One thing a patch program could do Mercurial patcher cannot is applying with --reverse. Apparently several shelve like extensions try to use that, including passing the "reverse" option to Mercurial patcher, which has been removed mid-2009. I never heard anybody complain about that, and would prefer reimplementing it anyway. And from the technical perspective: - The external patcher makes everything harder to maintain and implement. EOL normalization is not implemented, and I would bet file renames, if supported by the patcher, are not correctly recorded in the dirstate. - No tests. How? - Remove related documentation - Clearly mark patch.externalpatch() as private - Remove the debuginstall check. This deprecation request was actually triggered by this last point. debuginstall is the only piece of code patching without a repository. When migrating to an integrated patch() + updatedir() call, this was really a showstopper, all workarounds were either ugly or uselessly complicated to implement. If we do not support external patcher anymore, the debuginstall check is not useful anymore. - Remove patch.externalpatch() after 1.9 release.

Martin Geisler - - Load All Authors

File last commit:

r13302:a4e0908c default


                r13751:85d74f6b

default

Download file

             util.h
        
                    105 lines
            
             | 3.7 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

      #define PyInt_AsLong PyLong_AsLong

      /*

       Mapping of some of the python < 2.x PyString* functions to py3k's PyUnicode.

       The commented names below represent those that are present in the PyBytes

       definitions for python < 2.6 (below in this file) that don't have a direct

       implementation.

      */

      #define PyStringObject PyUnicodeObject

      #define PyString_Type PyUnicode_Type

      #define PyString_Check PyUnicode_Check

      #define PyString_CheckExact PyUnicode_CheckExact

      #define PyString_CHECK_INTERNED PyUnicode_CHECK_INTERNED

      #define PyString_AS_STRING PyUnicode_AsLatin1String

      #define PyString_GET_SIZE PyUnicode_GET_SIZE

      #define PyString_FromStringAndSize PyUnicode_FromStringAndSize

      #define PyString_FromString PyUnicode_FromString

      #define PyString_FromFormatV PyUnicode_FromFormatV

      #define PyString_FromFormat PyUnicode_FromFormat

      /* #define PyString_Size PyUnicode_GET_SIZE */

      /* #define PyString_AsString */

      /* #define PyString_Repr */

      #define PyString_Concat PyUnicode_Concat

      #define PyString_ConcatAndDel PyUnicode_AppendAndDel

      #define _PyString_Resize PyUnicode_Resize

      /* #define _PyString_Eq */

      #define PyString_Format PyUnicode_Format

      /* #define _PyString_FormatLong */

      /* #define PyString_DecodeEscape */

      #define _PyString_Join PyUnicode_Join

      #define PyString_Decode PyUnicode_Decode

      #define PyString_Encode PyUnicode_Encode

      #define PyString_AsEncodedObject PyUnicode_AsEncodedObject

      #define PyString_AsEncodedString PyUnicode_AsEncodedString

      #define PyString_AsDecodedObject PyUnicode_AsDecodedObject

      #define PyString_AsDecodedString PyUnicode_AsDecodedUnicode

      /* #define PyString_AsStringAndSize */

      #define _PyString_InsertThousandsGrouping _PyUnicode_InsertThousandsGrouping

      #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
				#define PyInt_AsLong PyLong_AsLong

				/*
				Mapping of some of the python < 2.x PyString* functions to py3k's PyUnicode.

				The commented names below represent those that are present in the PyBytes
				definitions for python < 2.6 (below in this file) that don't have a direct
				implementation.
				*/

				#define PyStringObject PyUnicodeObject
				#define PyString_Type PyUnicode_Type

				#define PyString_Check PyUnicode_Check
				#define PyString_CheckExact PyUnicode_CheckExact
				#define PyString_CHECK_INTERNED PyUnicode_CHECK_INTERNED
				#define PyString_AS_STRING PyUnicode_AsLatin1String
				#define PyString_GET_SIZE PyUnicode_GET_SIZE

				#define PyString_FromStringAndSize PyUnicode_FromStringAndSize
				#define PyString_FromString PyUnicode_FromString
				#define PyString_FromFormatV PyUnicode_FromFormatV
				#define PyString_FromFormat PyUnicode_FromFormat
				/* #define PyString_Size PyUnicode_GET_SIZE */
				/* #define PyString_AsString */
				/* #define PyString_Repr */
				#define PyString_Concat PyUnicode_Concat
				#define PyString_ConcatAndDel PyUnicode_AppendAndDel
				#define _PyString_Resize PyUnicode_Resize
				/* #define _PyString_Eq */
				#define PyString_Format PyUnicode_Format
				/* #define _PyString_FormatLong */
				/* #define PyString_DecodeEscape */
				#define _PyString_Join PyUnicode_Join
				#define PyString_Decode PyUnicode_Decode
				#define PyString_Encode PyUnicode_Encode
				#define PyString_AsEncodedObject PyUnicode_AsEncodedObject
				#define PyString_AsEncodedString PyUnicode_AsEncodedString
				#define PyString_AsDecodedObject PyUnicode_AsDecodedObject
				#define PyString_AsDecodedString PyUnicode_AsDecodedUnicode
				/* #define PyString_AsStringAndSize */
				#define _PyString_InsertThousandsGrouping _PyUnicode_InsertThousandsGrouping

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