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

copies: follow copies across merge base without source file (issue6163)...

copies: follow copies across merge base without source file (issue6163) As in the previous patch, consider these two histories: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' We trace copies from the 'modify x' commit to commit 4 by going via the merge base (commit 0). When tracing file 'y' (_tracefile()) in the first case, we immediately find the rename from 'x'. We check to see if 'x' exists in the merge base, which it does, so we consider it a valid copy. In the second case, 'x' does not exist in the merge base, so it's not considered a valid copy. As a workaround, this patch makes it so we also attempt the check in mergecopies's base commit (commit 1 in the second case). That feels pretty ugly to me, but I don't have any better ideas. Note that we actually also check not only that the filename matches, but also that the file's nodeid matches. I don't know why we do that, but it was like that already before I rewrote mergecopies(). That means that the rebase will still fail in cases like this (again, it already failed before my rewrite): @ 4 'rename x to y' | o 3 'add x again with content X2' | o 2 'remove x' | | o 1 'modify x to content X2' |/ o 1 'modify x to content X1' | o 0 'add x with content X0' Differential Revision: https://phab.mercurial-scm.org/D6604

Martin von Zweigbergk - - Load All Authors

File last commit:

r41401:876494fd default


                r42798:819712de

default

Download file

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

      )

      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:

              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
				import sys

				from mercurial import (
				mdiff,
				)

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