upstream/mercurial-mirror Files · contrib/fuzz/jsonescapeu8fast.cc

filemerge: add support for partial conflict resolution by external tool...

filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

Augie Fackler - - Load All Authors

File last commit:

r44311:8766728d default


                r49838:f3aafd78

default

Download file

             jsonescapeu8fast.cc
        
                    55 lines
            
             | 1.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / jsonescapeu8fast.cc
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fuzz: new target to fuzz jsonescapeu8fast...

              r43423
            
      #include <Python.h>

      #include <assert.h>

      #include <stdlib.h>

      #include <unistd.h>

      #include "pyutil.h"

      #include <iostream>

      #include <string>

        Augie Fackler
    
fuzz: use a more standard approach to allow local builds of fuzzers...

              r44265
            
      #include "FuzzedDataProvider.h"

        Augie Fackler
    
fuzz: new target to fuzz jsonescapeu8fast...

              r43423
            
      extern "C" {

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

              r44311
            
      static PYCODETYPE *code;

        Augie Fackler
    
fuzz: new target to fuzz jsonescapeu8fast...

              r43423
            
      extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)

      {

      	contrib::initpy(*argv[0]);

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

              r44311
            
      	code = (PYCODETYPE *)Py_CompileString(R"py(

        Augie Fackler
    
fuzz: new target to fuzz jsonescapeu8fast...

              r43423
            
      try:

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

              r44311
            
          parsers.jsonescapeu8fast(data, paranoid)

        Augie Fackler
    
fuzz: new target to fuzz jsonescapeu8fast...

              r43423
            
      except Exception as e:

          pass

          # uncomment this print if you're editing this Python code

          # to debug failures.

          # print(e)

      )py",

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

              r44311
            
      	                                      "fuzzer", Py_file_input);

        Augie Fackler
    
fuzz: new target to fuzz jsonescapeu8fast...

              r43423
            
      	if (!code) {

      		std::cerr << "failed to compile Python code!" << std::endl;

      	}

      	return 0;

      }

      int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)

      {

      	FuzzedDataProvider provider(Data, Size);

      	bool paranoid = provider.ConsumeBool();

      	std::string remainder = provider.ConsumeRemainingBytesAsString();

      	PyObject *mtext = PyBytes_FromStringAndSize(

      	    (const char *)remainder.c_str(), remainder.size());

      	PyObject *locals = PyDict_New();

      	PyDict_SetItemString(locals, "data", mtext);

      	PyDict_SetItemString(locals, "paranoid", paranoid ? Py_True : Py_False);

      	PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);

      	if (!res) {

      		PyErr_Print();

      	}

      	Py_XDECREF(res);

      	Py_DECREF(locals);

      	Py_DECREF(mtext);

      	return 0; // Non-zero return values are reserved for future use.

      }

      }

	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: new target to fuzz jsonescapeu8fast...	r43423	#include <Python.h>
		#include <assert.h>
		#include <stdlib.h>
		#include <unistd.h>

		#include "pyutil.h"

		#include <iostream>
		#include <string>
Augie Fackler fuzz: use a more standard approach to allow local builds of fuzzers...	r44265	#include "FuzzedDataProvider.h"
Augie Fackler fuzz: new target to fuzz jsonescapeu8fast...	r43423
		extern "C" {

Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	static PYCODETYPE *code;
Augie Fackler fuzz: new target to fuzz jsonescapeu8fast...	r43423
		extern "C" int LLVMFuzzerInitialize(int argc, char **argv)
		{
		contrib::initpy(*argv[0]);
Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	code = (PYCODETYPE *)Py_CompileString(R"py(
Augie Fackler fuzz: new target to fuzz jsonescapeu8fast...	r43423	try:
Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	parsers.jsonescapeu8fast(data, paranoid)
Augie Fackler fuzz: new target to fuzz jsonescapeu8fast...	r43423	except Exception as e:
		pass
		# uncomment this print if you're editing this Python code
		# to debug failures.
		# print(e)
		)py",
Augie Fackler fuzz: add support for fuzzing under either Python 2 or 3...	r44311	"fuzzer", Py_file_input);
Augie Fackler fuzz: new target to fuzz jsonescapeu8fast...	r43423	if (!code) {
		std::cerr << "failed to compile Python code!" << std::endl;
		}
		return 0;
		}

		int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
		{
		FuzzedDataProvider provider(Data, Size);
		bool paranoid = provider.ConsumeBool();
		std::string remainder = provider.ConsumeRemainingBytesAsString();

		PyObject *mtext = PyBytes_FromStringAndSize(
		(const char *)remainder.c_str(), remainder.size());
		PyObject *locals = PyDict_New();
		PyDict_SetItemString(locals, "data", mtext);
		PyDict_SetItemString(locals, "paranoid", paranoid ? Py_True : Py_False);
		PyObject *res = PyEval_EvalCode(code, contrib::pyglobals(), locals);
		if (!res) {
		PyErr_Print();
		}
		Py_XDECREF(res);
		Py_DECREF(locals);
		Py_DECREF(mtext);
		return 0; // Non-zero return values are reserved for future use.
		}
		}