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

rebase: restrict rebase destination to the pulled set (issue5214)...

rebase: restrict rebase destination to the pulled set (issue5214) Before this patch, `hg pull --rebase` would be a strict sequence of `hg pull` followed by `hg rebase` if anything was pulled. Now that rebase pick his default destination the same way than merge, than `hg rebase` step would abort in the case the repo already had multiple anonymous heads (because of the ambiguity). (changed in fac3a24be50e) The intend of the user with `hg pull --rebase` is clearly to rebase on pulled content. This used to be (mostly) enforced by the former default destination for rebase, "tipmost changeset of the branch" as the tipmost would likely a changeset that just got pulled. But this intended was no longer enforced with the new defaul destination (unified with merge). This changeset makes use of the '_destspace' mechanism introduced in the previous changeset to enforce this. This partially fixes issue5214 as no change at all have been made to the new handling of the case with bookmark (unified with merge).

Matt Mackall - - Load All Authors

File last commit:

r29012:4bd67ae7 stable


                r29044:261c2537

stable

Download file

             bdiff-torture.py
        
                    98 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, sys

      from mercurial import (

          bdiff,

          mpatch,

      )

      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 as inst:

                  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 = bdiff.bdiff(a, b)

          if not d:

              raise ValueError("empty")

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

          if c != b:

              raise ValueError("bad")

      def testwrap(a, b):

          try:

              test1(a, b)

              return

          except Exception as inst:

              pass

          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 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, sys
				from mercurial import (
				bdiff,
				mpatch,
				)

				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 as inst:
				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 = bdiff.bdiff(a, b)
				if not d:
				raise ValueError("empty")
				c = mpatch.patches(a, [d])
				if c != b:
				raise ValueError("bad")

				def testwrap(a, b):
				try:
				test1(a, b)
				return
				except Exception as inst:
				pass
				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 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