48015 2010-10-20 15:34:29 -0700 Add Git-support to do-file-rename 2010-10-21 14:22:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates oldest_to_newest 297076 0 dbates 2010-10-20 15:34:29 -0700 Currently, do-file-rename is hard coded to only work with SVN when renaming files that match the replacement criterion. Instead, we should abstract the SCM move/rename command into a common function in VCSUtils since this functionality is used by both do-file-rename and do-webcore-rename. 297080 1 71349 dbates 2010-10-20 15:46:03 -0700 Created attachment 71349 Patch Add an SCM-independent move/rename function to VCSUtils.pm that can is used by both do-file-rename and do-webcore-rename. 297084 2 71349 mrobinson 2010-10-20 15:51:54 -0700 Comment on attachment 71349 Patch Looks good! 297085 3 71349 dbates 2010-10-20 15:54:48 -0700 Comment on attachment 71349 Patch Clearing flags on attachment: 71349 Committed r70187: <http://trac.webkit.org/changeset/70187> 297086 4 dbates 2010-10-20 15:54:53 -0700 All reviewed patches have been landed. Closing bug. 297640 5 dbates 2010-10-21 14:22:54 -0700 I inadvertently left out the line to export the function scmMoveOrRenameFile() in the patch. Committed fix in changeset 70264 <http://trac.webkit.org/changeset/70264>. 71349 2010-10-20 15:46:03 -0700 2010-10-20 15:54:48 -0700 Patch Bug48015.patch text/plain 3693 dbates SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDcwMTg0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMTAtMjAgIERhbmllbCBCYXRlcyAgPGRi YXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBHaXQtc3VwcG9ydCB0byBkby1maWxlLXJlbmFtZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgwMTUKKworICAgICAgICBBbHNvLCBh YnN0cmFjdHMgdGhlIFNDTSBtb3ZlL3JlbmFtZSBmdW5jdGlvbmFsaXR5IGluIGRvLWZpbGUtcmVu YW1lIGFuZAorICAgICAgICBkby13ZWJjb3JlLXJlbmFtZSBpbnRvIGEgY29tbW9uIGZ1bmN0aW9u IFZDU1V0aWxzOjpzY21Nb3ZlT3JSZW5hbWVGaWxlKCkuCisKKyAgICAgICAgQ3VycmVudGx5LCBk by1maWxlLXJlbmFtZSBpcyBoYXJkIGNvZGVkIHRvIGFzc3VtZSB0aGUgU0NNIGlzIFN1YnZlcnNp b24uCisgICAgICAgIEluc3RlYWQsIHdlIHNob3VsZCBhYnN0cmFjdCB0aGUgcmVuYW1lIGxvZ2lj IHRvIGJlIFNDTS1pbmRlcGVuZGVudC4gVGhpcworICAgICAgICB3aWxsIGFsbG93IHVzIHRvIGFk ZCBHaXQgc3VwcG9ydCBhcyB3ZWxsIG1vdmUgc3VjaCBmdW5jdGlvbmFsaXR5IGludG8KKyAgICAg ICAgb3VyIFNDTSBsaWJyYXJ5IFZDU1V0aWxzLCB3aGVyZSBpdCBjYW4gYmUgc2hhcmVkIGJ5IGRv LXdlYmNvcmUtcmVuYW1lLgorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKyAgICAg ICAgICAtIEFkZGVkIGZ1bmN0aW9uIHNjbU1vdmVPclJlbmFtZUZpbGUuCisgICAgICAgICogU2Ny aXB0cy9kby1maWxlLXJlbmFtZTogTW9kaWZpZWQgdG8gY2FsbCBWQ1NVdGlsczo6c2NtTW92ZU9y UmVuYW1lRmlsZSgpLgorICAgICAgICAqIFNjcmlwdHMvZG8td2ViY29yZS1yZW5hbWU6IERpdHRv LgorCiAyMDEwLTEwLTIwICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggb2xkLXJ1bi13ZWJraXQtdGVzdHMgd2hlbiB0aGVyZSdzIGEgc3BhY2UgaW4gdGhlIHBh dGggdG8gRFJUCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDcwMTg0KQor KysgV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQkod29ya2luZyBjb3B5KQpAQCAtMSw1 ICsxLDYgQEAKICMgQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5IEFwcGxlIEluYy4gIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCBDaHJpcyBKZXJk b25layAoY2hyaXMuamVyZG9uZWtAZ21haWwuY29tKQorIyBDb3B5cmlnaHQgKEMpIFJlc2VhcmNo IEluIE1vdGlvbiBMaW1pdGVkIDIwMTAuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTEzNiw2ICsxMzcsMTggQEAgc3ViIHRvV2luZG93c0xpbmVF bmRpbmdzCiAgICAgcmV0dXJuICR0ZXh0OwogfQogCisjIE5vdGUsIHRoaXMgbWV0aG9kIHdpbGwg bm90IGVycm9yIGlmIHRoZSBmaWxlIGNvcnJlc3BvbmRpbmcgdG8gdGhlICRzb3VyY2UgcGF0aCBk b2VzIG5vdCBleGlzdC4KK3N1YiBzY21Nb3ZlT3JSZW5hbWVGaWxlCit7CisgICAgbXkgKCRzb3Vy Y2UsICRkZXN0aW5hdGlvbikgPSBAXzsKKyAgICByZXR1cm4gaWYgISAtZSAkc291cmNlOworICAg IGlmIChpc1NWTigpKSB7CisgICAgICAgIHN5c3RlbSgic3ZuIiwgIm1vdmUiLCAkc291cmNlLCAk ZGVzdGluYXRpb24pOworICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKKyAgICAgICAgc3lzdGVtKCJn aXQiLCAibXYiLCAkc291cmNlLCAkZGVzdGluYXRpb24pOworICAgIH0KK30KKwogIyBOb3RlLCB0 aGlzIG1ldGhvZCB3aWxsIG5vdCBlcnJvciBpZiB0aGUgZmlsZSBjb3JyZXNwb25kaW5nIHRvIHRo ZSBwYXRoIGRvZXMgbm90IGV4aXN0Lgogc3ViIHNjbVRvZ2dsZUV4ZWN1dGFibGVCaXQKIHsKSW5k ZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvZG8tZmlsZS1yZW5hbWUKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0VG9vbHMvU2NyaXB0cy9kby1maWxlLXJlbmFtZQkocmV2aXNpb24gNzAxODQpCisrKyBXZWJL aXRUb29scy9TY3JpcHRzL2RvLWZpbGUtcmVuYW1lCSh3b3JraW5nIGNvcHkpCkBAIC0yOSwxMCAr MjksMTEgQEAKICMgU2NyaXB0IHRvIGRvIGZpbGUgcmVuYW1pbmcuCiAKIHVzZSBzdHJpY3Q7Cit1 c2UgRmlsZTo6RmluZDsKIHVzZSBGaW5kQmluOwogdXNlIGxpYiAkRmluZEJpbjo6QmluOwogdXNl IHdlYmtpdGRpcnM7Ci11c2UgRmlsZTo6RmluZDsKK3VzZSBWQ1NVdGlsczsKIAogc2V0Q29uZmln dXJhdGlvbigpOwogY2hkaXJXZWJLaXQoKTsKQEAgLTg2LDcgKzg3LDcgQEAgZm9yIG15ICRmaWxl IChzb3J0IEBwYXRocykgewogICAgIGlmICgkbmV3RmlsZXskZmlsZX0pIHsKICAgICAgICAgbXkg JG5ld0ZpbGUgPSAkbmV3RmlsZXskZmlsZX07CiAgICAgICAgIHByaW50ICJSZW5hbWluZyAkZmls ZSB0byAkbmV3RmlsZVxuIjsKLSAgICAgICAgc3lzdGVtICJzdm4gbW92ZSAkZmlsZSAkbmV3Rmls ZSI7CisgICAgICAgIHNjbU1vdmVPclJlbmFtZUZpbGUoJGZpbGUsICRuZXdGaWxlKTsKICAgICB9 CiB9CiAKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvZG8td2ViY29yZS1yZW5hbWUKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9kby13ZWJjb3JlLXJlbmFtZQkocmV2aXNpb24g NzAxODQpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL2RvLXdlYmNvcmUtcmVuYW1lCSh3b3JraW5n IGNvcHkpCkBAIC0yMDcsMTggKzIwNywxMSBAQCBmb3IgbXkgJGZpbGUgKHNvcnQgQHBhdGhzKSB7 CiAgICAgfQogfQogCi0KLW15ICRpc0dpdCA9IGlzR2l0KCk7Ci0KIGZvciBteSAkZmlsZSAoc29y dCBAcGF0aHMpIHsKICAgICBpZiAoJG5ld0ZpbGV7JGZpbGV9KSB7CiAgICAgICAgIG15ICRuZXdG aWxlID0gJG5ld0ZpbGV7JGZpbGV9OwogICAgICAgICBwcmludCAiUmVuYW1pbmcgJGZpbGUgdG8g JG5ld0ZpbGVcbiI7Ci0gICAgICAgIGlmICgkaXNHaXQpIHsKLSAgICAgICAgICAgIHN5c3RlbSAi Z2l0IG12ICRmaWxlICRuZXdGaWxlIjsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHN5 c3RlbSAic3ZuIG1vdmUgJGZpbGUgJG5ld0ZpbGUiOwotICAgICAgICB9CisgICAgICAgIHNjbU1v dmVPclJlbmFtZUZpbGUoJGZpbGUsICRuZXdGaWxlKTsKICAgICB9CiB9CiAK