Mercurial > hg
changeset 42617:7629eb87e7f2
phabricator: demonstrate broken phabread on string local:commit times
Differential Revision: https://phab.mercurial-scm.org/D6649
| author | Ian Moody <moz-ian@perix.co.uk> |
|---|---|
| date | Tue, 16 Jul 2019 18:38:38 +0100 |
| parents | 5162753c4c14 |
| children | c17e6a3e7356 |
| files | tests/phabricator/phabread-str-time.json tests/test-phabricator.t |
| diffstat | 2 files changed, 265 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/phabricator/phabread-str-time.json Tue Jul 16 18:38:38 2019 +0100 @@ -0,0 +1,221 @@ +{ + "version": 1, + "interactions": [ + { + "request": { + "body": "api.token=cli-hahayouwish&ids%5B0%5D=1285", + "headers": { + "content-length": [ + "58" + ], + "content-type": [ + "application/x-www-form-urlencoded" + ], + "host": [ + "phab.mercurial-scm.org" + ], + "accept": [ + "application/mercurial-0.1" + ], + "user-agent": [ + "mercurial/proto-1.0 (Mercurial 4.8.2)" + ] + }, + "method": "POST", + "uri": "https://phab.mercurial-scm.org//api/differential.query" + }, + "response": { + "status": { + "message": "OK", + "code": 200 + }, + "headers": { + "content-length": [ + "822" + ], + "expires": [ + "Sat, 01 Jan 2000 00:00:00 GMT" + ], + "x-content-type-options": [ + "nosniff" + ], + "strict-transport-security": [ + "max-age=31536000; includeSubdomains; preload" + ], + "vary": [ + "Accept-Encoding" + ], + "connection": [ + "keep-alive" + ], + "x-xss-protection": [ + "1; mode=block" + ], + "cache-control": [ + "no-store" + ], + "date": [ + "Mon, 01 Jul 2019 22:36:40 GMT" + ], + "x-frame-options": [ + "Deny" + ], + "referrer-policy": [ + "no-referrer", + "strict-origin-when-cross-origin" + ], + "content-type": [ + "application/json" + ] + }, + "body": { + "string": "{\"result\":[{\"id\":\"1285\",\"phid\":\"PHID-DREV-uefuzc6kbhhkoqhr347g\",\"title\":\"test string time\",\"uri\":\"https:\\/\\/phab.mercurial-scm.org\\/D1285\",\"dateCreated\":\"1562019861\",\"dateModified\":\"1562019862\",\"authorPHID\":\"PHID-USER-qmzis76vb2yh3ogldu6r\",\"status\":\"0\",\"statusName\":\"Draft\",\"properties\":{\"draft.broadcast\":false,\"lines.added\":1,\"lines.removed\":0,\"buildables\":{\"PHID-HMBB-lhjiovrsqtbft2fz4lua\":{\"status\":\"passed\"}}},\"branch\":null,\"summary\":\"\",\"testPlan\":\"\",\"lineCount\":\"1\",\"activeDiffPHID\":\"PHID-DIFF-dkgwbpgcv37pymqieyyv\",\"diffs\":[\"2069\"],\"commits\":[],\"reviewers\":[],\"ccs\":[],\"hashes\":[],\"auxiliary\":{\"bugzilla.bug-id\":null,\"phabricator:projects\":[\"PHID-PROJ-f2a3wl5wxtqdtfgdjqzk\"],\"phabricator:depends-on\":[]},\"repositoryPHID\":\"PHID-REPO-bvunnehri4u2isyr7bc3\",\"sourcePath\":null}],\"error_code\":null,\"error_info\":null}" + } + } + }, + { + "request": { + "body": "api.token=cli-hahayouwish&ids%5B0%5D=2069", + "headers": { + "content-length": [ + "58" + ], + "content-type": [ + "application/x-www-form-urlencoded" + ], + "host": [ + "phab.mercurial-scm.org" + ], + "accept": [ + "application/mercurial-0.1" + ], + "user-agent": [ + "mercurial/proto-1.0 (Mercurial 4.8.2)" + ] + }, + "method": "POST", + "uri": "https://phab.mercurial-scm.org//api/differential.querydiffs" + }, + "response": { + "status": { + "message": "OK", + "code": 200 + }, + "headers": { + "content-length": [ + "1137" + ], + "expires": [ + "Sat, 01 Jan 2000 00:00:00 GMT" + ], + "x-content-type-options": [ + "nosniff" + ], + "strict-transport-security": [ + "max-age=31536000; includeSubdomains; preload" + ], + "vary": [ + "Accept-Encoding" + ], + "connection": [ + "keep-alive" + ], + "x-xss-protection": [ + "1; mode=block" + ], + "cache-control": [ + "no-store" + ], + "date": [ + "Mon, 01 Jul 2019 22:36:41 GMT" + ], + "x-frame-options": [ + "Deny" + ], + "referrer-policy": [ + "no-referrer", + "strict-origin-when-cross-origin" + ], + "content-type": [ + "application/json" + ] + }, + "body": { + "string": "{\"result\":{\"2069\":{\"id\":\"2069\",\"revisionID\":\"1285\",\"dateCreated\":\"1562019858\",\"dateModified\":\"1562019861\",\"sourceControlBaseRevision\":null,\"sourceControlPath\":null,\"sourceControlSystem\":null,\"branch\":null,\"bookmark\":null,\"creationMethod\":\"web\",\"description\":null,\"unitStatus\":\"4\",\"lintStatus\":\"4\",\"changes\":[{\"id\":\"5416\",\"metadata\":{\"line:first\":1,\"hash.effect\":\"ei3Zy6KS2Wut\"},\"oldPath\":null,\"currentPath\":\"test\",\"awayPaths\":[],\"oldProperties\":[],\"newProperties\":{\"unix:filemode\":\"100644\"},\"type\":\"1\",\"fileType\":\"1\",\"commitHash\":null,\"addLines\":\"1\",\"delLines\":\"0\",\"hunks\":[{\"oldOffset\":\"0\",\"newOffset\":\"1\",\"oldLength\":\"0\",\"newLength\":\"1\",\"addLines\":null,\"delLines\":null,\"isMissingOldNewline\":null,\"isMissingNewNewline\":null,\"corpus\":\"+test\\n\"}]}],\"properties\":{\"local:commits\":{\"da5c8c6bf23a36b6e3af011bc3734460692c23ce\":{\"author\":\"test\",\"authorEmail\":\"test\",\"branch\":\"default\",\"commit\":\"da5c8c6bf23a36b6e3af011bc3734460692c23ce\",\"rev\":\"da5c8c6bf23a36b6e3af011bc3734460692c23ce\",\"parents\":[\"1f634396406d03e565ed645370e5fecd062cf215\"],\"time\":\"1562019844\"}}},\"authorName\":\"test\",\"authorEmail\":\"test\"}},\"error_code\":null,\"error_info\":null}" + } + } + }, + { + "request": { + "body": "diffID=2069&api.token=cli-hahayouwish", + "headers": { + "content-length": [ + "54" + ], + "content-type": [ + "application/x-www-form-urlencoded" + ], + "host": [ + "phab.mercurial-scm.org" + ], + "accept": [ + "application/mercurial-0.1" + ], + "user-agent": [ + "mercurial/proto-1.0 (Mercurial 4.8.2)" + ] + }, + "method": "POST", + "uri": "https://phab.mercurial-scm.org//api/differential.getrawdiff" + }, + "response": { + "status": { + "message": "OK", + "code": 200 + }, + "headers": { + "content-length": [ + "153" + ], + "expires": [ + "Sat, 01 Jan 2000 00:00:00 GMT" + ], + "x-content-type-options": [ + "nosniff" + ], + "strict-transport-security": [ + "max-age=31536000; includeSubdomains; preload" + ], + "vary": [ + "Accept-Encoding" + ], + "connection": [ + "keep-alive" + ], + "x-xss-protection": [ + "1; mode=block" + ], + "cache-control": [ + "no-store" + ], + "date": [ + "Mon, 01 Jul 2019 22:36:42 GMT" + ], + "x-frame-options": [ + "Deny" + ], + "referrer-policy": [ + "no-referrer", + "strict-origin-when-cross-origin" + ], + "content-type": [ + "application/json" + ] + }, + "body": { + "string": "{\"result\":\"diff --git a\\/test b\\/test\\nnew file mode 100644\\n--- \\/dev\\/null\\n+++ b\\/test\\n@@ -0,0 +1 @@\\n+test\\n\\n\",\"error_code\":null,\"error_info\":null}" + } + } + } + ] +} \ No newline at end of file
--- a/tests/test-phabricator.t Tue Jul 02 18:02:12 2019 +0530 +++ b/tests/test-phabricator.t Tue Jul 16 18:38:38 2019 +0100 @@ -131,4 +131,48 @@ $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" D1253 - updated - 1acd4b60af38: create comment for phabricator test +Phabreading a DREV with a local:commits time as a string: +BROKEN: shouldn't error + $ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285 + ** unknown exception encountered, please report by visiting + ** https://mercurial-scm.org/wiki/BugTracker + ** Python * (glob) + ** Mercurial Distributed SCM (version *) (glob) + ** Extensions loaded: phabricator + Traceback (most recent call last): + File "*/install/bin/hg", line *, in <module> (glob) + dispatch.run() + File "*/install/lib/python/mercurial/dispatch.py", line *, in run (glob) + status = dispatch(req) + File "*/install/lib/python/mercurial/dispatch.py", line *, in dispatch (glob) + ret = _runcatch(req) or 0 + File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcatch (glob) + return _callcatch(ui, _runcatchfunc) + File "*/install/lib/python/mercurial/dispatch.py", line *, in _callcatch (glob) + return scmutil.callcatch(ui, func) + File "*/install/lib/python/mercurial/scmutil.py", line *, in callcatch (glob) + return func() + File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcatchfunc (glob) + return _dispatch(req) + File "*/install/lib/python/mercurial/dispatch.py", line *, in _dispatch (glob) + cmdpats, cmdoptions) + File "*/install/lib/python/mercurial/dispatch.py", line *, in runcommand (glob) + ret = _runcommand(ui, options, cmd, d) + File "*/install/lib/python/mercurial/dispatch.py", line *, in _runcommand (glob) + return cmdfunc() + File "*/install/lib/python/mercurial/dispatch.py", line *, in <lambda> (glob) + d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) + File "*/install/lib/python/mercurial/util.py", line *, in check (glob) + return func(*args, **kwargs) + File "*/install/lib/python/hgext/phabricator.py", line *, in inner (glob) + return fn(*args, **kwargs) + File "*/install/lib/python/hgext/phabricator.py", line *, in phabread (glob) + readpatch(repo, drevs, ui.write) + File "*/install/lib/python/hgext/phabricator.py", line *, in readpatch (glob) + meta = getdiffmeta(diffs[b'%d' % diffid]) + File "*/install/lib/python/hgext/phabricator.py", line *, in getdiffmeta (glob) + meta[b'date'] = b'%d 0' % commit[b'time'] + TypeError: %d format: a number is required, not str + [1] + $ cd ..