##// END OF EJS Templates
rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0...
rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0 The merge in 12adf8c695ed had conflicts in rust/Cargo.lock and rust/hg-core/Cargo.toml . Let's ignore rust/Cargo.lock - it is regenerated. For rust/hg-core/Cargo.toml, stable had dd6b67d5c256 "rust: fix unsound `OwningDirstateMap`" which introduced ouroboros (and dropped stable_deref_trait). Default had ec8d9b5a5e7c "rust-hg-core: upgrade dependencies" which had a lot of churn bumping minimum versions - also patch versions. It is indeed a good idea to bump to *allow* use of latest package. That means that major versions should be bumped for packages after 1.0, and for packages below 1.0 minor versions should be bumped too. But it doesn't work to try enforce a policy of using latest patch by bumping versions at arbitrary times. For good or bad, the merge doesn't seem to have resolved the conflicts correctly, and many of the minor "upgrade dependencies" were lost again. Unfortunately, it also lost the bump of memmap2 to 0.5.3, which is needed for Fedora packaging where 0.4 isn't available. Same with micro-timer bump to 0.4 (which already is used in rhg). crossbeam-channel bump was also lost. This change fixes that regression by redoing these "important" lines of the merge "correctly". I propose this for stable, even though dependency changes on stable branches are annoying.

File last commit:

r49730:6000f5b2 default
r50312:1bad05cf stable
Show More
bdiff-torture.py
107 lines | 2.1 KiB | text/x-python | PythonLexer
Matt Mackall
bdiff: fix latent normalization bug...
r29012 # Randomized torture test generation for bdiff
Yuya Nishihara
py3: make contrib/bdiff-torture.py conform to our import style
r29209 import random
import sys
Matt Mackall
bdiff: fix latent normalization bug...
r29012 from mercurial import (
Yuya Nishihara
bdiff: proxy through mdiff module...
r32201 mdiff,
Gregory Szorc
contrib: use pycompat.xrange in bdiff-torture.py...
r43279 pycompat,
Matt Mackall
bdiff: fix latent normalization bug...
r29012 )
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
bdiff: fix latent normalization bug...
r29012 def reducetest(a, b):
tries = 0
reductions = 0
print("reducing...")
while tries < 1000:
Augie Fackler
formatting: blacken the codebase...
r43346 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"
)
Matt Mackall
bdiff: fix latent normalization bug...
r29012 if a2 == a and b2 == b:
continue
if a2 == b2:
continue
tries += 1
try:
test1(a, b)
Martin von Zweigbergk
cleanup: delete lots of unused local variables...
r41401 except Exception:
Matt Mackall
bdiff: fix latent normalization bug...
r29012 reductions += 1
tries = 0
a = a2
b = b2
Augie Fackler
formatting: blacken the codebase...
r43346 print("reduced:", reductions, len(a) + len(b), repr(a), repr(b))
Matt Mackall
bdiff: fix latent normalization bug...
r29012 try:
test1(a, b)
except Exception as inst:
print("failed:", inst)
sys.exit(0)
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
bdiff: fix latent normalization bug...
r29012 def test1(a, b):
Yuya Nishihara
bdiff: proxy through mdiff module...
r32201 d = mdiff.textdiff(a, b)
Matt Mackall
bdiff: fix latent normalization bug...
r29012 if not d:
raise ValueError("empty")
Yuya Nishihara
mpatch: proxy through mdiff module...
r32202 c = mdiff.patches(a, [d])
Matt Mackall
bdiff: fix latent normalization bug...
r29012 if c != b:
raise ValueError("bad")
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
bdiff: fix latent normalization bug...
r29012 def testwrap(a, b):
try:
test1(a, b)
return
except Exception as inst:
Pulkit Goyal
bdiff-torture: fix pyflakes warning reporting undefined name 'inst'...
r43123 print("exception:", inst)
Matt Mackall
bdiff: fix latent normalization bug...
r29012 reducetest(a, b)
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
bdiff: fix latent normalization bug...
r29012 def test(a, b):
testwrap(a, b)
testwrap(b, a)
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
bdiff: fix latent normalization bug...
r29012 def rndtest(size, noise):
a = []
src = " aaaaaaaabbbbccd"
Gregory Szorc
contrib: use pycompat.xrange in bdiff-torture.py...
r43279 for x in pycompat.xrange(size):
Matt Mackall
bdiff: fix latent normalization bug...
r29012 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)
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
bdiff: fix latent normalization bug...
r29012 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