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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Yuya Nishihara - - Load All Authors

File last commit:

r38234:a1c0873a default


                r38817:bb54db4a

@96 default

Download file

             fuzzutil.cc
        
                    27 lines
            
             | 922 B
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / fuzzutil.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #include "fuzzutil.h"

      #include <cstring>

      #include <utility>

      contrib::optional<two_inputs> SplitInputs(const uint8_t *Data, size_t Size)

      {

      	if (!Size) {

      		return contrib::nullopt;

      	}

      	// figure out a random point in [0, Size] to split our input.

      	size_t left_size = (Data[0] / 255.0) * (Size - 1);

      	// Copy inputs to new allocations so if bdiff over-reads

      	// AddressSanitizer can detect it.

      	std::unique_ptr<char[]> left(new char[left_size]);

      	std::memcpy(left.get(), Data + 1, left_size);

      	// right starts at the next byte after left ends

      	size_t right_size = Size - (left_size + 1);

      	std::unique_ptr<char[]> right(new char[right_size]);

      	std::memcpy(right.get(), Data + 1 + left_size, right_size);

      	LOG(2) << "inputs are  " << left_size << " and " << right_size

      	       << " bytes" << std::endl;

      	two_inputs result = {std::move(right), right_size, std::move(left),

      	                     left_size};

      	return result;

      }

	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

				#include "fuzzutil.h"

				#include <cstring>
				#include <utility>

				contrib::optional<two_inputs> SplitInputs(const uint8_t *Data, size_t Size)
				{
				if (!Size) {
				return contrib::nullopt;
				}
				// figure out a random point in [0, Size] to split our input.
				size_t left_size = (Data[0] / 255.0) * (Size - 1);

				// Copy inputs to new allocations so if bdiff over-reads
				// AddressSanitizer can detect it.
				std::unique_ptr<char[]> left(new char[left_size]);
				std::memcpy(left.get(), Data + 1, left_size);
				// right starts at the next byte after left ends
				size_t right_size = Size - (left_size + 1);
				std::unique_ptr<char[]> right(new char[right_size]);
				std::memcpy(right.get(), Data + 1 + left_size, right_size);
				LOG(2) << "inputs are " << left_size << " and " << right_size
				<< " bytes" << std::endl;
				two_inputs result = {std::move(right), right_size, std::move(left),
				left_size};
				return result;
				}