This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9044

phabricator: fix loadhgrc() override broken by D8656
ClosedPublic

Authored by martinvonz on Sep 18 2020, 2:54 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc7fe0dfb5312: phabricator: fix loadhgrc() override broken by D8656
Summary

This fixes some failing test-check* tests (at least
test-check-code.t was broken).

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

martinvonz created this revision.Sep 18 2020, 2:54 AM
pulkit accepted this revision.Sep 18 2020, 2:56 AM
This revision is now accepted and ready to land.Sep 18 2020, 2:56 AM
martinvonz added a commit: rHGc7fe0dfb5312: phabricator: fix loadhgrc() override broken by D8656.Sep 18 2020, 3:23 AM
Closed by commit rHGc7fe0dfb5312: phabricator: fix loadhgrc() override broken by D8656 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (4 lines)

Diff 22715

hgext/phabricator.py

b', otherwise will mock all http requests using the specified vcr file.' b', otherwise will mock all http requests using the specified vcr file.'
b' (ADVANCED)' b' (ADVANCED)'
), ),
), ),
] ]
@eh.wrapfunction(localrepo, "loadhgrc") @eh.wrapfunction(localrepo, "loadhgrc")
def _loadhgrc(orig, ui, wdirvfs, hgvfs, requirements, **opts): def _loadhgrc(orig, ui, wdirvfs, hgvfs, requirements, *args, **opts):
"""Load ``.arcconfig`` content into a ui instance on repository open. """Load ``.arcconfig`` content into a ui instance on repository open.
""" """
result = False result = False
arcconfig = {} arcconfig = {}
try: try:
# json.loads only accepts bytes from 3.6+ # json.loads only accepts bytes from 3.6+
rawparams = encoding.unifromlocal(wdirvfs.read(b".arcconfig")) rawparams = encoding.unifromlocal(wdirvfs.read(b".arcconfig"))
if b"phabricator.uri" in arcconfig: if b"phabricator.uri" in arcconfig:
cfg[(b"phabricator", b"url")] = arcconfig[b"phabricator.uri"] cfg[(b"phabricator", b"url")] = arcconfig[b"phabricator.uri"]
if cfg: if cfg:
ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig")) ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig"))
return ( return (
orig(ui, wdirvfs, hgvfs, requirements, **opts) or result orig(ui, wdirvfs, hgvfs, requirements, *args, **opts) or result
) # Load .hg/hgrc ) # Load .hg/hgrc
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: