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

rebase: allow in-memory merge of the working copy parent...

rebase: allow in-memory merge of the working copy parent Before this patch and when the rebase involved the working copy parent (and thus the working copy too), we would not do in-memory rebase even if requested to. The in-code comment explains that the reason had something to do with avoiding an extra update, but I don't know which update that refers to. Perhaps an earlier version of the code used to update to the destination before rebasing even if in-memory rebase was requested? That seems to not be done at least since (rebase: do not bail on uncomitted changes if rebasing in-memory, 2017-12-07). To see if this still made it slower, I create a single tiny commit on top of one branch of the mozilla-unified repo (commit a1098c82 to be exact) and rebased it to another branch (commit d4e9a7be). Before this patch that took 11.8s and after this patch it took 8.6s (I only did two runs each, but the timings were very consistent). Differential Revision: https://phab.mercurial-scm.org/D2876

Yuya Nishihara - - Load All Authors

File last commit:

r36636:9a639a33 default


                r36993:795eb53f

default

Download file

             util.h
        
                    61 lines
            
             | 1.6 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / 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_

      #include "compat.h"

      #if PY_MAJOR_VERSION >= 3

      #define IS_PY3K

      #endif

      /* helper to switch things like string literal depending on Python version */

      #ifdef IS_PY3K

      #define PY23(py2, py3) py3

      #else

      #define PY23(py2, py3) py2

      #endif

      /* clang-format off */

      typedef struct {

      	PyObject_HEAD

      	char state;

      	int mode;

      	int size;

      	int mtime;

      } dirstateTupleObject;

      /* clang-format on */

      extern PyTypeObject dirstateTupleType;

      #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

      #ifndef MIN

      #define MIN(a, b) (((a) < (b)) ? (a) : (b))

      #endif

      /* VC9 doesn't include bool and lacks stdbool.h based on my searching */

      #if defined(_MSC_VER) || __STDC_VERSION__ < 199901L

      #define true 1

      #define false 0

      typedef unsigned char bool;

      #else

      #include <stdbool.h>

      #endif

      static inline PyObject *_dict_new_presized(Py_ssize_t expected_size)

      {

      	/* _PyDict_NewPresized expects a minused parameter, but it actually

      	   creates a dictionary that's the nearest power of two bigger than the

      	   parameter. For example, with the initial minused = 1000, the

      	   dictionary created has size 1024. Of course in a lot of cases that

      	   can be greater than the maximum load factor Python's dict object

      	   expects (= 2/3), so as soon as we cross the threshold we'll resize

      	   anyway. So create a dictionary that's at least 3/2 the size. */

      	return _PyDict_NewPresized(((1 + expected_size) / 2) * 3);

      }

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

				#include "compat.h"

				#if PY_MAJOR_VERSION >= 3
				#define IS_PY3K
				#endif

				/* helper to switch things like string literal depending on Python version */
				#ifdef IS_PY3K
				#define PY23(py2, py3) py3
				#else
				#define PY23(py2, py3) py2
				#endif

				/* clang-format off */
				typedef struct {
				PyObject_HEAD
				char state;
				int mode;
				int size;
				int mtime;
				} dirstateTupleObject;
				/* clang-format on */

				extern PyTypeObject dirstateTupleType;
				#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

				#ifndef MIN
				#define MIN(a, b) (((a) < (b)) ? (a) : (b))
				#endif
				/* VC9 doesn't include bool and lacks stdbool.h based on my searching */
				#if defined(_MSC_VER) \|\| __STDC_VERSION__ < 199901L
				#define true 1
				#define false 0
				typedef unsigned char bool;
				#else
				#include <stdbool.h>
				#endif

				static inline PyObject *_dict_new_presized(Py_ssize_t expected_size)
				{
				/* _PyDict_NewPresized expects a minused parameter, but it actually
				creates a dictionary that's the nearest power of two bigger than the
				parameter. For example, with the initial minused = 1000, the
				dictionary created has size 1024. Of course in a lot of cases that
				can be greater than the maximum load factor Python's dict object
				expects (= 2/3), so as soon as we cross the threshold we'll resize
				anyway. So create a dictionary that's at least 3/2 the size. */
				return _PyDict_NewPresized(((1 + expected_size) / 2) * 3);
				}

				#endif /* _HG_UTIL_H_ */