50484 2010-12-03 13:58:00 -0800 Rebaseline server: use pretty text diff output 2010-12-03 17:46:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 47761 1 mihaip mihaip tony oldest_to_newest 317036 0 mihaip 2010-12-03 13:58:00 -0800 Rebaseline server: use pretty text diff output 317041 1 75540 mihaip 2010-12-03 14:06:26 -0800 Created attachment 75540 Patch 317049 2 75540 tony 2010-12-03 14:22:12 -0800 Comment on attachment 75540 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75540&action=review > WebKitTools/Scripts/webkitpy/tool/commands/rebaselineserver.py:177 > + elif mode == 'diff-text-pretty': > + file_name = test_name + '-pretty-diff.html' I normally use dictionaries for stuff like this. E.g.: suffix = { 'expected-text': '-expected.txt', 'actual-text': '-actual.txt', ... }[mode] file_name = test_name + suffix But I don't feel strongly about it and this case is a bit awkward because it's a suffix. 317193 3 mihaip 2010-12-03 17:46:34 -0800 Committed r73320: <http://trac.webkit.org/changeset/73320> 75540 2010-12-03 14:06:26 -0800 2010-12-03 14:22:12 -0800 Patch bug-50484-20101203140624.patch text/plain 4315 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhZmQyZDk1ZDJiNzYxMzE2YjljYjQ5Yzc0ZmNlM2I5MTE2NjdlNjcxLi5hNTA4Mjcz NmUzOGM3NDRkYTEzM2ViMzA0ODA0OGZmMDhlZjc0ZGFiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAK IDIwMTAtMTItMDMgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNlbGluZSBz ZXJ2ZXI6IHVzZSBwcmV0dHkgdGV4dCBkaWZmIG91dHB1dAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA0ODQKKyAgICAgICAgCisgICAgICAgIFNlcnZl ICotcHJldHR5LWRpZmYuaHRtbCBmb3IgdGV4dCBkaWZmIG91dHB1dC4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvaW5kZXgu aHRtbDoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJh c2VsaW5lc2VydmVyL21haW4uY3NzOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvbWFpbi5qczoKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZXNlcnZlci5weToKKworMjAxMC0xMi0w MyAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZp ZXdlZCBieSBUb255IENoYW5nLgogCiAgICAgICAgIFJlYmFzZWxpbmUgc2VydmVyOiBvcmdhbml6 ZSB0ZXN0cyBieSBzdGF0ZSwgYWRkIGRyeSBydW4gbW9kZQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9p bmRleC5odG1sIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rh dGEvcmViYXNlbGluZXNlcnZlci9pbmRleC5odG1sCmluZGV4IDViNTgzMDFiZTc0MmY4ODVjODZh MTY3ZWRjMTljZDFiZTRhNmE0NWYuLjhiZGY3YzIyZTk2MTA5YzNmOTEwNzFjMDY1ODk5M2FhZWVi ZDNlMDMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvaW5kZXguaHRtbAorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJhc2VsaW5lc2VydmVyL2luZGV4 Lmh0bWwKQEAgLTExMiw5ICsxMTIsOSBAQAogICAgICAgPHRkIGNvbHNwYW49IjMiPjxoMj5UZXh0 PC9oMj48L3RkPgogICAgIDwvdHI+CiAgICAgPHRyPgotICAgICAgPHRkPjxwcmUgaWQ9ImV4cGVj dGVkLXRleHQiPjwvcHJlPjwvdGQ+Ci0gICAgICA8dGQ+PHByZSBpZD0iYWN0dWFsLXRleHQiPjwv cHJlPjwvdGQ+Ci0gICAgICA8dGQ+PHByZSBpZD0iZGlmZi10ZXh0Ij48cHJlPjwvdGQ+CisgICAg ICA8dGQ+PHByZSBpZD0iZXhwZWN0ZWQtdGV4dCIgY2xhc3M9InRleHQtb3V0cHV0Ij48L3ByZT48 L3RkPgorICAgICAgPHRkPjxwcmUgaWQ9ImFjdHVhbC10ZXh0IiBjbGFzcz0idGV4dC1vdXRwdXQi PjwvcHJlPjwvdGQ+CisgICAgICA8dGQ+PGRpdiBpZD0iZGlmZi10ZXh0LXByZXR0eSIgY2xhc3M9 InRleHQtb3V0cHV0Ij48L2Rpdj48L3RkPgogICAgIDwvdHI+CiAgIDwvdGJvZHk+CiA8L3RhYmxl PgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmNzcyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvbWFpbi5jc3MKaW5kZXgg YWZmMmJmNjlkOWFlNGQxMWMzZDAwMWY1NmY5MmQ0OWYwNDg4ZmFiMi4uNzY2NDNjNWZlMTVkZjBl MWY2MWNkOWU0ODA4NjQ4OWVkYjA0NDdhMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmNzcwor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9yZWJh c2VsaW5lc2VydmVyL21haW4uY3NzCkBAIC0xODAsNyArMTgwLDcgQEAgYSwgLmxpbmsgewogICBj b2xvcjogIzY2NjsKIH0KIAotI3RleHQtb3V0cHV0cyBwcmUgeworI3RleHQtb3V0cHV0cyAudGV4 dC1vdXRwdXQgewogICBoZWlnaHQ6IDYwMHB4OwogICB3aWR0aDogODAwcHg7CiAgIG92ZXJmbG93 OiBhdXRvOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmpzIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2RhdGEvcmViYXNlbGluZXNlcnZlci9tYWluLmpzCmlu ZGV4IDkyZjdiN2RhZWJmNDBjNzExM2I1OGUwODhkNDBhZGJjNGM0YmZjYTEuLmFlYWFjMDRkZjU3 M2FmYmMyNTU4YzRlYzNlNTM5ZmNhNTcwYjdjNDYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kYXRhL3JlYmFzZWxpbmVzZXJ2ZXIvbWFpbi5q cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZGF0YS9y ZWJhc2VsaW5lc2VydmVyL21haW4uanMKQEAgLTQ4NiwxMCArNDg2LDE0IEBAIGZ1bmN0aW9uIHVw ZGF0ZUltYWdlRGlmZigpIHsKICAgICB9CiB9CiAKLWZ1bmN0aW9uIGxvYWRUZXh0UmVzdWx0KHRl c3ROYW1lLCBtb2RlKQorZnVuY3Rpb24gbG9hZFRleHRSZXN1bHQodGVzdE5hbWUsIG1vZGUsIHJl c3BvbnNlSXNIdG1sKQogewogICAgIGxvYWRUZXh0KGdldFRlc3RSZXN1bHRVcmwodGVzdE5hbWUs IG1vZGUpLCBmdW5jdGlvbih0ZXh0KSB7Ci0gICAgICAgICQobW9kZSkudGV4dENvbnRlbnQgPSB0 ZXh0OworICAgICAgICBpZiAocmVzcG9uc2VJc0h0bWwpIHsKKyAgICAgICAgICAgICQobW9kZSku aW5uZXJIVE1MID0gdGV4dDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICQobW9kZSku dGV4dENvbnRlbnQgPSB0ZXh0OworICAgICAgICB9CiAgICAgfSk7CiB9CiAKQEAgLTQ5Nyw3ICs1 MDEsNyBAQCBmdW5jdGlvbiBkaXNwbGF5VGV4dFJlc3VsdHModGVzdE5hbWUpCiB7CiAgICAgbG9h ZFRleHRSZXN1bHQodGVzdE5hbWUsICdleHBlY3RlZC10ZXh0Jyk7CiAgICAgbG9hZFRleHRSZXN1 bHQodGVzdE5hbWUsICdhY3R1YWwtdGV4dCcpOwotICAgIGxvYWRUZXh0UmVzdWx0KHRlc3ROYW1l LCAnZGlmZi10ZXh0Jyk7CisgICAgbG9hZFRleHRSZXN1bHQodGVzdE5hbWUsICdkaWZmLXRleHQt cHJldHR5JywgdHJ1ZSk7CiB9CiAKIGZ1bmN0aW9uIG5leHRUZXN0KCkKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lc2VydmVy LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxp bmVzZXJ2ZXIucHkKaW5kZXggYWQ1MWYyZDQ4ZTVlNGYzODBhNWZiNDMzMTU2NmM1NDg0NTQ0NzFk ZS4uNTY3ODBiNTFkYTg2M2I5NGNjZDEzY2E2N2YyNzBmNTA4NzFjZGUzOCAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVzZXJ2 ZXIucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3Jl YmFzZWxpbmVzZXJ2ZXIucHkKQEAgLTE3Myw2ICsxNzMsOCBAQCBjbGFzcyBSZWJhc2VsaW5lSFRU UFJlcXVlc3RIYW5kbGVyKEJhc2VIVFRQU2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgog ICAgICAgICAgICAgZmlsZV9uYW1lID0gdGVzdF9uYW1lICsgJy1hY3R1YWwudHh0JwogICAgICAg ICBlbGlmIG1vZGUgPT0gJ2RpZmYtdGV4dCc6CiAgICAgICAgICAgICBmaWxlX25hbWUgPSB0ZXN0 X25hbWUgKyAnLWRpZmYudHh0JworICAgICAgICBlbGlmIG1vZGUgPT0gJ2RpZmYtdGV4dC1wcmV0 dHknOgorICAgICAgICAgICAgZmlsZV9uYW1lID0gdGVzdF9uYW1lICsgJy1wcmV0dHktZGlmZi5o dG1sJwogCiAgICAgICAgIGZpbGVfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLnNlcnZlci50ZXN0 X2NvbmZpZy5yZXN1bHRzX2RpcmVjdG9yeSwgZmlsZV9uYW1lKQogCg==