upstream/mercurial-mirror Files · contrib/fuzz/pyutil.h

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Augie Fackler - - Load All Authors

File last commit:

r44311:8766728d default


                r49415:50de0890

default

Download file

             pyutil.h
        
                    15 lines
            
             | 228 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / fuzz / pyutil.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fuzz: extract Python initialization to utility package...

              r41049
            
      #include <Python.h>

        Augie Fackler
    
fuzz: add support for fuzzing under either Python 2 or 3...

              r44311
            
      #if PY_MAJOR_VERSION >= 3

      #define PYCODETYPE PyObject

      #else

      #define PYCODETYPE PyCodeObject

      #endif

        Augie Fackler
    
fuzz: extract Python initialization to utility package...

              r41049
            
      namespace contrib

      {

      void initpy(const char *cselfpath);

      PyObject *pyglobals();

      } /* namespace contrib */

	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

Augie Fackler fuzz: extract Python initialization to utility package...	r41049	#include <Python.h>

Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	#if PY_MAJOR_VERSION >= 3
		#define PYCODETYPE PyObject
		#else
		#define PYCODETYPE PyCodeObject
		#endif

Augie Fackler fuzz: extract Python initialization to utility package...	r41049	namespace contrib
		{

		void initpy(const char *cselfpath);
		PyObject *pyglobals();

		} /* namespace contrib */