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

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972

Augie Fackler - - Load All Authors

File last commit:

r44013:6f5c352f default


                r49404:c9141848

default

Download file

             fuzzutil.h
        
                    37 lines
            
             | 1002 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / fuzz / fuzzutil.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef CONTRIB_FUZZ_FUZZUTIL_H

      #define CONTRIB_FUZZ_FUZZUTIL_H

      #include <iostream>

      #include <memory>

      #include <stdint.h>

      /* Try and use std::optional, but failing that assume we'll have a

       * workable https://abseil.io/ install on the include path to get

       * their backport of std::optional. */

      #ifdef __has_include

      #if __has_include(<optional>) && __cplusplus >= 201703L

      #include <optional>

      #define CONTRIB_FUZZ_HAVE_STD_OPTIONAL

      #endif

      #endif

      #ifdef CONTRIB_FUZZ_HAVE_STD_OPTIONAL

      namespace contrib

      {

      using std::nullopt;

      using std::optional;

      } /* namespace contrib */

      #else

      #include "third_party/absl/types/optional.h"

      namespace contrib

      {

      using absl::nullopt;

      using absl::optional;

      } /* namespace contrib */

      #endif

      /* set DEBUG to 1 for a few debugging prints, or 2 for a lot */

      #define DEBUG 0

      #define LOG(level)                                                             \

      	if (level <= DEBUG)                                                    \

      	std::cout

      #endif /* CONTRIB_FUZZ_FUZZUTIL_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

				#ifndef CONTRIB_FUZZ_FUZZUTIL_H
				#define CONTRIB_FUZZ_FUZZUTIL_H
				#include <iostream>
				#include <memory>
				#include <stdint.h>

				/* Try and use std::optional, but failing that assume we'll have a
				* workable https://abseil.io/ install on the include path to get
				* their backport of std::optional. */
				#ifdef __has_include
				#if __has_include(<optional>) && __cplusplus >= 201703L
				#include <optional>
				#define CONTRIB_FUZZ_HAVE_STD_OPTIONAL
				#endif
				#endif
				#ifdef CONTRIB_FUZZ_HAVE_STD_OPTIONAL
				namespace contrib
				{
				using std::nullopt;
				using std::optional;
				} /* namespace contrib */
				#else
				#include "third_party/absl/types/optional.h"
				namespace contrib
				{
				using absl::nullopt;
				using absl::optional;
				} /* namespace contrib */
				#endif

				/* set DEBUG to 1 for a few debugging prints, or 2 for a lot */
				#define DEBUG 0
				#define LOG(level) \
				if (level <= DEBUG) \
				std::cout

				#endif /* CONTRIB_FUZZ_FUZZUTIL_H */