upstream/mercurial-mirror Files · contrib/bdiff-torture.py

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:

r43346:2372284d default


                r45064:5205b46b

default

Download file

             bdiff-torture.py
        
                    108 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / contrib / bdiff-torture.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Randomized torture test generation for bdiff

      from __future__ import absolute_import, print_function

      import random

      import sys

      from mercurial import (

          mdiff,

          pycompat,

      )

      def reducetest(a, b):

          tries = 0

          reductions = 0

          print("reducing...")

          while tries < 1000:

              a2 = (

                  "\n".join(l for l in a.splitlines() if random.randint(0, 100) > 0)

                  + "\n"

              )

              b2 = (

                  "\n".join(l for l in b.splitlines() if random.randint(0, 100) > 0)

                  + "\n"

              )

              if a2 == a and b2 == b:

                  continue

              if a2 == b2:

                  continue

              tries += 1

              try:

                  test1(a, b)

              except Exception:

                  reductions += 1

                  tries = 0

                  a = a2

                  b = b2

          print("reduced:", reductions, len(a) + len(b), repr(a), repr(b))

          try:

              test1(a, b)

          except Exception as inst:

              print("failed:", inst)

          sys.exit(0)

      def test1(a, b):

          d = mdiff.textdiff(a, b)

          if not d:

              raise ValueError("empty")

          c = mdiff.patches(a, [d])

          if c != b:

              raise ValueError("bad")

      def testwrap(a, b):

          try:

              test1(a, b)

              return

          except Exception as inst:

              print("exception:", inst)

          reducetest(a, b)

      def test(a, b):

          testwrap(a, b)

          testwrap(b, a)

      def rndtest(size, noise):

          a = []

          src = "                aaaaaaaabbbbccd"

          for x in pycompat.xrange(size):

              a.append(src[random.randint(0, len(src) - 1)])

          while True:

              b = [c for c in a if random.randint(0, 99) > noise]

              b2 = []

              for c in b:

                  b2.append(c)

                  while random.randint(0, 99) < noise:

                      b2.append(src[random.randint(0, len(src) - 1)])

              if b2 != a:

                  break

          a = "\n".join(a) + "\n"

          b = "\n".join(b2) + "\n"

          test(a, b)

      maxvol = 10000

      startsize = 2

      while True:

          size = startsize

          count = 0

          while size < maxvol:

              print(size)

              volume = 0

              while volume < maxvol:

                  rndtest(size, 2)

                  volume += size

                  count += 2

              size *= 2

          maxvol *= 4

          startsize *= 4

	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

				# Randomized torture test generation for bdiff

				from __future__ import absolute_import, print_function
				import random
				import sys

				from mercurial import (
				mdiff,
				pycompat,
				)


				def reducetest(a, b):
				tries = 0
				reductions = 0
				print("reducing...")
				while tries < 1000:
				a2 = (
				"\n".join(l for l in a.splitlines() if random.randint(0, 100) > 0)
				+ "\n"
				)
				b2 = (
				"\n".join(l for l in b.splitlines() if random.randint(0, 100) > 0)
				+ "\n"
				)
				if a2 == a and b2 == b:
				continue
				if a2 == b2:
				continue
				tries += 1

				try:
				test1(a, b)
				except Exception:
				reductions += 1
				tries = 0
				a = a2
				b = b2

				print("reduced:", reductions, len(a) + len(b), repr(a), repr(b))
				try:
				test1(a, b)
				except Exception as inst:
				print("failed:", inst)

				sys.exit(0)


				def test1(a, b):
				d = mdiff.textdiff(a, b)
				if not d:
				raise ValueError("empty")
				c = mdiff.patches(a, [d])
				if c != b:
				raise ValueError("bad")


				def testwrap(a, b):
				try:
				test1(a, b)
				return
				except Exception as inst:
				print("exception:", inst)
				reducetest(a, b)


				def test(a, b):
				testwrap(a, b)
				testwrap(b, a)


				def rndtest(size, noise):
				a = []
				src = " aaaaaaaabbbbccd"
				for x in pycompat.xrange(size):
				a.append(src[random.randint(0, len(src) - 1)])

				while True:
				b = [c for c in a if random.randint(0, 99) > noise]
				b2 = []
				for c in b:
				b2.append(c)
				while random.randint(0, 99) < noise:
				b2.append(src[random.randint(0, len(src) - 1)])
				if b2 != a:
				break

				a = "\n".join(a) + "\n"
				b = "\n".join(b2) + "\n"

				test(a, b)


				maxvol = 10000
				startsize = 2
				while True:
				size = startsize
				count = 0
				while size < maxvol:
				print(size)
				volume = 0
				while volume < maxvol:
				rndtest(size, 2)
				volume += size
				count += 2
				size *= 2
				maxvol *= 4
				startsize *= 4