111668 2013-03-06 19:27:59 -0800 webkitpy: change git_commit_from_svn_revision() to work in a pure git checkout 2013-11-07 01:19:16 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke webkit-unassigned commit-queue eric glenn pmolnar.u-szeged rniwa oldest_to_newest 849636 0 dpranke 2013-03-06 19:27:59 -0800 right now we call git svn find-rev, which won't work. 850490 1 dpranke 2013-03-07 14:29:35 -0800 See the motivating bug 110839 for this ... we should just change it to call _most_recent_log_matching . 871425 2 rniwa 2013-04-08 21:35:32 -0700 Why is this won't fix? I don't think so. 871443 3 mithro 2013-04-08 22:04:23 -0700 I closed it WONTFIX because I won't be fixing it as I've been asked to concentrated on Blink. 871446 4 rniwa 2013-04-08 22:05:48 -0700 (In reply to comment #3) > I closed it WONTFIX because I won't be fixing it as I've been asked to concentrated on Blink. That's not a good reason to close this bug as WONTFIX since this bug is not specific to Chromium at all. 871458 5 dpranke 2013-04-08 22:38:34 -0700 (In reply to comment #3) > I closed it WONTFIX because I won't be fixing it as I've been asked to concentrated on Blink. In this case you should just un-assign yourself from the bug (use the Reset Assignee to default checkbox), rather than closing the bugs as WontFix. 946675 6 215920 pmolnar.u-szeged 2013-11-04 07:48:03 -0800 Created attachment 215920 Proposed patch 946723 7 215920 rniwa 2013-11-04 10:26:29 -0800 Comment on attachment 215920 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=215920&action=review Did you run test-webkitpy webkitpy.common.checkout.scm.scm_unittest? > Tools/Scripts/webkitpy/common/checkout/scm/git.py:313 > + git_log = self._run_git(['log', '-1', '--grep=' + '^\s*git-svn-id:.*@%s ' % svn_revision]) What's the point of +? 946771 8 pmolnar.u-szeged 2013-11-04 12:25:04 -0800 (In reply to comment #7) > (From update of attachment 215920 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=215920&action=review > > Did you run test-webkitpy webkitpy.common.checkout.scm.scm_unittest? Yes, in fact I ran "test-webkitpy --all" that covers all SCM tests as far as I know. All webkitpy tests were passing. > > > Tools/Scripts/webkitpy/common/checkout/scm/git.py:313 > > + git_log = self._run_git(['log', '-1', '--grep=' + '^\s*git-svn-id:.*@%s ' % svn_revision]) > > What's the point of +? As mentioned earlier in that file: # We use '--grep=' + foo rather than '--grep', foo because # git 1.7.0.4 (and earlier) didn't support the separate arg. 946773 9 215920 rniwa 2013-11-04 12:28:39 -0800 Comment on attachment 215920 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=215920&action=review >>> Tools/Scripts/webkitpy/common/checkout/scm/git.py:313 >>> + git_log = self._run_git(['log', '-1', '--grep=' + '^\s*git-svn-id:.*@%s ' % svn_revision]) >> >> What's the point of +? > > As mentioned earlier in that file: > # We use '--grep=' + foo rather than '--grep', foo because > # git 1.7.0.4 (and earlier) didn't support the separate arg. I get that but why don't you just do '--grep=^\s*git-svn-id:.*@%s ' instead? It seems like ' + ' is a useless noise. 946789 10 215947 pmolnar.u-szeged 2013-11-04 12:48:32 -0800 Created attachment 215947 Patch updated I just thought it was easier to read that way. New patch attached. 948134 11 215947 commit-queue 2013-11-07 01:19:13 -0800 Comment on attachment 215947 Patch updated Clearing flags on attachment: 215947 Committed r158828: <http://trac.webkit.org/changeset/158828> 948135 12 commit-queue 2013-11-07 01:19:16 -0800 All reviewed patches have been landed. Closing bug. 215920 2013-11-04 07:48:03 -0800 2013-11-04 12:48:32 -0800 Proposed patch git_commit_svn.patch text/plain 1825 pmolnar.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNWZi OGFjLi4zZjVkN2JjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTEtMDQgIFBldGVyIE1vbG5hciAgPHBtb2xu YXIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KKworICAgICAgICBDaGFuZ2UgZ2l0X2Nv bW1pdF9mcm9tX3N2bl9yZXZpc2lvbigpIHRvIHdvcmsgaW4gYSBwdXJlIGdpdCBjaGVja291dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNjY4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAoR2l0LmdpdF9j b21taXRfZnJvbV9zdm5fcmV2aXNpb24pOgorCiAyMDEzLTExLTAzICBQYXRyaWNrIEdhbnN0ZXJl ciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB0ZXN0IGZvciBMaXN0SGFzaFNl dDo6cmVtb3ZlTGFzdCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL2dpdC5weQppbmRleCAxODM5ZmU5Li5jYTNkMzU5IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTMxMCwxNCAr MzEwLDEyIEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgQG1lbW9pemVk CiAgICAgZGVmIGdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24oc2VsZiwgc3ZuX3JldmlzaW9u KToKLSAgICAgICAgIyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTY2OAotICAgICAgICAjIFdlIHNob3VsZCBjaGFuZ2UgdGhpcyB0byBydW4gZ2l0IGxv ZyAtLWdyZXAgJ2dpdC1zdm4taWQnIGluc3RlYWQKLSAgICAgICAgIyBzbyB0aGF0IHdlIGRvbid0 IHJlcXVpcmUgZ2l0K3N2biB0byBiZSBzZXQgdXAuCi0gICAgICAgIGdpdF9jb21taXQgPSBzZWxm Ll9ydW5fZ2l0X3N2bl9maW5kX3JldignciVzJyAlIHN2bl9yZXZpc2lvbikKKyAgICAgICAgZ2l0 X2xvZyA9IHNlbGYuX3J1bl9naXQoWydsb2cnLCAnLTEnLCAnLS1ncmVwPScgKyAnXlxzKmdpdC1z dm4taWQ6LipAJXMgJyAlIHN2bl9yZXZpc2lvbl0pCisgICAgICAgIGdpdF9jb21taXQgPSByZS5z ZWFyY2goIl5jb21taXQgKD9QPGNvbW1pdD5bYS1mMC05XXs0MH0pIiwgZ2l0X2xvZykKICAgICAg ICAgaWYgbm90IGdpdF9jb21taXQ6CiAgICAgICAgICAgICAjIEZJWE1FOiBBbHRlcm5hdGl2ZWx5 IHdlIGNvdWxkIG9mZmVyIHRvIHVwZGF0ZSB0aGUgY2hlY2tvdXQ/IE9yIHJldHVybiBOb25lPwog ICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IobWVzc2FnZT0nRmFpbGVkIHRvIGZpbmQgZ2l0 IGNvbW1pdCBmb3IgcmV2aXNpb24gJXMsIHlvdXIgY2hlY2tvdXQgbGlrZWx5IG5lZWRzIGFuIHVw ZGF0ZS4nICUgc3ZuX3JldmlzaW9uKQotICAgICAgICByZXR1cm4gZ2l0X2NvbW1pdAorICAgICAg ICByZXR1cm4gc3RyKGdpdF9jb21taXQuZ3JvdXAoJ2NvbW1pdCcpKQogCiAgICAgQG1lbW9pemVk CiAgICAgZGVmIHN2bl9yZXZpc2lvbl9mcm9tX2dpdF9jb21taXQoc2VsZiwgZ2l0X2NvbW1pdCk6 Cg== 215947 2013-11-04 12:48:32 -0800 2013-11-07 01:19:13 -0800 Patch updated git.patch text/plain 1820 pmolnar.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNWZi OGFjLi4zZjVkN2JjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTEtMDQgIFBldGVyIE1vbG5hciAgPHBtb2xu YXIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KKworICAgICAgICBDaGFuZ2UgZ2l0X2Nv bW1pdF9mcm9tX3N2bl9yZXZpc2lvbigpIHRvIHdvcmsgaW4gYSBwdXJlIGdpdCBjaGVja291dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNjY4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorICAgICAgICAoR2l0LmdpdF9j b21taXRfZnJvbV9zdm5fcmV2aXNpb24pOgorCiAyMDEzLTExLTAzICBQYXRyaWNrIEdhbnN0ZXJl ciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB0ZXN0IGZvciBMaXN0SGFzaFNl dDo6cmVtb3ZlTGFzdCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL2dpdC5weQppbmRleCAxODM5ZmU5Li5jYTNkMzU5IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTMxMCwxNCAr MzEwLDEyIEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgQG1lbW9pemVk CiAgICAgZGVmIGdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24oc2VsZiwgc3ZuX3JldmlzaW9u KToKLSAgICAgICAgIyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMTY2OAotICAgICAgICAjIFdlIHNob3VsZCBjaGFuZ2UgdGhpcyB0byBydW4gZ2l0IGxv ZyAtLWdyZXAgJ2dpdC1zdm4taWQnIGluc3RlYWQKLSAgICAgICAgIyBzbyB0aGF0IHdlIGRvbid0 IHJlcXVpcmUgZ2l0K3N2biB0byBiZSBzZXQgdXAuCi0gICAgICAgIGdpdF9jb21taXQgPSBzZWxm Ll9ydW5fZ2l0X3N2bl9maW5kX3JldignciVzJyAlIHN2bl9yZXZpc2lvbikKKyAgICAgICAgZ2l0 X2xvZyA9IHNlbGYuX3J1bl9naXQoWydsb2cnLCAnLTEnLCAnLS1ncmVwPV5ccypnaXQtc3ZuLWlk Oi4qQCVzICcgJSBzdm5fcmV2aXNpb25dKQorICAgICAgICBnaXRfY29tbWl0ID0gcmUuc2VhcmNo KCJeY29tbWl0ICg/UDxjb21taXQ+W2EtZjAtOV17NDB9KSIsIGdpdF9sb2cpCiAgICAgICAgIGlm IG5vdCBnaXRfY29tbWl0OgogICAgICAgICAgICAgIyBGSVhNRTogQWx0ZXJuYXRpdmVseSB3ZSBj b3VsZCBvZmZlciB0byB1cGRhdGUgdGhlIGNoZWNrb3V0PyBPciByZXR1cm4gTm9uZT8KICAgICAg ICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKG1lc3NhZ2U9J0ZhaWxlZCB0byBmaW5kIGdpdCBjb21t aXQgZm9yIHJldmlzaW9uICVzLCB5b3VyIGNoZWNrb3V0IGxpa2VseSBuZWVkcyBhbiB1cGRhdGUu JyAlIHN2bl9yZXZpc2lvbikKLSAgICAgICAgcmV0dXJuIGdpdF9jb21taXQKKyAgICAgICAgcmV0 dXJuIHN0cihnaXRfY29tbWl0Lmdyb3VwKCdjb21taXQnKSkKIAogICAgIEBtZW1vaXplZAogICAg IGRlZiBzdm5fcmV2aXNpb25fZnJvbV9naXRfY29tbWl0KHNlbGYsIGdpdF9jb21taXQpOgo=