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

split: close transaction in the unlikely event of a conflict while rebasing...

split: close transaction in the unlikely event of a conflict while rebasing `hg split` *should* never result in conflicts, but in case there are bugs, we should at least commit the transaction so they can continue the rebase. One of our users ran into the regression fixed by D10120. They fixed the conflict and the tried to continue the rebase, but it failed with "abort: cannot continue inconsistent rebase" because the rebase state referred to commits written in a transaction that was never committed. Side note: `hg split` should probably turn off copy tracing to reduce the impact of such bugs, and to speed it up as well. Copies made in the rebased commits should still be respected because `hg rebase` calls `copies.graftcopies()`. Differential Revision: https://phab.mercurial-scm.org/D10164

Augie Fackler - - Load All Authors

File last commit:

r44013:6f5c352f default


                r47492:7f6c002d

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 */