##// END OF EJS Templates
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

File last commit:

r43346:2372284d default
r45064:5205b46b default
Show More
bdiff-torture.py
108 lines | 2.1 KiB | text/x-python | PythonLexer
Matt Mackall
bdiff: fix latent normalization bug...
r29012 # Randomized torture test generation for bdiff
from __future__ import absolute_import, print_function
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