aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵aml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_tet_331910040aml_tet_331820050aml_tet_331711040aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010aml_sch_331113000aml_sch_331111000aml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030aml_neu_331310000aml_neu_331113000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020aml_doc_331120000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000aml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-wifi-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-tethering-releaseandroid13-mainline-sdkext-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-resolv-releaseandroid13-mainline-permission-releaseandroid13-mainline-os-statsd-releaseandroid13-mainline-networking-releaseandroid13-mainline-mediaprovider-releaseandroid13-mainline-media-swcodec-releaseandroid13-mainline-media-releaseandroid13-mainline-ipsec-releaseandroid13-mainline-extservices-releaseandroid13-mainline-conscrypt-releaseandroid13-mainline-cellbroadcast-releaseandroid13-mainline-adbd-releaseaml_tz4_332714010Xin Li
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: I2ec081c77cc1f5d3ae2e33ae93d42bd14739f9a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
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>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s oursXin Li
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>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Id15da777ea64e396fbc908abc8565b9639f44f1d Change-Id: Id029ff234c682036ea2be41c11ed81037efe2b8e
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896 am: 71258e7197 am: b0e3dfe0c1Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: I9b4ee2c5989aa7899679b693dc4c9f9b998b5e63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896 am: 71258e7197Dan Willemsen
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>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896Dan Willemsen
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>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70beDan Willemsen
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>
2022-03-29Merge tag 'v0.5.7'Dan Willemsen
Change-Id: Ia844c88b15306dc4a38fd6649b8734841ad1c666
2022-01-04Add //go:build lines (#285)Tobias Klauser
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.
2021-12-07Drop hacks to work around Go reflection bugs in Go1.9 (#282)Joe Tsai
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.
2021-12-07Update minimum supported version to go1.11 (#281)Damien Neil
2021-10-12Reduce minimum length for specialize string diffing (#275)Joe Tsai
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>
2021-10-12Use any alias instead of interface{} (#276)Joe Tsai
See golang/go#33232.
2021-09-16Change build status badge (#269)Jake Son
Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2021-09-16Fix spelling mistakes (#271)Joe Tsai
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565d am: 229e964f85 am: ↵Dan Willemsen
435f492b8e am: 69c354c47f Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: I1ff484b18cf9c641bcfff96c2574cb2264fe0509
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565d am: 229e964f85 am: 435f492b8eDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: I81226f94b4f34d8e5318e03acabe15a1b99c5c03
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565d am: 229e964f85Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: Ia7196559f975f934aada4553c6826f793e35a5ba
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565dDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: Ieff2f6beb01a0454bfbc06de6906d4bde89a87c3
2021-08-30Merge tag 'v0.5.6' am: eabad1f147Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: I1001c3fd4a8d99cb96cf22a3a929c5a5d3c9ab4c
2021-08-27Merge tag 'v0.5.6'Dan Willemsen
Change-Id: I4f0817d7efa4a1d223643d89b511571c0ad144db
2021-07-22Use sha256 in test (#268)Joe Tsai
Some aggressive dependency checks flag the use of md5. Switch to sha256 as it accomplishes the same purpose.
2021-07-19Merge pull request #266 from dsnet/fix-formatDamien Neil
Fix textual printing of byte slices
2021-07-18Fix textual printing of byte slicesJoe Tsai
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")
2021-06-29Regen Android.bp with go2bp am: 3debcec779 am: 7265bb7848 am: ce3925a9ae am: ↵Dan Willemsen
6c0eef7755 Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I0550d20292ab0614383bfc691937456bfd988aec
2021-06-29Regen Android.bp with go2bp am: 3debcec779 am: 7265bb7848 am: ce3925a9aeDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I8a07908cb3f9b4035f3c4d2a8b42942f2cf708db
2021-06-29Regen Android.bp with go2bp am: 3debcec779 am: 7265bb7848Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I23984211bc122436aa1827b9df812f50bc63a0b2
2021-06-29Regen Android.bp with go2bp am: 3debcec779Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I2fdc020178077e2a94b42d8ae2632ebf86b11100
2021-06-28Regen Android.bp with go2bpDan Willemsen
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
2021-05-27Avoid shadowing variable (#263)Joe Tsai
Rename the shadowed variable i to j for better readability.
2021-05-27Fix staticcheck findings (#262)Joe Tsai
Address some minor issues flagged by staticcheck. None of these affect the correctness of the package.
2021-05-27[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmp am: 5996e935ac am: ↵Bob Badour
2edf3ba00c am: 3c08d93f9d am: a627337043 Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333 Change-Id: Ia13d4112eee5f58866bdbea5cf649c98d1d9c3d5
2021-05-27[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmp am: 5996e935ac am: ↵Bob Badour
2edf3ba00c am: 3c08d93f9d Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333 Change-Id: I6565661ee60ce37fecae923fbb4426dc6f54c60c
2021-05-27[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmp am: 5996e935ac am: 2edf3ba00cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333 Change-Id: Ic5124e94f1a33c104d69d88215ec4a57c2710a76
2021-05-27[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmp am: 5996e935acBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1719333 Change-Id: Ia25cc737edbc7a47010362473a6286e7bd316b49
2021-05-26[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmpBob Badour
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
2021-05-26[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmp am: 3b8a7ef8d4 am: 93d737cc3eBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/14735751 Change-Id: I1de483b7150dff9a7e8ae08f7c6d3f575130bb41
2021-05-26[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmp am: 3b8a7ef8d4Bob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/14735751 Change-Id: I0d87e8f8f9a048db2f44898c327049e9b8711896
2021-05-26[LSC] Add LOCAL_LICENSE_KINDS to external/go-cmpBob Badour
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
2021-05-26Update go-cmp to 'v0.5.5' am: 58624c34adDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1712605 Change-Id: Id511fce83de15f590e6102179878a208428bbae4
2021-05-26Create go-cmp module am: 0f7c828c80Sasha Smundak
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1327476 Change-Id: I1b0ffa29cd77a579ca4e88366c9a5198bdde5b1d
2021-05-26Merge sso://github/google/go-cmp, add mandatory files am: 1ea8835d09Sasha Smundak
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1327475 Change-Id: I9bb13705cff688a5f4b6ecdf12f2a9a374880b7d
2021-05-24Print as text if mostly text (#258)Joe Tsai
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
2021-05-24Avoid diffing by lines if inefficient (#260)Joe Tsai
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", }, "")
2021-05-24Cleanup edit groups after coalescing (#259)Joe Tsai
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 `, }, "")
2021-05-19Update go-cmp to 'v0.5.5'Dan Willemsen
Change-Id: Ic01ac28abadcda509aab67e4da9c0e0ea83769f5
2021-04-12Fix typo in path.go (#256)Ikko Ashimine
s/seperate/separate/
2021-03-03Fix reporter verbosity bug (#253)Joe Tsai
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.
2021-03-03De-virtualize interfaces for specialized diffing (#254)Joe Tsai
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{}.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 20:02:35 +0000