Age | Commit message (Collapse) | Author |
|
am: a3f99847d9 -s ours am: 8dab502b73 -s ours am: 1d7f911f63 -s ours
am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764
Change-Id: Ie5df2a575ae4339db8837a041c76f92c87145565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: a3f99847d9 -s ours am: 8dab502b73 -s ours
am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764
Change-Id: I3472bf00e696d70cbe06809dcd29ef029dc85f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: a3f99847d9 -s ours
am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764
Change-Id: I93ea5e61fbda01e65992334d4ceeef31c8ab9d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764
Change-Id: Ic62e88a0e2557e560b00e24d7faf221f55dd3a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 226662282
Merged-In: Id15da777ea64e396fbc908abc8565b9639f44f1d
Change-Id: Id029ff234c682036ea2be41c11ed81037efe2b8e
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006
Change-Id: Iab1e06b1a1a985b3a12cf5e626250678bf1fb825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006
Change-Id: Id15da777ea64e396fbc908abc8565b9639f44f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006
Change-Id: I2bbabb46fbdcb32817f7842f50c574404f40dffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Change-Id: Ia844c88b15306dc4a38fd6649b8734841ad1c666
|
|
Starting with Go 1.17, //go:build lines are preferred over // +build
lines, see https://golang.org/doc/go1.17#build-lines and
https://golang.org/design/draft-gobuild for details.
This change was generated by running Go 1.17 go fmt ./... which
automatically adds //go:build lines based on the existing // +build
lines.
Also update the corresponding GitHub action to use Go 1.17 gofmt.
|
|
Now that Go 1.11 is the minimally supported version,
we can drop some local hacks to work around bugs in
reflect that were present in Go1.9.
|
|
|
|
The original threshold of 64 was chosen without much thought.
Lower it to 32 now that we have some concrete examples
that it is aesthetically better.
Co-authored-by: Damien Neil <neild@users.noreply.github.com>
|
|
See golang/go#33232.
|
|
Co-authored-by: Damien Neil <neild@users.noreply.github.com>
|
|
|
|
435f492b8e am: 69c354c47f
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316
Change-Id: I1ff484b18cf9c641bcfff96c2574cb2264fe0509
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316
Change-Id: I81226f94b4f34d8e5318e03acabe15a1b99c5c03
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316
Change-Id: Ia7196559f975f934aada4553c6826f793e35a5ba
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316
Change-Id: Ieff2f6beb01a0454bfbc06de6906d4bde89a87c3
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316
Change-Id: I1001c3fd4a8d99cb96cf22a3a929c5a5d3c9ab4c
|
|
Change-Id: I4f0817d7efa4a1d223643d89b511571c0ad144db
|
|
Some aggressive dependency checks flag the use of md5.
Switch to sha256 as it accomplishes the same purpose.
|
|
Fix textual printing of byte slices
|
|
There are two bugs being fixed:
1. The hueristic for whether a slice of byte looks like text
should check whether a rune IsPrint OR IsSpace, and not both.
Only a single rune (i.e., U+0020) ever satisfies both conditions.
Previously, it would print as:
MyBytes{0x68, 0x65, 0x6c, 0x6c, 0x6f}
and now it would now print as:
MyBytes(MyBytes("hello"))
2. If we're printing as string, then we should set skipType=true
since we already explicitly format the value with the type.
Previously, it would print as:
MyBytes(MyBytes("hello"))
and now it would now print as:
MyBytes("hello")
|
|
6c0eef7755
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978
Change-Id: I0550d20292ab0614383bfc691937456bfd988aec
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978
Change-Id: I8a07908cb3f9b4035f3c4d2a8b42942f2cf708db
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978
Change-Id: I23984211bc122436aa1827b9df812f50bc63a0b2
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978
Change-Id: I2fdc020178077e2a94b42d8ae2632ebf86b11100
|
|
This adds support for the cmpopts package, which is required by the new
protobuf API. It also includes the tests so that they get run.
Change-Id: Ib020b6ce4cccc1ec0a60c5d89193ca437ddcc1a6
|
|
Rename the shadowed variable i to j for better readability.
|
|
Address some minor issues flagged by staticcheck.
None of these affect the correctness of the package.
|
|
2edf3ba00c am: 3c08d93f9d am: a627337043
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333
Change-Id: Ia13d4112eee5f58866bdbea5cf649c98d1d9c3d5
|
|
2edf3ba00c am: 3c08d93f9d
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333
Change-Id: I6565661ee60ce37fecae923fbb4426dc6f54c60c
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333
Change-Id: Ic5124e94f1a33c104d69d88215ec4a57c2710a76
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333
Change-Id: Ia25cc737edbc7a47010362473a6286e7bd316b49
|
|
Added SPDX-license-identifier-BSD to:
Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I986cbf13affb6752d52e3002bc01d37e32d3b52c
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/14735751
Change-Id: I1de483b7150dff9a7e8ae08f7c6d3f575130bb41
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/14735751
Change-Id: I0d87e8f8f9a048db2f44898c327049e9b8711896
|
|
Added SPDX-license-identifier-BSD to:
Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ia15c0733793a7619c617c746a0c4e24d739d45f5
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1712605
Change-Id: Id511fce83de15f590e6102179878a208428bbae4
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1327476
Change-Id: I1b0ffa29cd77a579ca4e88366c9a5198bdde5b1d
|
|
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1327475
Change-Id: I9bb13705cff688a5f4b6ecdf12f2a9a374880b7d
|
|
The previous heuristic of treating strings as binary data
if it contains any invalid UTF-8 was too strict.
Loosen the heuristic to check if most of the characters
are printable text.
Fixes #257
|
|
Avoid diffing by lines if it turns out to be significantly less
efficient than diffing by bytes.
Before this change:
(
"""
- d5c14bdf6bac81c27afc5429500ed750
- 25483503b557c606dad4f144d27ae10b
- 90bdbcdbb6ea7156068e3dcfb7459244
- 978f480a6e3cced51e297fbff9a506b7
+ Xd5c14bdf6bac81c27afc5429500ed750
+ X25483503b557c606dad4f144d27ae10b
+ X90bdbcdbb6ea7156068e3dcfb7459244
+ X978f480a6e3cced51e297fbff9a506b7
"""
)
After this change:
strings.Join({
+ "X",
"d5c14bdf6bac81c27afc5429500ed750\n",
+ "X",
"25483503b557c606dad4f144d27ae10b\n",
+ "X",
"90bdbcdbb6ea7156068e3dcfb7459244\n",
+ "X",
"978f480a6e3cced51e297fbff9a506b7\n",
}, "")
|
|
Even with an optimal diffing algoritm, coalescing adjacent edit groups
may cause the corresponding pair of strings for an edit group to have
leading or trailing spans of equal elements.
While this is technically a correct representation of a diff,
it is a suboptimal outcome. As such, scan through all unequal groups and
move leading/trailing equal spans to the preceding/succeeding equal group.
Before this change:
strings.Join({
"org-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=aa",
- ",#=_value _value=2 ",
+ " _value=2 ",
`11 org-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=bb`,
- ",#=_value _value=2 2",
+ " _value=2 2",
`1 org-4747474747474747,bucket-4242424242424242:m,tag1=b,tag2=cc`,
- ",#=_value",
` _value=1 21 org-4747474747474747,bucket-4242424242424242:m,tag1`,
"=a,tag2",
- "=dd,#=_value",
+ "=dd",
` _value=3 31 org-4747474747474747,bucket-4242424242424242:m,tag1`,
- "=c,#=_value",
+ "=c",
` _value=4 41 `,
}, "")
After this change:
strings.Join({
"org-4747474747474747,bucket-4242424242424242:m,tag1=a,tag2=aa",
- ",#=_value",
` _value=2 11 org-4747474747474747,bucket-4242424242424242:m,tag1`,
"=a,tag2=bb",
- ",#=_value",
` _value=2 21 org-4747474747474747,bucket-4242424242424242:m,tag1`,
"=b,tag2=cc",
- ",#=_value",
` _value=1 21 org-4747474747474747,bucket-4242424242424242:m,tag1`,
"=a,tag2=dd",
- ",#=_value",
` _value=3 31 org-4747474747474747,bucket-4242424242424242:m,tag1`,
"=c",
- ",#=_value",
` _value=4 41 `,
}, "")
|
|
Change-Id: Ic01ac28abadcda509aab67e4da9c0e0ea83769f5
|
|
s/seperate/separate/
|
|
FormatDiff should only set the verbosity to 3 if the current verbosity
is lower than 3. Otherwise, it may remove an intended higher verbosity
setting causing the reporter output to not differentiate between
two large values that are different at the end.
While we are at it, increase the maxVerbosityPreset to 6.
|
|
Specialized diffing strings and slices should occur for
interface types where both values have the same concrete type.
This is especially relevant for protocmp.Transform,
which transforms every proto.Message as a map[string]interface{}.
|