63804 2011-07-01 07:29:25 -0700 commit-log-editor reorders ChangeLog entries in unexpected ways 2011-07-01 08:21:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED http://trac.webkit.org/log/trunk P2 Normal --- 1 aroben webkit-unassigned darin dbates ddkilzer oldest_to_newest 431145 0 aroben 2011-07-01 07:29:25 -0700 In bug 27754, commit-log-editor was changed to reorder ChangeLog entries to try to get the bug title and URL to be at the top of the commit message. This was intended to make commit messages be more git-friendly. (Lots of git tools expect a one-line summary of the change at the top of the commit message.) This reordering is somewhat surprising, and the conditions under which it is performed are hard to determine. This leads to a surprising experience for users. I think it would be much better if we just changed the template prepare-ChangeLog uses to put the bug title and URL at the top of the ChangeLog. Then commit-log-editor wouldn't have to do any reordering. 431162 1 99472 aroben 2011-07-01 08:11:58 -0700 Created attachment 99472 commit-log-editor reorders ChangeLog entries in unexpected ways 431163 2 aroben 2011-07-01 08:21:29 -0700 Committed r90229: <http://trac.webkit.org/changeset/90229> 99472 2011-07-01 08:11:58 -0700 2011-07-01 08:15:08 -0700 commit-log-editor reorders ChangeLog entries in unexpected ways bug-63804-20110701111156.patch text/plain 5651 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogOTAyMjcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMWQzZDM2OTA4ZTNlMDExN2UwOTBhNDhiZmUxMTYwZWJh NjAwZjllLi40ZWY0YzYxNjFjMzk0MjJiYzYyYzYxOWQ4YjVjYmJkNDQ5M2YwMGI4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDctMDEgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCisgICAgICAg IGNvbW1pdC1sb2ctZWRpdG9yIHJlb3JkZXJzIENoYW5nZUxvZyBlbnRyaWVzIGluIHVuZXhwZWN0 ZWQgd2F5cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjM4MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBj b21taXQtbG9nLWVkaXRvciB3YXMgY2hhbmdlZCBpbiByNDY4OTkgdG8gbW92ZSB0aGUgYnVnIHRp dGxlIGFuZCBVUkwgdG8gdGhlIHRvcCBvZiB0aGUKKyAgICAgICAgY29tbWl0IG1lc3NhZ2UgaW4g b3JkZXIgdG8gbWFrZSBnaXQtYmFzZWQgdG9vbHMsIHdoaWNoIGV4cGVjdCB0aGUgZmlyc3QgbGlu ZSBvZiB0aGUgY29tbWl0CisgICAgICAgIG1lc3NhZ2UgdG8gYmUgYSBzdW1tYXJ5IG9mIHRoZSBj aGFuZ2UsIHRvIHdvcmsgYmV0dGVyLiBCdXQgdGhpcyByZW9yZGVyaW5nIG9mIHRoZSBDaGFuZ2VM b2cKKyAgICAgICAgZW50cnkgd2FzIHVucHJlZGljdGFibGUgYW5kIHVuZXhwZWN0ZWQuCisKKyAg ICAgICAgSSBjaGFuZ2VkIHByZXBhcmUtQ2hhbmdlTG9nIHRvIHB1dCB0aGUgYnVnIHRpdGxlIGFu ZCBVUkwgYXQgdGhlIHRvcCBvZiB0aGUgQ2hhbmdlTG9nIGVudHJ5CisgICAgICAgIHNvIHRoYXQg Y29tbWl0LWxvZy1lZGl0b3IgZG9lc24ndCBoYXZlIHRvIG1vdmUgdGhlbS4gVGhlbiBJIGNoYW5n ZWQgY29tbWl0LWxvZy1lZGl0b3Igbm90IHRvCisgICAgICAgIHRyeSB0byBtb3ZlIHRoZW0uCisK KyAgICAgICAgKiBTY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yOiBQYXJ0aWFsbHkgcmV2ZXJ0ZWQg cjQ2ODk5LiBXZSBubyBsb25nZXIgc2F2ZSB0aGUgIlJldmlld2VkIGJ5IgorICAgICAgICBsaW5l IGFuZCB0cnkgdG8gbW92ZSBpdCBkb3duIGJlbG93IHRoZSBidWcgdGl0bGUgYW5kIFVSTC4gVGhl IG9yZGVyIG9mIHRoZSB0ZXh0IGluIHRoZQorICAgICAgICBDaGFuZ2VMb2cgaXMgbm93IHByZXNl cnZlZCwgZXhjZXB0IHRoYXQgd2UgaW5zZXJ0IGEgIlBhdGNoIGJ5IiBsaW5lIGp1c3QgYWJvdmUg dGhlICJSZXZpZXdlZAorICAgICAgICBieSIgbGluZSBpbiBjYXNlcyB3aGVyZSB0aGUgY29tbWl0 dGVyIGFuZCBhdXRob3IgYXJlIG5vdCB0aGUgc2FtZSBwZXJzb24uCisKKyAgICAgICAgKiBTY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nOiBNb3ZlZCB0aGUgIlJldmlld2VkIGJ5IiBsaW5lIGRvd24g YmVsb3cgdGhlIGJ1ZyB0aXRsZSBhbmQgVVJMLgorCiAyMDExLTA3LTAxICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByOTAyMTMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRp dG9yIGIvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgppbmRleCAyZGRhN2UyMWU1YTQ5 NDFhNjY0MTljODQ2MjZhZTczMzQ2Yjk3NjhjLi5lODVjNGFhMTBkMDE2ODcxNjY4YWEwOTQ1ZjU5 ZDVkYThlNmI0ZjU2IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9y CisrKyBiL1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKQEAgLTE1Miw3ICsxNTIsNiBA QCBmb3IgbXkgJGNoYW5nZUxvZyAoQGNoYW5nZUxvZ3MpIHsKICAgICBvcGVuIENIQU5HRUxPRywg JGNoYW5nZUxvZyBvciBkaWUgIkNhbid0IG9wZW4gJGNoYW5nZUxvZyI7CiAgICAgbXkgJGNvbnRl bnRzID0gIiI7CiAgICAgbXkgJGJsYW5rTGluZXMgPSAiIjsKLSAgICBteSAkcmV2aWV3ZWRCeUxp bmUgPSAiIjsKICAgICBteSAkbGluZUNvdW50ID0gMDsKICAgICBteSAkZGF0ZSA9ICIiOwogICAg IG15ICRhdXRob3IgPSAiIjsKQEAgLTE2MywyMCArMTYyLDE0IEBAIGZvciBteSAkY2hhbmdlTG9n IChAY2hhbmdlTG9ncykgewogICAgICAgICAgICAgbGFzdCBpZiAkY29udGVudHM7CiAgICAgICAg IH0KICAgICAgICAgaWYgKC9cUy8pIHsKLSAgICAgICAgICAgIG15ICRwcmV2aW91c0xpbmVXYXNC bGFuayA9IDEgdW5sZXNzICRibGFua0xpbmVzIGVxICIiOwotICAgICAgICAgICAgbXkgJGxpbmUg PSAkXzsKLSAgICAgICAgICAgIG15ICRjdXJyZW50TGluZUJsYW5rTGluZXMgPSAkYmxhbmtMaW5l czsKKyAgICAgICAgICAgICRjb250ZW50cyAuPSAkYmxhbmtMaW5lcyBpZiAkY29udGVudHM7CiAg ICAgICAgICAgICAkYmxhbmtMaW5lcyA9ICIiOwogCisgICAgICAgICAgICBteSAkbGluZSA9ICRf OworCiAgICAgICAgICAgICAjIFJlbW92ZSBpbmRlbnRhdGlvbiBzcGFjZXMKICAgICAgICAgICAg ICRsaW5lID1+IHMvXiB7OH0vLzsKIAotICAgICAgICAgICAgIyBTYXZlIHRoZSByZXZpZXdlZCAv IHJ1YmJlciBzdGFtcGVkIGJ5IGxpbmUuCi0gICAgICAgICAgICBpZiAoJGxpbmUgPX4gbS9eUmV2 aWV3ZWQgYnkgLiovIHx8ICRsaW5lID1+IG0vXlJ1YmJlclsgXC1dP3N0YW1wZWQgYnkgLiovKSB7 Ci0gICAgICAgICAgICAgICAgJHJldmlld2VkQnlMaW5lID0gJGxpbmU7Ci0gICAgICAgICAgICAg ICAgbmV4dDsKLSAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgIyBHcmFiIHRoZSBhdXRob3Ig YW5kIHRoZSBkYXRlIGxpbmUKICAgICAgICAgICAgIGlmICgkbGluZSA9fiBtL14oWzAtOV17NH0t WzAtOV17Mn0tWzAtOV17Mn0pXHMrKC4qW15cc10pXHMrPCguKik+LyAmJiAkbGluZUNvdW50ID09 IDApIHsKICAgICAgICAgICAgICAgICAkZGF0ZSA9ICQxOwpAQCAtMTg2LDEwICsxNzksOCBAQCBm b3IgbXkgJGNoYW5nZUxvZyAoQGNoYW5nZUxvZ3MpIHsKICAgICAgICAgICAgICAgICBuZXh0Owog ICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAkY29udGVudHMgLj0gJGN1cnJlbnRMaW5lQmxh bmtMaW5lcyBpZiAkY29udGVudHM7Ci0KLSAgICAgICAgICAgICMgQXR0ZW1wdCB0byBpbnNlcnQg dGhlICJwYXRjaCBieSIgbGluZSwgYWZ0ZXIgdGhlIGZpcnN0IGJsYW5rIGxpbmUuCi0gICAgICAg ICAgICBpZiAoJHByZXZpb3VzTGluZVdhc0JsYW5rICYmICRoYXNBdXRob3JJbmZvVG9Xcml0ZSAm JiAkbGluZUNvdW50ID4gMCkgeworICAgICAgICAgICAgaWYgKCRsaW5lID1+IG0vXlJldmlld2Vk IGJ5IC4qLyB8fCAkbGluZSA9fiBtL15SdWJiZXJbIFwtXT9zdGFtcGVkIGJ5IC4qLykgeworICAg ICAgICAgICAgICAgICMgSW5zZXJ0IHRoZSAiUGF0Y2ggYnkiIGxpbmUganVzdCBhYm92ZSB0aGUg IlJldmlld2VkIGJ5IiBsaW5lLCBpZiBuZWVkZWQuCiAgICAgICAgICAgICAgICAgbXkgJGNvbW1p dHRlckVtYWlsID0gY2hhbmdlTG9nRW1haWxBZGRyZXNzKCk7CiAgICAgICAgICAgICAgICAgbXkg JGF1dGhvckFuZENvbW1pdHRlckFyZVNhbWVQZXJzb24gPSAkZW1haWwgZXEgJGNvbW1pdHRlckVt YWlsOwogICAgICAgICAgICAgICAgIGlmICghJGF1dGhvckFuZENvbW1pdHRlckFyZVNhbWVQZXJz b24pIHsKQEAgLTE5OCwxMSArMTg5LDYgQEAgZm9yIG15ICRjaGFuZ2VMb2cgKEBjaGFuZ2VMb2dz KSB7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAjIEF0 dGVtcHQgdG8gaW5zZXJ0IHRoZSAicmV2aWV3ZWQgYnkiIGxpbmUsIGFmdGVyIHRoZSBmaXJzdCBi bGFuayBsaW5lLgotICAgICAgICAgICAgaWYgKCRwcmV2aW91c0xpbmVXYXNCbGFuayAmJiAkcmV2 aWV3ZWRCeUxpbmUgJiYgJGxpbmVDb3VudCA+IDApIHsKLSAgICAgICAgICAgICAgICAkY29udGVu dHMgLj0gJHJldmlld2VkQnlMaW5lIC4gIlxuIjsKLSAgICAgICAgICAgICAgICAkcmV2aWV3ZWRC eUxpbmUgPSAiIjsKLSAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgJGxpbmVDb3VudCsrOwog ICAgICAgICAgICAgJGNvbnRlbnRzIC49ICRsaW5lOwpAQCAtMjEwLDkgKzE5Niw2IEBAIGZvciBt eSAkY2hhbmdlTG9nIChAY2hhbmdlTG9ncykgewogICAgICAgICAgICAgJGJsYW5rTGluZXMgLj0g JF87CiAgICAgICAgIH0KICAgICB9Ci0gICAgaWYgKCRyZXZpZXdlZEJ5TGluZSkgewotICAgICAg ICAkY29udGVudHMgLj0gIlxuIi4kcmV2aWV3ZWRCeUxpbmU7Ci0gICAgfQogICAgIGNsb3NlIENI QU5HRUxPRzsKIAogICAgICRjaGFuZ2VMb2cgPSBGaWxlOjpTcGVjLT5hYnMycmVsKEZpbGU6OlNw ZWMtPnJlbDJhYnMoJGNoYW5nZUxvZyksICR0b3BMZXZlbCk7CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv ZwppbmRleCAzYjY1ZmMyYWM3ZWY3YmI4OTdiOTYzYzk1NGU5ZDYyNjI2OTFlOTUyLi4xNmI1ZmJm NTc1NmYwY2M3YjE2ZjUxMGJiMDQ0ZDhkMGNiYmI5MjEzIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VM b2cKQEAgLTM5Myw3ICszOTMsNiBAQCBmb3JlYWNoIG15ICRwcmVmaXggKEBwcmVmaXhlcykgewog ICAgIG15ICgkcmV2aWV3ZXIsICRkZXNjcmlwdGlvbikgPSByZXZpZXdlckFuZERlc2NyaXB0aW9u Rm9yR2l0Q29tbWl0KCRnaXRDb21taXQpIGlmICRnaXRDb21taXQ7CiAgICAgJHJldmlld2VyID0g Ik5PQk9EWSAoT08iIC4gIlBTISkiIGlmICEkcmV2aWV3ZXI7CiAKLSAgICBwcmludCBDSEFOR0Vf TE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAgICAgIFJldmlld2VkIGJ5ICRyZXZpZXdlci5c blxuIiwgJGVuZGwpOwogICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3Mo JGRlc2NyaXB0aW9uIC4gIlxuIiwgJGVuZGwpIGlmICRkZXNjcmlwdGlvbjsKIAogICAgICRidWdE ZXNjcmlwdGlvbiA9ICJOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwgKE9PUFMh KSIgdW5sZXNzICRidWdEZXNjcmlwdGlvbjsKQEAgLTQwMSw2ICs0MDAsOCBAQCBmb3JlYWNoIG15 ICRwcmVmaXggKEBwcmVmaXhlcykgewogICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGlu ZUVuZGluZ3MoIiAgICAgICAgJGJ1Z1VSTFxuIiwgJGVuZGwpIGlmICRidWdVUkw7CiAgICAgcHJp bnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCk7CiAKKyAgICBw cmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAgICAgIFJldmlld2VkIGJ5 ICRyZXZpZXdlci5cblxuIiwgJGVuZGwpOworCiAgICAgaWYgKCRwcmVmaXggPX4gbS9XZWJDb3Jl LyB8fCBgcHdkYCA9fiBtL1dlYkNvcmUvKSB7CiAgICAgICAgIGlmICgkZGlkQ2hhbmdlUmVncmVz c2lvblRlc3RzKSB7CiAgICAgICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVF bmRpbmdzKHRlc3RMaXN0Rm9yQ2hhbmdlTG9nKHNvcnQgQGFkZGVkUmVncmVzc2lvblRlc3RzKSwg JGVuZGwpOwo=