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

fix: add a -s option to format a revision and its descendants...

fix: add a -s option to format a revision and its descendants `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants to do. The problem is that any descendants of that commit will not be formatted, leaving them as orphans that are hard to evolve. They are hard to evolve because the new parent will have formatting changes that the orphan doesn't have. I talked to Danny Hooper (who wrote most of the fix extension) about the problem and we agreed that deprecating `-r` in favor of a new `-s` argument (mimicing rebase's `-s`) would be a good way of reducing the risk that users end up with these hard-to-evolve orphans. So that's what this patch implements. Differential Revision: https://phab.mercurial-scm.org/D8287

Augie Fackler - - Load All Authors

File last commit:

r44255:7857bd9b default


                r45064:5205b46b

default

Download file

             bdiff.cc
        
                    39 lines
            
             | 969 B
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / bdiff.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * bdiff.cc - fuzzer harness for bdiff.c

       *

       * Copyright 2018, Google Inc.

       *

       * This software may be used and distributed according to the terms of

       * the GNU General Public License, incorporated herein by reference.

       */

      #include <memory>

      #include <stdlib.h>

      #include "FuzzedDataProvider.h"

      extern "C" {

      #include "bdiff.h"

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

      {

      	return 0;

      }

      int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)

      {

      	FuzzedDataProvider provider(Data, Size);

      	std::string left = provider.ConsumeRandomLengthString(Size);

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

      	struct bdiff_line *a, *b;

      	int an = bdiff_splitlines(left.c_str(), left.size(), &a);

      	int bn = bdiff_splitlines(right.c_str(), right.size(), &b);

      	struct bdiff_hunk l;

      	bdiff_diff(a, an, b, bn, &l);

      	free(a);

      	free(b);

      	bdiff_freehunks(l.next);

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

      }

      } // extern "C"

	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

				/*
				* bdiff.cc - fuzzer harness for bdiff.c
				*
				* Copyright 2018, Google Inc.
				*
				* This software may be used and distributed according to the terms of
				* the GNU General Public License, incorporated herein by reference.
				*/
				#include <memory>
				#include <stdlib.h>

				#include "FuzzedDataProvider.h"

				extern "C" {
				#include "bdiff.h"

				extern "C" int LLVMFuzzerInitialize(int argc, char **argv)
				{
				return 0;
				}

				int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
				{
				FuzzedDataProvider provider(Data, Size);
				std::string left = provider.ConsumeRandomLengthString(Size);
				std::string right = provider.ConsumeRemainingBytesAsString();

				struct bdiff_line a, b;
				int an = bdiff_splitlines(left.c_str(), left.size(), &a);
				int bn = bdiff_splitlines(right.c_str(), right.size(), &b);
				struct bdiff_hunk l;
				bdiff_diff(a, an, b, bn, &l);
				free(a);
				free(b);
				bdiff_freehunks(l.next);
				return 0; // Non-zero return values are reserved for future use.
				}

				} // extern "C"