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

revert: option to choose what to keep, not what to discard...

revert: option to choose what to keep, not what to discard I know the you (the reader) are probably tired of discussing how `hg revert -i -r .` should behave and so am I. And I know I'm one of the people who argued that showing the diff from the working copy to the parent was confusing. I think it is less confusing now that we show the diff from the parent to the working copy, but I still find it confusing. I think showing the diff of hunks to keep might make it easier to understand. So that's what this patch provides an option for. One argument doing it this way is that most people seem to find `hg split` natural. I suspect that is because it shows the forward diff (from parent commit to the commit) and asks you what to put in the first commit. I think the new "keep" mode for revert (this patch) matches that. In "keep" mode, all the changes are still selected by default. That means that `hg revert -i` followed by 'A' (keep all) (or 'c' in curses) will be different from `hg revert -a`. That's mostly because that was simplest. It can also be argued that it's safest. But it can also be argued that it should be consistent with `hg revert -a`. Note that in this mode, you can edit the hunks and it will do what you expect (e.g. add new lines to your file if you added a new lines when editing). The test case shows that that works. Differential Revision: https://phab.mercurial-scm.org/D6125

Augie Fackler - - Load All Authors

File last commit:

r40634:fa331960 default


                r42154:c1d83d91

default

Download file

             util.h
        
                    74 lines
            
             | 2.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / util.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
cext: move util.h to cext tree...

              r32384
            
      /*

       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

        Yuya Nishihara
    
py3: add PY23() macro to switch string literal depending on python version...

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

        Augie Fackler
    
util: add clang-format control comment around struct and format macro...

              r34636
            
      /* clang-format off */

        Yuya Nishihara
    
cext: move util.h to cext tree...

              r32384
            
      typedef struct {

      	PyObject_HEAD

      	char state;

      	int mode;

      	int size;

      	int mtime;

      } dirstateTupleObject;

        Augie Fackler
    
util: add clang-format control comment around struct and format macro...

              r34636
            
      /* clang-format on */

        Yuya Nishihara
    
cext: move util.h to cext tree...

              r32384
            
      extern PyTypeObject dirstateTupleType;

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

        André Sintzoff
    
cext: define MIN macro only if it is not yet defined...

              r35793
            
      #ifndef MIN

        Augie Fackler
    
util: add clang-format control comment around struct and format macro...

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

        André Sintzoff
    
cext: define MIN macro only if it is not yet defined...

              r35793
            
      #endif

        Yuya Nishihara
    
cext: move util.h to cext tree...

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

        Yuya Nishihara
    
cext: move _dict_new_presized() to header...

              r33751
            
      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);

      }

        Augie Fackler
    
revlog: replace PyInt_AS_LONG with a more portable helper function...

              r40634
            
      /* Convert a PyInt or PyLong to a long. Returns false if there is an

         error, in which case an exception will already have been set. */

      static inline bool pylong_to_long(PyObject *pylong, long *out)

      {

      	*out = PyLong_AsLong(pylong);

      	/* Fast path to avoid hitting PyErr_Occurred if the value was obviously

      	 * not an error. */

      	if (*out != -1) {

      		return true;

      	}

      	return PyErr_Occurred() == NULL;

      }

        Yuya Nishihara
    
cext: move util.h to cext tree...

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

Yuya Nishihara cext: move util.h to cext tree...	r32384	/*
		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

Yuya Nishihara py3: add PY23() macro to switch string literal depending on python version...	r36636	/* 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

Augie Fackler util: add clang-format control comment around struct and format macro...	r34636	/* clang-format off */
Yuya Nishihara cext: move util.h to cext tree...	r32384	typedef struct {
		PyObject_HEAD
		char state;
		int mode;
		int size;
		int mtime;
		} dirstateTupleObject;
Augie Fackler util: add clang-format control comment around struct and format macro...	r34636	/* clang-format on */
Yuya Nishihara cext: move util.h to cext tree...	r32384
		extern PyTypeObject dirstateTupleType;
		#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

André Sintzoff cext: define MIN macro only if it is not yet defined...	r35793	#ifndef MIN
Augie Fackler util: add clang-format control comment around struct and format macro...	r34636	#define MIN(a, b) (((a) < (b)) ? (a) : (b))
André Sintzoff cext: define MIN macro only if it is not yet defined...	r35793	#endif
Yuya Nishihara cext: move util.h to cext tree...	r32384	/* 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

Yuya Nishihara cext: move _dict_new_presized() to header...	r33751	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);
		}

Augie Fackler revlog: replace PyInt_AS_LONG with a more portable helper function...	r40634	/* Convert a PyInt or PyLong to a long. Returns false if there is an
		error, in which case an exception will already have been set. */
		static inline bool pylong_to_long(PyObject pylong, long out)
		{
		*out = PyLong_AsLong(pylong);
		/* Fast path to avoid hitting PyErr_Occurred if the value was obviously
		* not an error. */
		if (*out != -1) {
		return true;
		}
		return PyErr_Occurred() == NULL;
		}

Yuya Nishihara cext: move util.h to cext tree...	r32384	#endif /* _HG_UTIL_H_ */