Patchwork D9044: phabricator: fix loadhgrc() override broken by D8656

login
register
mail settings
Submitter phabricator
Date Sept. 18, 2020, 6:54 a.m.
Message ID <differential-rev-PHID-DREV-unfy3jtxfbcoe3s2hcpq-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47206/
State Superseded
Headers show

Comments

phabricator - Sept. 18, 2020, 6:54 a.m.
martinvonz created this revision.
Herald added subscribers: mercurial-patches, Kwan.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9044

AFFECTED FILES
  hgext/phabricator.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: Kwan, mercurial-patches, mercurial-devel

Patch

diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -167,7 +167,7 @@ 
 
 
 @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.
     """
     result = False
@@ -202,7 +202,7 @@ 
         ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig"))
 
     return (
-        orig(ui, wdirvfs, hgvfs, requirements, **opts) or result
+        orig(ui, wdirvfs, hgvfs, requirements, *args, **opts) or result
     )  # Load .hg/hgrc