This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7055

phabricator: update hgmatcher to cope with the new data format
ClosedPublic

Authored by Kwan on Oct 10 2019, 5:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa4da1c3b82ab: phabricator: update hgmatcher to cope with the new data format
rHGa124b79a3a7e: phabricator: update hgmatcher to cope with the new data format
Summary

The new conduit format can't be matched by the existing matcher since it shifts
all the data into an urlencoded string of JSON, the order of which isn't stable
between runs. Instead detect JSON values of params and load them into python
dicts, which python will then naturally deep-equal compare.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Kwan created this revision.Oct 10 2019, 5:53 PM
Kwan updated this revision to Diff 17085.Oct 11 2019, 1:55 PM

Fix some test-check-code issues, and one test-check-pyflakes unused local.

Kwan updated this revision to Diff 17105.Oct 12 2019, 9:45 AM

I'd missed out the attrs key conversion needed on py3.

Kwan added inline comments.Oct 12 2019, 10:02 AM
hgext/phabricator.py
155–156

These will need converting to unicode first for py3.5 (I keep forgetting about loads only accepting bytes from 3.6 onwards).

durin42 added a subscriber: durin42.Oct 16 2019, 4:41 PM
durin42 added inline comments.
hgext/phabricator.py
155–156

That might be a nudge towards dropping 3.5 support. We've already got problems on 3.5. :(

Kwan added a commit: rHGa124b79a3a7e: phabricator: update hgmatcher to cope with the new data format.Oct 16 2019, 4:51 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa124b79a3a7e: phabricator: update hgmatcher to cope with the new data format (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (18 lines)

Diff 17259

hgext/phabricator.py

def vcrcommand(name, flags, spec, helpcategory=None, optionalrepo=False): def vcrcommand(name, flags, spec, helpcategory=None, optionalrepo=False):
fullflags = flags + _VCR_FLAGS fullflags = flags + _VCR_FLAGS
def hgmatcher(r1, r2): def hgmatcher(r1, r2):
if r1.uri != r2.uri or r1.method != r2.method: if r1.uri != r2.uri or r1.method != r2.method:
return False return False
r1params = r1.body.split(b'&') r1params = util.urlreq.parseqs(r1.body)
r2params = r2.body.split(b'&') r2params = util.urlreq.parseqs(r2.body)
return set(r1params) == set(r2params) for key in r1params:
if key not in r2params:
return False
value = r1params[key][0]
# we want to compare json payloads without worrying about ordering
if value.startswith(b'{') and value.endswith(b'}'):
r1json = json.loads(value)
r2json = json.loads(r2params[key][0])
KwanAuthorUnsubmitted
Not Done

These will need converting to unicode first for py3.5 (I keep forgetting about loads only accepting bytes from 3.6 onwards).

Kwan: These will need converting to unicode first for py3.5 (I keep forgetting about loads only…
durin42Unsubmitted
Not Done

That might be a nudge towards dropping 3.5 support. We've already got problems on 3.5. :(

durin42: That might be a nudge towards dropping 3.5 support. We've already got problems on 3.5. :(
if r1json != r2json:
return False
elif r2params[key][0] != value:
return False
return True
def sanitiserequest(request): def sanitiserequest(request):
request.body = re.sub( request.body = re.sub(
br'cli-[a-z0-9]+', br'cli-hahayouwish', request.body br'cli-[a-z0-9]+', br'cli-hahayouwish', request.body
) )
return request return request
def sanitiseresponse(response): def sanitiseresponse(response):