phabricator: demonstrate broken phabread on string local:commit times

Differential Revision: https://phab.mercurial-scm.org/D6649

tests/phabricator/phabread-str-time.json

@@ -0,0 +1,221 b''
+{
+    "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

tests/test-phabricator.t

@@ -1,134 +1,178 b''
 #require vcr
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > phabricator = 
   > EOF
   $ hg init repo
   $ cd repo
   $ cat >> .hg/hgrc <<EOF
   > [phabricator]
   > url = https://phab.mercurial-scm.org/
   > callsign = HG
   > 
   > [auth]
   > hgphab.schemes = https
   > hgphab.prefix = phab.mercurial-scm.org
   > # When working on the extension and making phabricator interaction
   > # changes, edit this to be a real phabricator token. When done, edit
   > # it back. The VCR transcripts will be auto-sanitised to replace your real
   > # token with this value.
   > hgphab.phabtoken = cli-hahayouwish
   > EOF
   $ VCR="$TESTDIR/phabricator"
 
 Error is handled reasonably. We override the phabtoken here so that
 when you're developing changes to phabricator.py you can edit the
 above config and have a real token in the test but not have to edit
 this test.
   $ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \
   >  --test-vcr "$VCR/phabread-conduit-error.json" D4480 | head
   abort: Conduit Error (ERR-INVALID-AUTH): API token "cli-notavalidtoken" has the wrong length. API tokens should be 32 characters long.
 
 Basic phabread:
   $ hg phabread --test-vcr "$VCR/phabread-4480.json" D4480 | head
   # HG changeset patch
   # Date 1536771503 0
   # Parent  a5de21c9e3703f8e8eb064bd7d893ff2f703c66a
   exchangev2: start to implement pull with wire protocol v2
   
   Wire protocol version 2 will take a substantially different
   approach to exchange than version 1 (at least as far as pulling
   is concerned).
   
   This commit establishes a new exchangev2 module for holding
 
 phabupdate with an accept:
   $ hg phabupdate --accept D4564 \
   > -m 'I think I like where this is headed. Will read rest of series later.'\
   >  --test-vcr "$VCR/accept-4564.json"
 
 Create a differential diff:
   $ HGENCODING=utf-8; export HGENCODING
   $ echo alpha > alpha
   $ hg ci --addremove -m 'create alpha for phabricator test €'
   adding alpha
   $ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json"
   D1190 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg
   $ echo more >> alpha
   $ HGEDITOR=true hg ci --amend
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a86ed7d85e86-b7a54f3b-amend.hg
   $ echo beta > beta
   $ hg ci --addremove -m 'create beta for phabricator test'
   adding beta
   $ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json"
   D1190 - updated - d940d39fb603: create alpha for phabricator test \xe2\x82\xac (esc)
   D1191 - created - 4b2486dfc8c7: create beta for phabricator test
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/4b2486dfc8c7-d90584fa-phabsend.hg
   $ unset HGENCODING
 
 The amend won't explode after posting a public commit.  The local tag is left
 behind to identify it.
 
   $ echo 'public change' > beta
   $ hg ci -m 'create public change for phabricator testing'
   $ hg phase --public .
   $ echo 'draft change' > alpha
   $ hg ci -m 'create draft change for phabricator testing'
   $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json"
   D1192 - created - 24ffd6bca53a: create public change for phabricator testing
   D1193 - created - ac331633be79: create draft change for phabricator testing
   warning: not updating public commit 2:24ffd6bca53a
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ac331633be79-719b961c-phabsend.hg
   $ hg tags -v
   tip                                3:a19f1434f9a5
   D1192                              2:24ffd6bca53a local
 
   $ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF
   > {
   >     "constraints": {
   >         "isBot": true
   >     }
   > }
   > EOF
   {
     "cursor": {
       "after": null,
       "before": null,
       "limit": 100,
       "order": null
     },
     "data": [],
     "maps": {},
     "query": {
       "queryKey": null
     }
   }
 
 Template keywords
   $ hg log -T'{rev} {phabreview|json}\n'
   3 {"id": "D1193", "url": "https://phab.mercurial-scm.org/D1193"}
   2 {"id": "D1192", "url": "https://phab.mercurial-scm.org/D1192"}
   1 {"id": "D1191", "url": "https://phab.mercurial-scm.org/D1191"}
   0 {"id": "D1190", "url": "https://phab.mercurial-scm.org/D1190"}
 
   $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n'
   3 https://phab.mercurial-scm.org/D1193 D1193
   2 https://phab.mercurial-scm.org/D1192 D1192
   1 https://phab.mercurial-scm.org/D1191 D1191
   0 https://phab.mercurial-scm.org/D1190 D1190
 
 Commenting when phabsending:
   $ echo comment > comment
   $ hg ci --addremove -m "create comment for phabricator test"
   adding comment
   $ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json"
   D1253 - created - a7ee4bac036a: create comment for phabricator test
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a7ee4bac036a-8009b5a0-phabsend.hg
   $ echo comment2 >> comment
   $ hg ci --amend
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/81fce7de1b7d-05339e5b-amend.hg
   $ 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 ..