26664 2009-06-23 15:35:30 -0700 Add a flag to prepare-ChangeLog to only check the git index 2009-06-23 16:11:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 0 joenotcharles webkit-unassigned aroben manyoso oldest_to_newest 127710 0 joenotcharles 2009-06-23 15:35:30 -0700 By default, prepare-ChangeLog has two modes when used with git: by default it looks at all changes in both the index and the working tree, and with the --git-commit switch it looks at all changes in a specific commit. When preparing a new commit, the most useful thing to do is to look only at the changes in the index so that the ChangeLog entry exactly matches what's about to be checked in. Changes that are in the working tree but not the index aren't part of this commit so they shouldn't usually go in the ChangeLog. Workflow with this switch would be: Make code changes git add (list of affected files) prepare-ChangeLog --git-index edit ChangeLog entries git add (ChangeLog file) git commit -t /path/to/ChangeLog (and remove all entries but the first from the commit message) (This should be added as a flag to avoid confusing people who are already used to the old behaviour.) 127711 1 31747 joenotcharles 2009-06-23 15:37:05 -0700 Created attachment 31747 implement this flag This patch was created with this very process! 127715 2 31748 joenotcharles 2009-06-23 15:44:59 -0700 Created attachment 31748 same patch with updated copyright info 127725 3 31748 manyoso 2009-06-23 16:01:39 -0700 Comment on attachment 31748 same patch with updated copyright info I'd also be open to '--git-cached' or '--git-staged' for the flag name. But the first thing said under the documentation for 'git add' is, "git-add - Add file contents to the index." Also, the main tutorial is full of references to the "index". So I guess we'll go with that. 127727 4 manyoso 2009-06-23 16:11:26 -0700 Landed with r45012. 31747 2009-06-23 15:37:05 -0700 2009-06-23 15:44:59 -0700 implement this flag prepare-ChangeLog.patch text/plain 3300 joenotcharles ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2M2ZmYjEwLi5kOThjMzllIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDktMDYt MjMgIEpvZSBNYXNvbiAgPGpvZS5tYXNvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hh bmdlTG9nOiBBZGRlZCAtLWdpdC1pbmRleCBtb2RlIHRvIGxpc3Qgb25seSB0aGUKKyAgICAgICAg Y2hhbmdlcyB3aGljaCBhcmUgYWxyZWFkeSBzdGFnZWQgaW4gdGhlIGluZGV4LiAgVXNlZnVsIHRv IGNyZWF0ZSBhbgorICAgICAgICBlbnRyeSBmb3Igd2hhdCB5b3UncmUgYWJvdXQgdG8gY29tbWl0 IHdoaWxlIGlnbm9yaW5nIHVuc3RhZ2VkIGNoYW5nZXMuCisKIDIwMDktMDYtMjMgIEVyaWMgU2Vp ZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9XZWJL aXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCmluZGV4IDIzYjAxZDQuLjE0OThhZTIg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwpAQCAtOTMsNiArOTMsNyBAQCBz dWIgbm9ybWFsaXplUGF0aCgkKTsKIG15ICRjaGFuZ2VMb2dUaW1lWm9uZSA9ICJQU1Q4UERUIjsK IAogbXkgJGdpdENvbW1pdCA9IDA7CitteSAkZ2l0SW5kZXggPSAiIjsKIG15ICRnaXRSZXZpZXdl ciA9ICIiOwogbXkgJG9wZW5DaGFuZ2VMb2dzID0gMDsKIG15ICRzaG93SGVscCA9IDA7CkBAIC0x MDEsNiArMTAyLDcgQEAgbXkgJHVwZGF0ZUNoYW5nZUxvZ3MgPSAxOwogbXkgJHBhcnNlT3B0aW9u c1Jlc3VsdCA9CiAgICAgR2V0T3B0aW9ucygiZGlmZnxkISIgPT4gXCRzcGV3RGlmZiwKICAgICAg ICAgICAgICAgICJnaXQtY29tbWl0OnMiID0+IFwkZ2l0Q29tbWl0LAorICAgICAgICAgICAgICAg ImdpdC1pbmRleCIgPT4gXCRnaXRJbmRleCwKICAgICAgICAgICAgICAgICJnaXQtcmV2aWV3ZXI6 cyIgPT4gXCRnaXRSZXZpZXdlciwKICAgICAgICAgICAgICAgICJoZWxwfGghIiA9PiBcJHNob3dI ZWxwLAogICAgICAgICAgICAgICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MsCkBAIC0x MDksNiArMTExLDcgQEAgaWYgKCEkcGFyc2VPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewog ICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstZHwtLWRpZmZdIFstaHwtLWhlbHBd IFstb3wtLW9wZW5dIFstLWdpdC1jb21taXQ9PGNvbW1pdHRpc2g+XSBbLS1naXQtcmV2aWV3ZXI9 PG5hbWU+XSBbc3ZuZGlyMSBbc3ZuZGlyMiAuLi5dXVxuIjsKICAgICBwcmludCBTVERFUlIgIiAg LWR8LS1kaWZmICAgICAgU3BldyBkaWZmIHRvIHN0ZG91dCB3aGVuIHJ1bm5pbmdcbiI7CiAgICAg cHJpbnQgU1RERVJSICIgIC0tZ2l0LWNvbW1pdCAgIFBvcHVsYXRlIHRoZSBDaGFuZ2VMb2dzIGZy b20gdGhlIHNwZWNpZmllZCBnaXQgY29tbWl0XG4iOworICAgIHByaW50IFNUREVSUiAiICAtLWdp dC1pbmRleCAgICBQb3B1bGF0ZSB0aGUgQ2hhbmdlTG9ncyBmcm9tIHRoZSBnaXQgaW5kZXggb25s eVxuIjsKICAgICBwcmludCBTVERFUlIgIiAgLS1naXQtcmV2aWV3ZXIgV2hlbiBwb3B1bGF0aW5n IHRoZSBDaGFuZ2VMb2dzIGZyb20gYSBnaXQgY29tbWl0IGNsYWltIHRoYXQgdGhlIHNwY2lmaWVk IG5hbWUgcmV2aWV3ZWQgdGhlIGNoYW5nZS5cbiI7CiAgICAgcHJpbnQgU1RERVJSICIgICAgICAg ICAgICAgICAgIFRoaXMgb3B0aW9uIGlzIHVzZWZ1bCB3aGVuIHRoZSBnaXQgY29tbWl0IGxhY2tz IGEgU2lnbmVkLU9mZi1CeTogbGluZVxuIjsKICAgICBwcmludCBTVERFUlIgIiAgLWh8LS1oZWxw ICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZVxuIjsKQEAgLTExNyw2ICsxMjAsOCBAQCBpZiAo ISRwYXJzZU9wdGlvbnNSZXN1bHQgfHwgJHNob3dIZWxwKSB7CiAgICAgZXhpdCAxOwogfQogCitk aWUgIi0tZ2l0LWNvbW1pdCBhbmQgLS1naXQtaW5kZXggYXJlIGluY29tcGF0aWJsZS4iIGlmICgk Z2l0SW5kZXggJiYgJGdpdENvbW1pdCk7CisKIG15ICVwYXRocyA9IHByb2Nlc3NQYXRocyhAQVJH Vik7CiAKIG15ICRpc0dpdCA9IGlzR2l0RGlyZWN0b3J5KGZpcnN0RGlyZWN0b3J5T3JDd2QoKSk7 CkBAIC0xMTQxLDYgKzExNDYsNyBAQCBzdWIgZGlmZkZyb21Ub1N0cmluZygpCiAgICAgcmV0dXJu ICIiIGlmICRpc1NWTjsKICAgICByZXR1cm4gJGdpdENvbW1pdCBpZiAkZ2l0Q29tbWl0ID1+IG0v LitcLlwuLisvOwogICAgIHJldHVybiAiXCIkZ2l0Q29tbWl0XlwiIFwiJGdpdENvbW1pdFwiIiBp ZiAkZ2l0Q29tbWl0OworICAgIHJldHVybiAiLS1jYWNoZWQiIGlmICRnaXRJbmRleDsKICAgICBy ZXR1cm4gIkhFQUQiIGlmICRpc0dpdDsKIH0KIApAQCAtMTIyNSw3ICsxMjMxLDYgQEAgc3ViIGdl bmVyYXRlRmlsZUxpc3QoXEBcQFwlKQogICAgIG15ICgkY2hhbmdlZEZpbGVzLCAkY29uZmxpY3RG aWxlcywgJGZ1bmN0aW9uTGlzdHMpID0gQF87CiAgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcg c3RhdHVzIHRvIGZpbmQgY2hhbmdlZCwgYWRkZWQsIG9yIHJlbW92ZWQgZmlsZXMuXG4iOwogICAg IG9wZW4gU1RBVCwgIi18Iiwgc3RhdHVzQ29tbWFuZChrZXlzICVwYXRocykgb3IgZGllICJUaGUg c3RhdHVzIGZhaWxlZDogJCEuXG4iOwotICAgIG15ICRpbkdpdENvbW1pdFNlY3Rpb24gPSAwOwog ICAgIHdoaWxlICg8U1RBVD4pIHsKICAgICAgICAgbXkgJHN0YXR1czsKICAgICAgICAgbXkgJG9y aWdpbmFsOwpAQCAtMTMzNiw3ICsxMzQxLDcgQEAgc3ViIGlzQ29uZmxpY3RTdGF0dXMoJCkKICAg ICAgICAgIlUiID0+IDEsCiAgICAgKTsKIAotICAgIHJldHVybiAwIGlmICRnaXRDb21taXQ7ICMg YW4gZXhpc3RpbmcgY29tbWl0IGNhbm5vdCBoYXZlIGNvbmZsaWN0cworICAgIHJldHVybiAwIGlm ICgkZ2l0Q29tbWl0IHx8ICRnaXRJbmRleCk7ICMgYW4gZXhpc3RpbmcgY29tbWl0IG9yIHN0YWdl ZCBjaGFuZ2UgY2Fubm90IGhhdmUgY29uZmxpY3RzCiAgICAgcmV0dXJuICRzdm57JHN0YXR1c30g aWYgJGlzU1ZOOwogICAgIHJldHVybiAkZ2l0eyRzdGF0dXN9IGlmICRpc0dpdDsKIH0K 31748 2009-06-23 15:44:59 -0700 2009-06-23 16:01:39 -0700 same patch with updated copyright info prepare-ChangeLog.patch text/plain 3911 joenotcharles ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2M2ZmYjEwLi5kOThjMzllIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDktMDYt MjMgIEpvZSBNYXNvbiAgPGpvZS5tYXNvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hh bmdlTG9nOiBBZGRlZCAtLWdpdC1pbmRleCBtb2RlIHRvIGxpc3Qgb25seSB0aGUKKyAgICAgICAg Y2hhbmdlcyB3aGljaCBhcmUgYWxyZWFkeSBzdGFnZWQgaW4gdGhlIGluZGV4LiAgVXNlZnVsIHRv IGNyZWF0ZSBhbgorICAgICAgICBlbnRyeSBmb3Igd2hhdCB5b3UncmUgYWJvdXQgdG8gY29tbWl0 IHdoaWxlIGlnbm9yaW5nIHVuc3RhZ2VkIGNoYW5nZXMuCisKIDIwMDktMDYtMjMgIEVyaWMgU2Vp ZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9XZWJL aXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCmluZGV4IDIzYjAxZDQuLmY2YzhmOTMg MTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwpAQCAtNCw2ICs0LDcgQEAKICMK ICMgIENvcHlyaWdodCAoQykgMjAwMCwgMjAwMSBFYXplbCwgSW5jLgogIyAgQ29weXJpZ2h0IChD KSAyMDAyLCAyMDAzLCAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisjICBDb3B5cmlnaHQgKEMpIDIwMDkgVG9yY2htb2JpbGUsIEluYy4KICMK ICMgIHByZXBhcmUtQ2hhbmdlTG9nIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vcgogIyAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdl bmVyYWwgUHVibGljCkBAIC0yOCw2ICsyOSw3IEBACiAjIEphdmEgc3VwcG9ydCBhZGRlZCBieSBN YWNpZWogU3RhY2hvd2lhayA8bWpzQGVhemVsLmNvbT4KICMgT2JqZWN0aXZlLUMsIEMrKyBhbmQg T2JqZWN0aXZlLUMrKyBzdXBwb3J0IGFkZGVkIGJ5IE1hY2llaiBTdGFjaG93aWFrIDxtanNAYXBw bGUuY29tPgogIyBHaXQgc3VwcG9ydCBhZGRlZCBieSBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUu Y29tPgorIyAtLWdpdC1pbmRleCBmbGFnIGFkZGVkIGJ5IEpvZSBNYXNvbiA8am9lLm1hc29uQHRv cmNobW9iaWxlLmNvbT4KIAogCiAjCkBAIC05Myw2ICs5NSw3IEBAIHN1YiBub3JtYWxpemVQYXRo KCQpOwogbXkgJGNoYW5nZUxvZ1RpbWVab25lID0gIlBTVDhQRFQiOwogCiBteSAkZ2l0Q29tbWl0 ID0gMDsKK215ICRnaXRJbmRleCA9ICIiOwogbXkgJGdpdFJldmlld2VyID0gIiI7CiBteSAkb3Bl bkNoYW5nZUxvZ3MgPSAwOwogbXkgJHNob3dIZWxwID0gMDsKQEAgLTEwMSw2ICsxMDQsNyBAQCBt eSAkdXBkYXRlQ2hhbmdlTG9ncyA9IDE7CiBteSAkcGFyc2VPcHRpb25zUmVzdWx0ID0KICAgICBH ZXRPcHRpb25zKCJkaWZmfGQhIiA9PiBcJHNwZXdEaWZmLAogICAgICAgICAgICAgICAgImdpdC1j b21taXQ6cyIgPT4gXCRnaXRDb21taXQsCisgICAgICAgICAgICAgICAiZ2l0LWluZGV4IiA9PiBc JGdpdEluZGV4LAogICAgICAgICAgICAgICAgImdpdC1yZXZpZXdlcjpzIiA9PiBcJGdpdFJldmll d2VyLAogICAgICAgICAgICAgICAgImhlbHB8aCEiID0+IFwkc2hvd0hlbHAsCiAgICAgICAgICAg ICAgICAib3BlbnxvISIgPT4gXCRvcGVuQ2hhbmdlTG9ncywKQEAgLTEwOSw2ICsxMTMsNyBAQCBp ZiAoISRwYXJzZU9wdGlvbnNSZXN1bHQgfHwgJHNob3dIZWxwKSB7CiAgICAgcHJpbnQgU1RERVJS IGJhc2VuYW1lKCQwKSAuICIgWy1kfC0tZGlmZl0gWy1ofC0taGVscF0gWy1vfC0tb3Blbl0gWy0t Z2l0LWNvbW1pdD08Y29tbWl0dGlzaD5dIFstLWdpdC1yZXZpZXdlcj08bmFtZT5dIFtzdm5kaXIx IFtzdm5kaXIyIC4uLl1dXG4iOwogICAgIHByaW50IFNUREVSUiAiICAtZHwtLWRpZmYgICAgICBT cGV3IGRpZmYgdG8gc3Rkb3V0IHdoZW4gcnVubmluZ1xuIjsKICAgICBwcmludCBTVERFUlIgIiAg LS1naXQtY29tbWl0ICAgUG9wdWxhdGUgdGhlIENoYW5nZUxvZ3MgZnJvbSB0aGUgc3BlY2lmaWVk IGdpdCBjb21taXRcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIC0tZ2l0LWluZGV4ICAgIFBvcHVs YXRlIHRoZSBDaGFuZ2VMb2dzIGZyb20gdGhlIGdpdCBpbmRleCBvbmx5XG4iOwogICAgIHByaW50 IFNUREVSUiAiICAtLWdpdC1yZXZpZXdlciBXaGVuIHBvcHVsYXRpbmcgdGhlIENoYW5nZUxvZ3Mg ZnJvbSBhIGdpdCBjb21taXQgY2xhaW0gdGhhdCB0aGUgc3BjaWZpZWQgbmFtZSByZXZpZXdlZCB0 aGUgY2hhbmdlLlxuIjsKICAgICBwcmludCBTVERFUlIgIiAgICAgICAgICAgICAgICAgVGhpcyBv cHRpb24gaXMgdXNlZnVsIHdoZW4gdGhlIGdpdCBjb21taXQgbGFja3MgYSBTaWduZWQtT2ZmLUJ5 OiBsaW5lXG4iOwogICAgIHByaW50IFNUREVSUiAiICAtaHwtLWhlbHAgICAgICBTaG93IHRoaXMg aGVscCBtZXNzYWdlXG4iOwpAQCAtMTE3LDYgKzEyMiw4IEBAIGlmICghJHBhcnNlT3B0aW9uc1Jl c3VsdCB8fCAkc2hvd0hlbHApIHsKICAgICBleGl0IDE7CiB9CiAKK2RpZSAiLS1naXQtY29tbWl0 IGFuZCAtLWdpdC1pbmRleCBhcmUgaW5jb21wYXRpYmxlLiIgaWYgKCRnaXRJbmRleCAmJiAkZ2l0 Q29tbWl0KTsKKwogbXkgJXBhdGhzID0gcHJvY2Vzc1BhdGhzKEBBUkdWKTsKIAogbXkgJGlzR2l0 ID0gaXNHaXREaXJlY3RvcnkoZmlyc3REaXJlY3RvcnlPckN3ZCgpKTsKQEAgLTExNDEsNiArMTE0 OCw3IEBAIHN1YiBkaWZmRnJvbVRvU3RyaW5nKCkKICAgICByZXR1cm4gIiIgaWYgJGlzU1ZOOwog ICAgIHJldHVybiAkZ2l0Q29tbWl0IGlmICRnaXRDb21taXQgPX4gbS8uK1wuXC4uKy87CiAgICAg cmV0dXJuICJcIiRnaXRDb21taXReXCIgXCIkZ2l0Q29tbWl0XCIiIGlmICRnaXRDb21taXQ7Cisg ICAgcmV0dXJuICItLWNhY2hlZCIgaWYgJGdpdEluZGV4OwogICAgIHJldHVybiAiSEVBRCIgaWYg JGlzR2l0OwogfQogCkBAIC0xMjI1LDcgKzEyMzMsNiBAQCBzdWIgZ2VuZXJhdGVGaWxlTGlzdChc QFxAXCUpCiAgICAgbXkgKCRjaGFuZ2VkRmlsZXMsICRjb25mbGljdEZpbGVzLCAkZnVuY3Rpb25M aXN0cykgPSBAXzsKICAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyBzdGF0dXMgdG8gZmluZCBj aGFuZ2VkLCBhZGRlZCwgb3IgcmVtb3ZlZCBmaWxlcy5cbiI7CiAgICAgb3BlbiBTVEFULCAiLXwi LCBzdGF0dXNDb21tYW5kKGtleXMgJXBhdGhzKSBvciBkaWUgIlRoZSBzdGF0dXMgZmFpbGVkOiAk IS5cbiI7Ci0gICAgbXkgJGluR2l0Q29tbWl0U2VjdGlvbiA9IDA7CiAgICAgd2hpbGUgKDxTVEFU PikgewogICAgICAgICBteSAkc3RhdHVzOwogICAgICAgICBteSAkb3JpZ2luYWw7CkBAIC0xMzM2 LDcgKzEzNDMsNyBAQCBzdWIgaXNDb25mbGljdFN0YXR1cygkKQogICAgICAgICAiVSIgPT4gMSwK ICAgICApOwogCi0gICAgcmV0dXJuIDAgaWYgJGdpdENvbW1pdDsgIyBhbiBleGlzdGluZyBjb21t aXQgY2Fubm90IGhhdmUgY29uZmxpY3RzCisgICAgcmV0dXJuIDAgaWYgKCRnaXRDb21taXQgfHwg JGdpdEluZGV4KTsgIyBhbiBleGlzdGluZyBjb21taXQgb3Igc3RhZ2VkIGNoYW5nZSBjYW5ub3Qg aGF2ZSBjb25mbGljdHMKICAgICByZXR1cm4gJHN2bnskc3RhdHVzfSBpZiAkaXNTVk47CiAgICAg cmV0dXJuICRnaXR7JHN0YXR1c30gaWYgJGlzR2l0OwogfQo=