24378 2009-03-05 07:12:13 -0800 resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs 2009-03-12 07:47:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer aroben oldest_to_newest 112363 0 ddkilzer 2009-03-05 07:12:13 -0800 * SUMMARY It would be nice if resolve-ChangeLogs would have a mode that checked every locally modified ChangeLog entry when run (with no arguments or -a/--all) and fixed up any merge conflicts it found. I'm getting lazy in my old age, and this would let me be even lazier. After that: a post-git-rebase/git-svn-rebase hook in git to run the script automatically on rebase failure. 113317 1 28520 ddkilzer 2009-03-11 22:34:27 -0700 Created attachment 28520 Patch v1 Proposed fix. 113375 2 28520 ddkilzer 2009-03-12 06:35:48 -0700 Comment on attachment 28520 Patch v1 > 'git diff'. Added global $ifGit and $ifSVN variables so that Oops...this should be $isGit and $isSVN. 113380 3 28520 aroben 2009-03-12 07:00:02 -0700 Comment on attachment 28520 Patch v1 r=me 113385 4 ddkilzer 2009-03-12 07:47:18 -0700 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/resolve-ChangeLogs Committed r41623 http://trac.webkit.org/changeset/41623 28520 2009-03-11 22:34:27 -0700 2009-03-12 07:00:02 -0700 Patch v1 bug-24378-v1.diff text/plain 6716 ddkilzer Y29tbWl0IGY3YjU3MDQ5OWVkZGEwNWRmMDAxMjFhY2QzMTQwOTczZmEyNDEwNWEKQXV0aG9yOiBE YXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0ZTogICBXZWQgTWFyIDExIDIyOjMx OjE4IDIwMDkgLTA3MDAKCiAgICAgICAgICAgIEJ1ZyAyNDM3ODogcmVzb2x2ZS1DaGFuZ2VMb2dz IHNob3VsZCB1c2UgZ2l0IHN0YXR1cyBvciBzdm4gc3RhdHVzIHRvIGZpbmQgYW5kIGZpeCB1bm1l cmdlZCBDaGFuZ2VMb2dzCiAgICAKICAgICAgICAgICAgPGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNDM3OD4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KICAgIAogICAgICAgICAgICAqIFNjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dz OiBJZiAtZnwtLWZpeC1tZXJnZWQgaXMgbm90IHBhc3NlZAogICAgICAgICAgICBhbmQgbm8gZmls ZSBvciBkaXJlY3RvcnkgbmFtZXMgYXJlIHNwZWNpZmllZCBvbiB0aGUgY29tbWFuZC1saW5lCiAg ICAgICAgICAgIHRoZW4gdHJ5IHRvIGZpbmQgdW5tZXJnZWQgQ2hhbmdlTG9nIGZpbGVzIGJhc2Vk IG9uICdzdm4gc3RhdCcgb3IKICAgICAgICAgICAgJ2dpdCBkaWZmJy4gIEFkZGVkIGdsb2JhbCAk aWZHaXQgYW5kICRpZlNWTiB2YXJpYWJsZXMgc28gdGhhdAogICAgICAgICAgICBpc0dpdCgpIGFu ZCBpc1NWTigpIG9ubHkgaGF2ZSB0byBiZSBjYWxsZWQgb25jZS4KICAgICAgICAgICAgKGZpbmRV bm1lcmdlZENoYW5nZUxvZ3MpOiBBZGRlZC4KCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggMDhlOWZjNS4uNmFhYWFkYyAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDA5LTAzLTExICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CisKKyAgICAgICAgQnVnIDI0Mzc4OiByZXNvbHZlLUNoYW5nZUxvZ3Mgc2hvdWxk IHVzZSBnaXQgc3RhdHVzIG9yIHN2biBzdGF0dXMgdG8gZmluZCBhbmQgZml4IHVubWVyZ2VkIENo YW5nZUxvZ3MKKworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI0Mzc4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3M6IElmIC1mfC0tZml4LW1lcmdlZCBpcyBu b3QgcGFzc2VkCisgICAgICAgIGFuZCBubyBmaWxlIG9yIGRpcmVjdG9yeSBuYW1lcyBhcmUgc3Bl Y2lmaWVkIG9uIHRoZSBjb21tYW5kLWxpbmUKKyAgICAgICAgdGhlbiB0cnkgdG8gZmluZCB1bm1l cmdlZCBDaGFuZ2VMb2cgZmlsZXMgYmFzZWQgb24gJ3N2biBzdGF0JyBvcgorICAgICAgICAnZ2l0 IGRpZmYnLiAgQWRkZWQgZ2xvYmFsICRpZkdpdCBhbmQgJGlmU1ZOIHZhcmlhYmxlcyBzbyB0aGF0 CisgICAgICAgIGlzR2l0KCkgYW5kIGlzU1ZOKCkgb25seSBoYXZlIHRvIGJlIGNhbGxlZCBvbmNl LgorICAgICAgICAoZmluZFVubWVyZ2VkQ2hhbmdlTG9ncyk6IEFkZGVkLgorCiAyMDA5LTAzLTEx ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xhcmlmeSBj b21tZW50cyByZWdhcmRpbmcgb3JkZXIgb2YgRkVBVFVSRV9ERUZJTkVTCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCmluZGV4IDU4NDcxZWMuLmE4OTU1OGEgMTAwNzU1Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCkBAIC0xLDYgKzEsNiBAQAogIyEvdXNyL2Jpbi9w ZXJsIC13CiAKLSMgQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4IEFwcGxlIEluYy4gIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAwOSBBcHBsZSBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00 Miw2ICs0Miw3IEBAIHVzZSBWQ1NVdGlsczsKIAogc3ViIGNvbmZsaWN0RmlsZXMoJCk7CiBzdWIg ZmluZENoYW5nZUxvZygkKTsKK3N1YiBmaW5kVW5tZXJnZWRDaGFuZ2VMb2dzKCk7CiBzdWIgZml4 Q2hhbmdlTG9nUGF0Y2goJCk7CiBzdWIgZml4TWVyZ2VkQ2hhbmdlTG9ncygkO0ApOwogc3ViIGZp eE9uZU1lcmdlZENoYW5nZUxvZygkKTsKQEAgLTUzLDYgKzU0LDkgQEAgc3ViIHJlc29sdmVDb25m bGljdCgkKTsKIHN1YiBzaG93U3RhdHVzKCQ7JCk7CiBzdWIgdXNhZ2VBbmRFeGl0KCk7CiAKK215 ICRpc0dpdCA9IGlzR2l0KCk7CitteSAkaXNTVk4gPSBpc1NWTigpOworCiBteSAkU1ZOID0gInN2 biI7CiBteSAkR0lUID0gImdpdCI7CiAKQEAgLTY4LDEzICs3MiwxNyBAQCBteSAkZ2V0T3B0aW9u c1Jlc3VsdCA9IEdldE9wdGlvbnMoCiAKIG15IEBjaGFuZ2VMb2dGaWxlcyA9IHJlbW92ZUNoYW5n ZUxvZ0FyZ3VtZW50cygpOwogCitpZiAoIWRlZmluZWQgJGZpeE1lcmdlZCAmJiBzY2FsYXIoQGNo YW5nZUxvZ0ZpbGVzKSA9PSAwKSB7CisgICAgQGNoYW5nZUxvZ0ZpbGVzID0gZmluZFVubWVyZ2Vk Q2hhbmdlTG9ncygpOworfQorCiBpZiAoc2NhbGFyKEBBUkdWKSA+IDApIHsKICAgICBwcmludCBT VERFUlIgIkVSUk9SOiBGaWxlcyBsaXN0ZWQgb24gY29tbWFuZC1saW5lIHRoYXQgYXJlIG5vdCBD aGFuZ2VMb2dzLlxuIjsKICAgICB1bmRlZiAkZ2V0T3B0aW9uc1Jlc3VsdDsKIH0gZWxzaWYgKCFk ZWZpbmVkICRmaXhNZXJnZWQgJiYgc2NhbGFyKEBjaGFuZ2VMb2dGaWxlcykgPT0gMCkgewotICAg IHByaW50IFNUREVSUiAiRVJST1I6IE5vIENoYW5nZUxvZyBmaWxlcyBsaXN0ZWQgb24gY29tbWFu ZC1saW5lLlxuIjsKKyAgICBwcmludCBTVERFUlIgIkVSUk9SOiBObyBDaGFuZ2VMb2cgZmlsZXMg bGlzdGVkIG9uIGNvbW1hbmQtbGluZSBvciBmb3VuZCB1bm1lcmdlZC5cbiI7CiAgICAgdW5kZWYg JGdldE9wdGlvbnNSZXN1bHQ7Ci19IGVsc2lmIChkZWZpbmVkICRmaXhNZXJnZWQgJiYgIWlzR2l0 KCkpIHsKK30gZWxzaWYgKGRlZmluZWQgJGZpeE1lcmdlZCAmJiAhJGlzR2l0KSB7CiAgICAgcHJp bnQgU1RERVJSICJFUlJPUjogLS1maXgtbWVyZ2VkIG1heSBvbmx5IGJlIHVzZWQgd2l0aCBhIGdp dCByZXBvc2l0b3J5XG4iOwogICAgIHVuZGVmICRnZXRPcHRpb25zUmVzdWx0OwogfQpAQCAtODIs NyArOTAsNyBAQCBpZiAoc2NhbGFyKEBBUkdWKSA+IDApIHsKIHN1YiB1c2FnZUFuZEV4aXQoKQog ewogICAgIHByaW50IFNUREVSUiA8PF9fRU5EX187Ci1Vc2FnZTogQHtbIGJhc2VuYW1lKCQwKSBd fSBbb3B0aW9uc10gcGF0aC90by9DaGFuZ2VMb2cgW3BhdGgvdG8vYW5vdGhlci9DaGFuZ2VMb2cg Li4uXQorVXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlvbnNdIFtwYXRoL3RvL0NoYW5n ZUxvZ10gW3BhdGgvdG8vYW5vdGhlci9DaGFuZ2VMb2cgLi4uXQogICAtZnwtLWZpeC1tZXJnZWQg W3JldmlzaW9uLXJhbmdlXSBmaXggZ2l0LW1lcmdlZCBDaGFuZ2VMb2cgZW50cmllczsgaWYgYSBy ZXZpc2lvbi1yYW5nZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpcyBzcGVj aWZpZWQsIHJ1biBnaXQgZmlsdGVyLWJyYW5jaCBvbiB0aGUgcmFuZ2UKICAgLWh8LS1oZWxwICAg ICAgICAgICAgICAgICAgICAgICAgc2hvdyB0aGlzIGhlbHAgbWVzc2FnZQpAQCAtMTI1LDcgKzEz Myw3IEBAIHN1YiBjb25mbGljdEZpbGVzKCQpCiAgICAgICAgIHJldHVybiAoIiRmaWxlLnJlaiIs ICIkZmlsZS5vcmlnIiwgJGZpbGUpOwogICAgIH0KIAotICAgIGlmIChpc1NWTigpKSB7CisgICAg aWYgKCRpc1NWTikgewogICAgICAgICBvcGVuIFNUQVQsICItfCIsICRTVk4sICJzdGF0dXMiLCAk ZmlsZSB8fCBkaWU7CiAgICAgICAgIG15ICRzdGF0dXMgPSA8U1RBVD47CiAgICAgICAgIGNsb3Nl IFNUQVQ7CkBAIC0xNTAsNyArMTU4LDcgQEAgc3ViIGNvbmZsaWN0RmlsZXMoJCkKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICRmaWxlT2xkZXIgPSBzaGlmdCBAbWF0Y2hpbmdGaWxlczsK ICAgICAgICAgfQotICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKKyAgICB9IGVsc2lmICgkaXNHaXQp IHsKICAgICAgICAgbXkgJGdpdFByZWZpeCA9IGAkR0lUIHJldi1wYXJzZSAtLXNob3ctcHJlZml4 YDsKICAgICAgICAgY2hvbXAgJGdpdFByZWZpeDsKICAgICAgICAgb3BlbiBHSVQsICItfCIsICRH SVQsICJscy1maWxlcyIsICItLXVubWVyZ2VkIiwgJGZpbGUgfHwgZGllOwpAQCAtMTg1LDcgKzE5 Myw4IEBAIHN1YiBjb25mbGljdEZpbGVzKCQpCiAgICAgcmV0dXJuICgkZmlsZU1pbmUsICRmaWxl T2xkZXIsICRmaWxlTmV3ZXIpOwogfQogCi1zdWIgZmluZENoYW5nZUxvZygkKSB7CitzdWIgZmlu ZENoYW5nZUxvZygkKQorewogICAgIHJldHVybiAkX1swXSBpZiBiYXNlbmFtZSgkX1swXSkgZXEg IkNoYW5nZUxvZyI7CiAKICAgICBteSAkZmlsZSA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJF9bMF0s ICJDaGFuZ2VMb2ciKTsKQEAgLTE5NCw2ICsyMDMsNDAgQEAgc3ViIGZpbmRDaGFuZ2VMb2coJCkg ewogICAgIHJldHVybiB1bmRlZjsKIH0KIAorc3ViIGZpbmRVbm1lcmdlZENoYW5nZUxvZ3MoKQor eworICAgIG15ICRzdGF0Q29tbWFuZCA9ICIiOworCisgICAgaWYgKCRpc1NWTikgeworICAgICAg ICAkc3RhdENvbW1hbmQgPSAiJFNWTiBzdGF0IHwgZ3JlcCAnXkMnIjsKKyAgICB9IGVsc2lmICgk aXNHaXQpIHsKKyAgICAgICAgJHN0YXRDb21tYW5kID0gIiRHSVQgZGlmZiAtciAtLW5hbWUtc3Rh dHVzIC0tZGlmZi1maWx0ZXI9VSAtQyAtQyAtTSI7CisgICAgfSBlbHNlIHsKKyAgICAgICAgcmV0 dXJuICgpOworICAgIH0KKworICAgIG15IEByZXN1bHRzID0gKCk7CisgICAgb3BlbiBTVEFULCAi LXwiLCAkc3RhdENvbW1hbmQgb3IgZGllICJUaGUgc3RhdHVzIGZhaWxlZDogJCEuXG4iOworICAg IHdoaWxlICg8U1RBVD4pIHsKKyAgICAgICAgaWYgKCRpc1NWTikgeworICAgICAgICAgICAgaWYg KC9eKFtDXSkuezV9ICguKykkLykgeworICAgICAgICAgICAgICAgIHB1c2ggQHJlc3VsdHMsIGZp bmRDaGFuZ2VMb2coJDIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBw cmludDsgICMgZXJyb3Igb3V0cHV0IGZyb20gc3ZuIHN0YXQKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfSBlbHNpZiAoJGlzR2l0KSB7CisgICAgICAgICAgICBpZiAoL14oW1VdKVx0KC4rKSQvKSB7 CisgICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0cywgZmluZENoYW5nZUxvZygkMik7CisgICAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIHByaW50OyAgIyBlcnJvciBvdXRwdXQg ZnJvbSBnaXQgZGlmZgorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAgIGNsb3Nl IFNUQVQ7CisKKyAgICByZXR1cm4gQHJlc3VsdHM7Cit9CisKIHN1YiBmaXhDaGFuZ2VMb2dQYXRj aCgkKQogewogICAgIG15ICRwYXRjaCA9IHNoaWZ0OwpAQCAtNDM1LDcgKzQ3OCw3IEBAIHN1YiBy ZXNvbHZlQ2hhbmdlTG9nKCQpCiAgICAgfSBlbHNlIHsKICAgICAgICAgc2hvd1N0YXR1cygkZmls ZSk7CiAgICAgICAgIHByaW50IFNUREVSUiAiV0FSTklORzogJHtmaWxlfSBjb3VsZCBub3QgYmUg bWVyZ2VkIHVzaW5nIGZ1enogbGV2ZWwgMy5cbiIgaWYgJHByaW50V2FybmluZ3M7Ci0gICAgICAg IHVubGluaygkZmlsZU1pbmUsICRmaWxlT2xkZXIsICRmaWxlTmV3ZXIpIGlmIGlzR2l0KCk7Cisg ICAgICAgIHVubGluaygkZmlsZU1pbmUsICRmaWxlT2xkZXIsICRmaWxlTmV3ZXIpIGlmICRpc0dp dDsKICAgICB9CiB9CiAKQEAgLTQ0Myw5ICs0ODYsOSBAQCBzdWIgcmVzb2x2ZUNvbmZsaWN0KCQp CiB7CiAgICAgbXkgKCRmaWxlKSA9IEBfOwogCi0gICAgaWYgKGlzU1ZOKCkpIHsKKyAgICBpZiAo JGlzU1ZOKSB7CiAgICAgICAgIHN5c3RlbSgkU1ZOLCAicmVzb2x2ZWQiLCAkZmlsZSk7Ci0gICAg fSBlbHNpZiAoaXNHaXQoKSkgeworICAgIH0gZWxzaWYgKCRpc0dpdCkgewogICAgICAgICBzeXN0 ZW0oJEdJVCwgImFkZCIsICRmaWxlKTsKICAgICB9IGVsc2UgewogICAgICAgICBkaWUgIlVua25v d24gdmVyc2lvbiBjb250cm9sIHN5c3RlbSI7CkBAIC00NTYsOSArNDk5LDkgQEAgc3ViIHNob3dT dGF0dXMoJDskKQogewogICAgIG15ICgkZmlsZSwgJGlzQ29uZmxpY3RSZXNvbHZlZCkgPSBAXzsK IAotICAgIGlmIChpc1NWTigpKSB7CisgICAgaWYgKCRpc1NWTikgewogICAgICAgICBzeXN0ZW0o JFNWTiwgInN0YXR1cyIsICRmaWxlKTsKLSAgICB9IGVsc2lmIChpc0dpdCgpKSB7CisgICAgfSBl bHNpZiAoJGlzR2l0KSB7CiAgICAgICAgIG15IEBhcmdzID0gcXcoLS1uYW1lLXN0YXR1cyk7CiAg ICAgICAgIHVuc2hpZnQgQGFyZ3MsIHF3KC0tY2FjaGVkKSBpZiAkaXNDb25mbGljdFJlc29sdmVk OwogICAgICAgICBzeXN0ZW0oJEdJVCwgImRpZmYiLCBAYXJncywgJGZpbGUpOwo=