better diffs when most chars are ASCII #257
Description
Here's a recent example diff from an actual test failure:
to_test.go:773: got "org-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=aa,\xff=_value _value=2 11\norg-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=bb,\xff=_value _value=2 21\norg-4747474747474747,bucket-4242424242424242:m,tag1=b,tag2=cc,\xff=_value _value=1 21\norg-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=dd,\xff=_value _value=3 31\norg-4747474747474747,bucket-4242424242424242:m,tag1=c,\xff=_value _value=4 41\n"
to_test.go:774: want "org-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=aa _value=2 11\norg-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=bb _value=2 21\norg-4747474747474747,bucket-4242424242424242:m,tag1=b,tag2=cc _value=1 21\norg-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=dd _value=3 31\norg-4747474747474747,bucket-4242424242424242:m,tag1=c _value=4 41\n"
to_test.go:775: unexpected points result:
string{
... // 29 identical bytes
0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x3a, // |242424242424242:|
0x6d, 0x2c, 0x74, 0x61, 0x67, 0x31, 0x3d, 0x61, 0x2c, 0x74, 0x61, 0x67, 0x32, 0x3d, 0x61, 0x61, // |m,tag1=a,tag2=aa|
- 0x2c, 0xff, 0x3d, // -|,.=|
+ 0x20, // +| |
0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, // |_value|
- 0x20, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x32, 0x20, // -| _value=2 |
+ 0x3d, 0x32, 0x20, // +|=2 |
0x31, 0x31, 0x0a, 0x6f, 0x72, 0x67, 0x2d, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, // |11.org-474747474|
0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x2c, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x2d, 0x34, // |7474747,bucket-4|
0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x3a, // |242424242424242:|
0x6d, 0x2c, 0x74, 0x61, 0x67, 0x31, 0x3d, 0x61, 0x2c, 0x74, 0x61, 0x67, 0x32, 0x3d, 0x62, 0x62, // |m,tag1=a,tag2=bb|
- 0x2c, 0xff, 0x3d, // -|,.=|
+ 0x20, // +| |
0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, // |_value|
- 0x20, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x32, 0x20, 0x32, // -| _value=2 2|
+ 0x3d, 0x32, 0x20, 0x32, // +|=2 2|
0x31, 0x0a, 0x6f, 0x72, 0x67, 0x2d, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, // |1.org-4747474747|
0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x2c, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x2d, 0x34, 0x32, // |474747,bucket-42|
0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x3a, 0x6d, // |42424242424242:m|
0x2c, 0x74, 0x61, 0x67, 0x31, 0x3d, 0x62, 0x2c, 0x74, 0x61, 0x67, 0x32, 0x3d, 0x63, 0x63, // |,tag1=b,tag2=cc|
- 0x2c, 0xff, 0x3d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, // -|,.=_value|
0x20, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x31, 0x20, 0x32, 0x31, 0x0a, 0x6f, 0x72, 0x67, // | _value=1 21.org|
0x2d, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, // |-474747474747474|
0x37, 0x2c, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x2d, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, // |7,bucket-4242424|
0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x3a, 0x6d, 0x2c, 0x74, 0x61, 0x67, 0x31, // |242424242:m,tag1|
0x3d, 0x61, 0x2c, 0x74, 0x61, 0x67, 0x32, // |=a,tag2|
- 0x3d, 0x64, 0x64, 0x2c, 0xff, 0x3d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, // -|=dd,.=_value|
+ 0x3d, 0x64, 0x64, // +|=dd|
0x20, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x33, 0x20, 0x33, 0x31, 0x0a, 0x6f, 0x72, 0x67, // | _value=3 31.org|
0x2d, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, 0x37, 0x34, // |-474747474747474|
0x37, 0x2c, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x2d, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, // |7,bucket-4242424|
0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x34, 0x32, 0x3a, 0x6d, 0x2c, 0x74, 0x61, 0x67, 0x31, // |242424242:m,tag1|
- 0x3d, 0x63, 0x2c, 0xff, 0x3d, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, // -|=c,.=_value|
+ 0x3d, 0x63, // +|=c|
0x20, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x34, 0x20, 0x34, 0x31, 0x0a, // | _value=4 41.|
}
There are a very few 0xff bytes in there which are causing the whole thing to be rendered as a binary diff,
which is quite a bit harder to read.
Maybe there's a way of formatting diffs somehow that treats the non-ASCII bytes as exceptions rather than the rule.