upstream/mercurial-mirror Files · mercurial/cext/charencode.h

tests: add criss cross merging tests whose behavior need to be fixed...

tests: add criss cross merging tests whose behavior need to be fixed Merging two changesets can mark a file as removed post merge. However, in some cases, a user might not want to remove that file and they revert the removal back and commit the merge. All this works perfectly well. However, when we do criss-cross merges with such merge where user explicitly choose to revert the removal with one where another user choose the removal, we does not get any conflict. The intent here is conflicting and merge should result in conflicts. One user merged and want to keep the file while other user merged and want to remove the file. Merging those merges should result in conflicts. This patch adds test cases for these cases. Differential Revision: https://phab.mercurial-scm.org/D8939

Augie Fackler - - Load All Authors

File last commit:

r36075:81199632 default


                r46037:9bd60ec6

default

Download file

             charencode.h
        
                    61 lines
            
             | 2.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / charencode.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
cext: factor out header for charencode.c...

              r33753
            
      /*

       charencode.h - miscellaneous character encoding

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

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_CHARENCODE_H_

      #define _HG_CHARENCODE_H_

      #include <Python.h>

      #include "compat.h"

      /* This should be kept in sync with normcasespecs in encoding.py. */

      enum normcase_spec {

      	NORMCASE_LOWER = -1,

      	NORMCASE_UPPER = 1,

      	NORMCASE_OTHER = 0

      };

        Yuya Nishihara
    
cext: modernize charencode.c to use Py_ssize_t

              r33754
            
      PyObject *unhexlify(const char *str, Py_ssize_t len);

        Yuya Nishihara
    
encoding: add function to test if a str consists of ASCII characters...

              r33927
            
      PyObject *isasciistr(PyObject *self, PyObject *args);

        Yuya Nishihara
    
cext: factor out header for charencode.c...

              r33753
            
      PyObject *asciilower(PyObject *self, PyObject *args);

      PyObject *asciiupper(PyObject *self, PyObject *args);

      PyObject *make_file_foldmap(PyObject *self, PyObject *args);

        Yuya Nishihara
    
encoding: add fast path of jsonescape() (issue5533)...

              r33926
            
      PyObject *jsonescapeu8fast(PyObject *self, PyObject *args);

        Yuya Nishihara
    
cext: factor out header for charencode.c...

              r33753
            
        Augie Fackler
    
charencode: adjust clang-format enable/disable comments...

              r36075
            
      /* clang-format off */

        Yuya Nishihara
    
cext: factor out header for charencode.c...

              r33753
            
      static const int8_t hextable[256] = {

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, /* 0-9 */

      	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* A-F */

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a-f */

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

      	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1

      };

        Augie Fackler
    
charencode: adjust clang-format enable/disable comments...

              r36075
            
      /* clang-format on */

        Yuya Nishihara
    
cext: factor out header for charencode.c...

              r33753
            
      static inline int hexdigit(const char *p, Py_ssize_t off)

      {

      	int8_t val = hextable[(unsigned char)p[off]];

      	if (val >= 0) {

      		return val;

      	}

      	PyErr_SetString(PyExc_ValueError, "input contains non-hex character");

      	return 0;

      }

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

Yuya Nishihara cext: factor out header for charencode.c...	r33753	/*
		charencode.h - miscellaneous character encoding

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

		#ifndef _HG_CHARENCODE_H_
		#define _HG_CHARENCODE_H_

		#include <Python.h>
		#include "compat.h"

		/* This should be kept in sync with normcasespecs in encoding.py. */
		enum normcase_spec {
		NORMCASE_LOWER = -1,
		NORMCASE_UPPER = 1,
		NORMCASE_OTHER = 0
		};

Yuya Nishihara cext: modernize charencode.c to use Py_ssize_t	r33754	PyObject unhexlify(const char str, Py_ssize_t len);
Yuya Nishihara encoding: add function to test if a str consists of ASCII characters...	r33927	PyObject isasciistr(PyObject self, PyObject *args);
Yuya Nishihara cext: factor out header for charencode.c...	r33753	PyObject asciilower(PyObject self, PyObject *args);
		PyObject asciiupper(PyObject self, PyObject *args);
		PyObject make_file_foldmap(PyObject self, PyObject *args);
Yuya Nishihara encoding: add fast path of jsonescape() (issue5533)...	r33926	PyObject jsonescapeu8fast(PyObject self, PyObject *args);
Yuya Nishihara cext: factor out header for charencode.c...	r33753
Augie Fackler charencode: adjust clang-format enable/disable comments...	r36075	/* clang-format off */
Yuya Nishihara cext: factor out header for charencode.c...	r33753	static const int8_t hextable[256] = {
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0-9 */
		-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* A-F */
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a-f */
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
		};
Augie Fackler charencode: adjust clang-format enable/disable comments...	r36075	/* clang-format on */
Yuya Nishihara cext: factor out header for charencode.c...	r33753
		static inline int hexdigit(const char *p, Py_ssize_t off)
		{
		int8_t val = hextable[(unsigned char)p[off]];

		if (val >= 0) {
		return val;
		}

		PyErr_SetString(PyExc_ValueError, "input contains non-hex character");
		return 0;
		}

		#endif /* _HG_CHARENCODE_H_ */