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

# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...

# User Dan Villiom Podlaski Christiansen <danchr@gmail.com> # Date 1289564504 -3600 # Node ID # Parent revsets: overload the branch() revset to also take a branch name. This should only change semantics in the specific case of a tag/branch conflict where the tag wasn't done on the branch with the same name. Previously, branch(whatever) would resolve to the branch of the tag in that case, whereas now it will resolve to the branch of the name. The previous behaviour, while documented, seemed very counter-intuitive to me. An alternate approach would be to introduce a new revset such as branchname() or namedbranch(). While this would retain backwards compatibility, the distinction between it and branch() would not be readily apparent to users. The most intuitive behaviour would be to have branch(x) require 'x' to be a branch name, and something like branchof(x) or samebranch(x) do what branch(x) currently does. Unfortunately, our backwards compatibility guarantees prevent us from doing that. Please note that while 'hg tag' guards against shadowing a branch, 'hg branch' does not. Besides, even if it did, that wouldn't solve the issue of conversions with such tags and branches...

Martin Geisler - - Load All Authors

File last commit:

r13302:a4e0908c default


                r13750:7eb82f88

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