55024 2011-02-22 23:34:35 -0800 fix svn revision number finding when creating git patches 2011-02-24 00:14:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth aroben eric evan kalman oldest_to_newest 355902 0 ojan 2011-02-22 23:34:35 -0800 fix revision number finding when creating git patches 355903 1 83452 ojan 2011-02-22 23:36:49 -0800 Created attachment 83452 Patch 355931 2 abarth 2011-02-23 01:19:58 -0800 Obligatory deferring to evmar. :) 356082 3 83452 aroben 2011-02-23 08:07:09 -0800 Comment on attachment 83452 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83452&action=review > Tools/Scripts/webkitpy/common/checkout/scm.py:752 > + git_log = self.run(['git', 'log', '-10']) > + match = re.search("^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ .*$", git_log, re.MULTILINE) > + if not match: I think you can just use "git svn info". It seems to work at least in simple cases. I haven't tried it with a merge commit, though. 356154 4 evan 2011-02-23 09:41:24 -0800 Here's how this is done within git-svn (as translated into my python). git-svn doesn't have the -100 limit. http://neugierig.org/software/git/?url=git-cl/tree/git-cl#n143 142 # The -100 is an arbitrary limit so we don't search forever. 143 cmd = ['git', 'log', '-100', '--pretty=medium'] 144 proc = subprocess.Popen(cmd, stdout=subprocess.PIPE) 145 for line in proc.stdout: 146 match = git_svn_re.match(line) 147 if match: 148 url = match.group(1) 151 proc.stdout.close() # Cut pipe. 152 break I think Ojan's is probably fine too though. "git svn info" will fail if you have a git checkout that isn't a git-svn checkout. Not sure if that applies here. 356181 5 83452 tony 2011-02-23 10:37:44 -0800 Comment on attachment 83452 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83452&action=review This or evan's version looks fine. > Tools/Scripts/webkitpy/common/checkout/scm.py:751 > + match = re.search("^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ .*$", git_log, re.MULTILINE) Nit: I'm not sure the .*$ gives you anything (aren't you always going to have something before the end of the line?) 356681 6 ojan 2011-02-23 22:27:25 -0800 (In reply to comment #4) > 142 # The -100 is an arbitrary limit so we don't search forever. > 143 cmd = ['git', 'log', '-100', '--pretty=medium'] I wasn't sure what limit to set. 10 is probably too small. I'll make it 25 for now. > "git svn info" will fail if you have a git checkout that isn't a git-svn checkout. Right. 356717 7 ojan 2011-02-24 00:14:13 -0800 Committed r79520: <http://trac.webkit.org/changeset/79520> 83452 2011-02-22 23:36:49 -0800 2011-02-23 10:37:43 -0800 Patch bug-55024-20110223183647.patch text/plain 3158 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogNzkzOTkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYWJhNmU1YjI1YjJiY2U4NDViYmE5NDE0M2Q2MDdlMDk0 YWE2YjE0Li42YTlkNWJhNzIxYzAwYTA1MzgxZDczYjRjZGMxNDZmYTM5NjVlYTVlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDItMjIgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmaXggcmV2aXNpb24gbnVt YmVyIGZpbmRpbmcgd2hlbiBjcmVhdGluZyBnaXQgcGF0Y2hlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUwMjQKKworICAgICAgICBIRUFEfm4gZG9l cyBub3Qgd2FsayBtZXJnZSBjb21taXRzIGNvcnJlY3RseS4gZ2l0IGxvZyBob3dldmVyIGRvZXMu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5 OgorCiAyMDExLTAyLTIyICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQppbmRleCAzZmEyZGI1YjE2NTViNDgyOThjOWQ2MmEz MzJiN2JlNTE5NDkxNDRjLi5kZDU3NzZjY2JiYmQ1MmYwODIwZWFlNmQxYjMzNGUwNWFmYWE5Y2Fh IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20u cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5CkBA IC03NDcsMjAgKzc0NywxMiBAQCBjbGFzcyBHaXQoU0NNKToKICAgICAgICAgcmV0dXJuICJnaXQi CiAKICAgICBkZWYgcHJlcGVuZF9zdm5fcmV2aXNpb24oc2VsZiwgZGlmZik6Ci0gICAgICAgIHJl dmlzaW9uID0gTm9uZQotICAgICAgICB0cmllcyA9IDAKLSAgICAgICAgd2hpbGUgbm90IHJldmlz aW9uIGFuZCB0cmllcyA8IDEwOgotICAgICAgICAgICAgIyBJZiB0aGUgZ2l0IGNoZWNrb3V0IGlz IG5vdCB0cmFja2luZyBhbiBTVk4gcmVwbywgdGhlbiBzdm5fcmV2aXNpb25fZnJvbV9naXRfY29t bWl0IHRocm93cy4KLSAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICByZXZpc2lvbiA9 IHNlbGYuc3ZuX3JldmlzaW9uX2Zyb21fZ2l0X2NvbW1pdCgnSEVBRH4nICsgc3RyKHRyaWVzKSkK LSAgICAgICAgICAgIGV4Y2VwdDoKLSAgICAgICAgICAgICAgICByZXR1cm4gZGlmZgotICAgICAg ICAgICAgdHJpZXMgKz0gMQotCi0gICAgICAgIGlmIG5vdCByZXZpc2lvbjoKKyAgICAgICAgZ2l0 X2xvZyA9IHNlbGYucnVuKFsnZ2l0JywgJ2xvZycsICctMTAnXSkKKyAgICAgICAgbWF0Y2ggPSBy ZS5zZWFyY2goIl5ccypnaXQtc3ZuLWlkOi4qQCg/UDxzdm5fcmV2aXNpb24+XGQrKVwgLiokIiwg Z2l0X2xvZywgcmUuTVVMVElMSU5FKQorICAgICAgICBpZiBub3QgbWF0Y2g6CiAgICAgICAgICAg ICByZXR1cm4gZGlmZgogCi0gICAgICAgIHJldHVybiAiU3VidmVyc2lvbiBSZXZpc2lvbjogIiAr IHN0cihyZXZpc2lvbikgKyAnXG4nICsgZGlmZgorICAgICAgICByZXR1cm4gIlN1YnZlcnNpb24g UmV2aXNpb246ICIgKyBzdHIobWF0Y2guZ3JvdXAoJ3N2bl9yZXZpc2lvbicpKSArICdcbicgKyBk aWZmCiAKICAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hhbmdl ZF9maWxlcz1Ob25lKToKICAgICAgICAgIiIiUmV0dXJucyBhIGJ5dGUgYXJyYXkgKHN0cigpKSBy ZXByZXNlbnRpbmcgdGhlIHBhdGNoIGZpbGUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3QucHkKaW5kZXggZGVjZmFlMGU2OWY4 NDgxMWRmZGM4ZDA3NjNiODAwODMyOWE2YTY1Mi4uNzliMzU0ZDFlMzRiMGJmNzE3NDk3ZDYyM2Ni NGI5ZmJkMzM2MGYyZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5weQpAQCAtMTEzOCw2ICsxMTM4LDE2IEBAIGNsYXNz IEdpdFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShyZS5zZWFyY2go cid0ZXN0X2ZpbGVfY29tbWl0MScsIHBhdGNoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJl LnNlYXJjaChyJ1N1YnZlcnNpb24gUmV2aXNpb246IDUnLCBwYXRjaCkpCiAKKyAgICBkZWYgdGVz dF9jcmVhdGVfcGF0Y2hfYWZ0ZXJfbWVyZ2Uoc2VsZik6CisgICAgICAgIHJ1bl9jb21tYW5kKFsn Z2l0JywgJ2NoZWNrb3V0JywgJy1iJywgJ2R1bW15LWJyYW5jaCcsICd0cnVua34zJ10pCisgICAg ICAgIHNlbGYuX29uZV9sb2NhbF9jb21taXQoKQorICAgICAgICBydW5fY29tbWFuZChbJ2dpdCcs ICdtZXJnZScsICd0cnVuayddKQorCisgICAgICAgIHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKHNl bGYuZ2l0X2NoZWNrb3V0X3BhdGgpCisgICAgICAgIHBhdGNoID0gc2NtLmNyZWF0ZV9wYXRjaCgp CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShyZS5zZWFyY2gocid0ZXN0X2ZpbGVfY29tbWl0MScs IHBhdGNoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ1N1YnZlcnNpb24g UmV2aXNpb246IDUnLCBwYXRjaCkpCisKICAgICBkZWYgdGVzdF9jcmVhdGVfcGF0Y2hfd2l0aF9j aGFuZ2VkX2ZpbGVzKHNlbGYpOgogICAgICAgICBzZWxmLl9vbmVfbG9jYWxfY29tbWl0X3BsdXNf d29ya2luZ19jb3B5X2NoYW5nZXMoKQogICAgICAgICBzY20gPSBkZXRlY3Rfc2NtX3N5c3RlbShz ZWxmLmdpdF9jaGVja291dF9wYXRoKQo=