9693 2006-07-02 06:18:11 -0700 svn-apply should set ChangeLog date correctly when applying patches 2006-07-09 20:40:28 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mrowe webkit-unassigned andersca ap ddkilzer mitz oldest_to_newest 47999 0 mrowe 2006-07-02 06:18:11 -0700 In the case of small patches which are prepared, reviewed and committed within a single day it can be problematic as committers need to ensure that the date in the ChangeLog is correct relative to other dates within the file. For instance, if I were to prepare a patch at 01:00 AM NZDT today the date would be written to the ChangeLog as 2006-07-03. It's still 2006-07-02 for another ~18ish hours in Cupertino which means that if other patches were submitted + committed they would show with an earlier date even though they occurred afterwards. This issue could be partially resolved by always inserting the date in a consistent timezone, likely PST or PDT, rather than the local time zone. That said, for patches that take > 1 day to go through the prepare/review/commit cycle the date would need to be updated anyway... so perhaps this isn't a big deal. 48001 1 ddkilzer 2006-07-02 06:20:33 -0700 In addition to fixing prepare-ChangeLog, it would be neat if svn-apply could change the date in the ChangeLog entry to Cupertino-time (and make svn-unapply handle the back-out cleanly as well). 48897 2 ddkilzer 2006-07-09 04:29:40 -0700 I'm changing the sense of this bug so that svn-apply sets the ChangeLog entry date when it applies a ChangeLog patch, and svn-unapply knows how to back it out again (Comment #2).  There's no use doing it with prepare-ChangeLog since that isn't the last thing run before committing.  And committers have one less thing to think about when committing patches! 48919 3 9297 ddkilzer 2006-07-09 07:36:38 -0700 Created attachment 9297 Patch v1 Changes in this patch: - svn-apply changes the ChangeLog entry date in the patch before applying it to the actual ChangeLog file.  The new entry date is calculated using the "PST8PDT" timezone (Apple's home) by setting the TZ environment variable, formatting the "local" time in a string, then resetting the TZ env variable.  This works under Cygwin on Windows as well. - svn-unapply reads the current ChangeLog entry date contained in the file and changes the patch before unapplying it. 48992 4 9297 darin 2006-07-09 17:36:03 -0700 Comment on attachment 9297 Patch v1 Can we make it use the current time zone on Mac OS X automatically? r=me 48998 5 ddkilzer 2006-07-09 17:49:04 -0700 (In reply to comment #4) > (From update of attachment 9297 [edit]) > Can we make it use the current time zone on Mac OS X automatically? I will add a comment about why "PST8PDT" is the default time zone for the project, and what the code that sets the TZ environment variable is doing (but only a one-line comment). 49027 6 ddkilzer 2006-07-09 20:40:28 -0700 Committed revision 15279. 9297 2006-07-09 07:36:38 -0700 2006-07-09 17:36:03 -0700 Patch v1 bug-9693-v1.diff text/plain 5379 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1MjUxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDYtMDctMDkgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dp P2lkPTk2OTMKKyAgICAgICAgICBzdm4tYXBwbHkgc2hvdWxkIHNldCBDaGFuZ2VMb2cgZGF0ZSBj b3JyZWN0bHkgd2hlbiBhcHBseWluZyBwYXRjaGVzCisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1h cHBseTogU2V0IHRoZSBDaGFuZ2VMb2cgZW50cnkgZGF0ZSB1c2luZyBhIGNvbmZpZ3VyYWJsZSB0 aW1lem9uZQorICAgICAgICBiZWZvcmUgYXBwbHlpbmcgdGhlIHBhdGNoLgorICAgICAgICAqIFNj cmlwdHMvc3ZuLXVuYXBwbHk6IFJlc2V0IHRoZSBDaGFuZ2VMb2cgZW50cnkgZGF0ZSBiZWZvcmUg dW5hcHBseWluZyB0aGUgcGF0Y2guCisKIDIwMDYtMDctMDkgIEpvb3N0IGRlIFZhbGsgIDxqZGV2 YWxrQG9wZW5kYXJ3aW4ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMuCkluZGV4OiBX ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9T Y3JpcHRzL3N2bi1hcHBseQkocmV2aXNpb24gMTUyNTApCisrKyBXZWJLaXRUb29scy9TY3JpcHRz L3N2bi1hcHBseQkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsOCBAQAogIyAgIFBhdGhzIGZy b20gSW5kZXg6IGxpbmVzIGFyZSB1c2VkIHJhdGhlciB0aGFuIHRoZSBwYXRocyBvbiB0aGUgcGF0 Y2ggbGluZXMsIHdoaWNoCiAjICAgICAgIG1ha2VzIHBhdGNoZXMgZ2VuZXJhdGVkIGJ5ICJjdnMg ZGlmZiIgd29yayAoaW5jcmVhc2luZ2x5IHVuaW1wb3J0YW50IHNpbmNlIHdlCiAjICAgICAgIHVz ZSBTdWJ2ZXJzaW9uIG5vdykuCi0jICAgQ2hhbmdlTG9nIHBhdGNoZXMgdXNlIC0tZnV6ej0zIHRv IHByZXZlbnQgcmVqZWN0cy4KKyMgICBDaGFuZ2VMb2cgcGF0Y2hlcyB1c2UgLS1mdXp6PTMgdG8g cHJldmVudCByZWplY3RzLCBhbmQgdGhlIGVudHJ5IGRhdGUgaXMgc2V0IGluCisjICAgICAgIHRo ZSBwYXRjaCB0byB0b2RheSdzIGRhdGUgdXNpbmcgJGNoYW5nZUxvZ1RpbWVab25lLgogIyAgIEhh bmRsZXMgYmluYXJ5IGZpbGVzIChyZXF1aXJlcyBwYXRjaGVzIG1hZGUgYnkgc3ZuLWNyZWF0ZS1w YXRjaCkuCiAjCiAjIE1pc3NpbmcgZmVhdHVyZXM6CkBAIC02MCw2ICs2MSw3IEBAIHVzZSBGaWxl OjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEdldG9wdDo6TG9uZzsKIHVzZSBNSU1F OjpCYXNlNjQ7Cit1c2UgUE9TSVggcXcoc3RyZnRpbWUpOwogCiBzdWIgYWRkRGlyZWN0b3JpZXNJ Zk5lZWRlZCgkKTsKIHN1YiBhcHBseVBhdGNoKCQkOyQpOwpAQCAtNjcsOCArNjksMTEgQEAgc3Vi IGhhbmRsZUJpbmFyeUNoYW5nZSgkJCk7CiBzdWIgaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwo JCk7CiBzdWIgcGF0Y2goJCk7CiBzdWIgcmVtb3ZlRGlyZWN0b3JpZXNJZk5lZWRlZCgpOworc3Vi IHNldENoYW5nZUxvZ0RhdGUoJCk7CiBzdWIgc3ZuU3RhdHVzKCQpOwogCitteSAkY2hhbmdlTG9n VGltZVpvbmUgPSAiUFNUOFBEVCI7CisKIG15ICRtZXJnZSA9IDA7CiBteSAkc2hvd0hlbHAgPSAw OwogaWYgKCFHZXRPcHRpb25zKCJtZXJnZSEiID0+IFwkbWVyZ2UsICJoZWxwISIgPT4gXCRzaG93 SGVscCkgfHwgJHNob3dIZWxwKSB7CkBAIC0yMjgsNyArMjMzLDcgQEAgc3ViIHBhdGNoKCQpCiAg ICAgICAgICMgU3RhbmRhcmQgcGF0Y2gsIHBhdGNoIHRvb2wgY2FuIGhhbmRsZSB0aGlzLgogICAg ICAgICBpZiAoYmFzZW5hbWUoJGZ1bGxQYXRoKSBlcSAiQ2hhbmdlTG9nIikgewogICAgICAgICAg ICAgbXkgJGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVkID0gLWYgIiR7ZnVsbFBhdGh9Lm9yaWciOwot ICAgICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCwgWyItLWZ1eno9MyJdKTsK KyAgICAgICAgICAgIGFwcGx5UGF0Y2goc2V0Q2hhbmdlTG9nRGF0ZSgkcGF0Y2gpLCAkZnVsbFBh dGgsIFsiLS1mdXp6PTMiXSk7CiAgICAgICAgICAgICB1bmxpbmsoIiR7ZnVsbFBhdGh9Lm9yaWci KSBpZiAoISAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0ZWQpOwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCk7CkBAIC0yNzksNiArMjg0LDIx IEBAIHN1YiByZW1vdmVEaXJlY3Rvcmllc0lmTmVlZGVkKCkKICAgICB9CiB9CiAKK3N1YiBzZXRD aGFuZ2VMb2dEYXRlKCQpCit7CisgICAgbXkgJHBhdGNoID0gc2hpZnQ7CisgICAgbXkgJHNhdmVk VGltZVpvbmUgPSAkRU5WeydUWid9OworICAgICRFTlZ7J1RaJ30gPSAkY2hhbmdlTG9nVGltZVpv bmU7CisgICAgbXkgJG5ld0RhdGUgPSBzdHJmdGltZSgiJVktJW0tJWQiLCBsb2NhbHRpbWUoKSk7 CisgICAgaWYgKGRlZmluZWQgJHNhdmVkVGltZVpvbmUpIHsKKyAgICAgICAgICRFTlZ7J1RaJ30g PSAkc2F2ZWRUaW1lWm9uZTsKKyAgICB9IGVsc2UgeworICAgICAgICAgZGVsZXRlICRFTlZ7J1Ra J307CisgICAgfQorICAgICRwYXRjaCA9fiBzLyhcblwrKVxkezR9LVteLV17Mn0tW14tXXsyfSgg ICkvJDEkbmV3RGF0ZSQyLzsKKyAgICByZXR1cm4gJHBhdGNoOworfQorCiBzdWIgc3ZuU3RhdHVz KCQpCiB7CiAgICAgbXkgKCRmdWxsUGF0aCkgPSBAXzsKSW5kZXg6IFdlYktpdFRvb2xzL1Njcmlw dHMvc3ZuLXVuYXBwbHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5h cHBseQkocmV2aXNpb24gMTUyNTApCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5 CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw4IEBACiAjICAgUGF0aHMgZnJvbSBJbmRleDog bGluZXMgYXJlIHVzZWQgcmF0aGVyIHRoYW4gdGhlIHBhdGhzIG9uIHRoZSBwYXRjaCBsaW5lcywg d2hpY2gKICMgICAgICAgbWFrZXMgcGF0Y2hlcyBnZW5lcmF0ZWQgYnkgImN2cyBkaWZmIiB3b3Jr IChpbmNyZWFzaW5nbHkgdW5pbXBvcnRhbnQgc2luY2Ugd2UKICMgICAgICAgdXNlIFN1YnZlcnNp b24gbm93KS4KLSMgICBDaGFuZ2VMb2cgcGF0Y2hlcyB1c2UgLS1mdXp6PTMgdG8gcHJldmVudCBy ZWplY3RzLgorIyAgIENoYW5nZUxvZyBwYXRjaGVzIHVzZSAtLWZ1eno9MyB0byBwcmV2ZW50IHJl amVjdHMsIGFuZCB0aGUgZW50cnkgZGF0ZSBpcyByZXNldCBpbgorIyAgICAgICB0aGUgcGF0Y2gg YmVmb3JlIGl0IGlzIGFwcGxpZWQgKHN2bi1hcHBseSBzZXRzIGl0IHdoZW4gYXBwbHlpbmcgYSBw YXRjaCkuCiAjICAgSGFuZGxlcyBiaW5hcnkgZmlsZXMgKHJlcXVpcmVzIHBhdGNoZXMgbWFkZSBi eSBzdm4tY3JlYXRlLXBhdGNoKS4KICMKICMgTWlzc2luZyBmZWF0dXJlczoKQEAgLTU0LDYgKzU1 LDcgQEAgdXNlIHN0cmljdDsKIHVzZSB3YXJuaW5nczsKIAogdXNlIEN3ZDsKK3VzZSBGY250bCBx dyg6REVGQVVMVCA6c2Vlayk7CiB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsK IHVzZSBHZXRvcHQ6Okxvbmc7CkBAIC02Miw2ICs2NCw3IEBAIHN1YiBwYXRjaCgkKTsKIHN1YiBy ZXZlcnREaXJlY3RvcmllcygpOwogc3ViIHN2blN0YXR1cygkKTsKIHN1YiB1bmFwcGx5UGF0Y2go JCQ7JCk7CitzdWIgdW5zZXRDaGFuZ2VMb2dEYXRlKCQkKTsKIAogbXkgJHNob3dIZWxwID0gMDsK IGlmICghR2V0T3B0aW9ucygiaGVscCEiID0+IFwkc2hvd0hlbHApIHx8ICRzaG93SGVscCkgewpA QCAtMTIwLDcgKzEyMyw3IEBAIHN1YiBwYXRjaCgkKQogICAgICAgICAjIFN0YW5kYXJkIHBhdGNo LCBwYXRjaCB0b29sIGNhbiBoYW5kbGUgdGhpcy4KICAgICAgICAgaWYgKGJhc2VuYW1lKCRmdWxs UGF0aCkgZXEgIkNoYW5nZUxvZyIpIHsKICAgICAgICAgICAgIG15ICRjaGFuZ2VMb2dEb3RPcmln RXhpc3RlZCA9IC1mICIke2Z1bGxQYXRofS5vcmlnIjsKLSAgICAgICAgICAgIHVuYXBwbHlQYXRj aCgkcGF0Y2gsICRmdWxsUGF0aCwgWyItLWZ1eno9MyJdKTsKKyAgICAgICAgICAgIHVuYXBwbHlQ YXRjaCh1bnNldENoYW5nZUxvZ0RhdGUoJGZ1bGxQYXRoLCAkcGF0Y2gpLCAkZnVsbFBhdGgsIFsi LS1mdXp6PTMiXSk7CiAgICAgICAgICAgICB1bmxpbmsoIiR7ZnVsbFBhdGh9Lm9yaWciKSBpZiAo ISAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0ZWQpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgdW5hcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoKTsKQEAgLTE4MSw3ICsxODQsMjEgQEAg c3ViIHVuYXBwbHlQYXRjaCgkJDskKQogICAgIG15ICgkcGF0Y2gsICRmdWxsUGF0aCwgJG9wdGlv bnMpID0gQF87CiAgICAgJG9wdGlvbnMgPSBbXSBpZiAoISAkb3B0aW9ucyk7CiAgICAgbXkgJGNv bW1hbmQgPSAicGF0Y2ggIiAuIGpvaW4oIiAiLCAiLXAwIiwgIi1SIiwgQHskb3B0aW9uc30pOwot ICAgIG9wZW4gUEFUQ0gsICJ8ICRjb21tYW5kIiBvciBkaWUgIkZhaWxlZCB0byBwYXRjaCAkZnVs bFBhdGhcbiI7CisgICAgb3BlbiBQQVRDSCwgInwgJGNvbW1hbmQiIG9yIGRpZSAiRmFpbGVkIHRv IHBhdGNoICRmdWxsUGF0aDogJCEiOwogICAgIHByaW50IFBBVENIICRwYXRjaDsKICAgICBjbG9z ZSBQQVRDSDsKIH0KKworc3ViIHVuc2V0Q2hhbmdlTG9nRGF0ZSgkJCkKK3sKKyAgICBteSAkZnVs bFBhdGggPSBzaGlmdDsKKyAgICBteSAkcGF0Y2ggPSBzaGlmdDsKKyAgICBteSAkbmV3RGF0ZTsK KyAgICBzeXNvcGVuKENIQU5HRUxPRywgJGZ1bGxQYXRoLCBPX1JET05MWSkgb3IgZGllICJGYWls ZWQgdG8gb3BlbiAkZnVsbFBhdGg6ICQhIjsKKyAgICBzeXNzZWVrKENIQU5HRUxPRywgMCwgU0VF S19TRVQpOworICAgIG15ICRieXRlQ291bnQgPSBzeXNyZWFkKENIQU5HRUxPRywgJG5ld0RhdGUs IDEwKTsKKyAgICBkaWUgIkZhaWxlZCByZWFkaW5nICRmdWxsUGF0aDogJCEiIGlmICEkYnl0ZUNv dW50IHx8ICRieXRlQ291bnQgIT0gMTA7CisgICAgY2xvc2UoQ0hBTkdFTE9HKTsKKyAgICAkcGF0 Y2ggPX4gcy8oXG5cKylcZHs0fS1bXi1dezJ9LVteLV17Mn0oICApLyQxJG5ld0RhdGUkMi87Cisg ICAgcmV0dXJuICRwYXRjaDsKK30K