Mercurial > public > mercurial-scm > hg

comparison hgext/phabricator.py @ 45502:c7fe0dfb5312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phabricator: fix loadhgrc() override broken by D8656 This fixes some failing `test-check*` tests (at least `test-check-code.t` was broken). Differential Revision: https://phab.mercurial-scm.org/D9044
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Sep 2020 22:45:51 -0700
parents b71858b42963
children 294aab57a5f3
comparison
equal deleted inserted replaced
45501:0e75c088f0dc 45502:c7fe0dfb5312
165 ), 165 ),
166 ] 166 ]
167 167
168 168
169 @eh.wrapfunction(localrepo, "loadhgrc") 169 @eh.wrapfunction(localrepo, "loadhgrc")
170 def _loadhgrc(orig, ui, wdirvfs, hgvfs, requirements, **opts): 170 def _loadhgrc(orig, ui, wdirvfs, hgvfs, requirements, *args, **opts):
171 """Load ``.arcconfig`` content into a ui instance on repository open. 171 """Load ``.arcconfig`` content into a ui instance on repository open.
172 """ 172 """
173 result = False 173 result = False
174 arcconfig = {} 174 arcconfig = {}
175 175
200 200
201 if cfg: 201 if cfg:
202 ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig")) 202 ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig"))
203 203
204 return ( 204 return (
205 orig(ui, wdirvfs, hgvfs, requirements, **opts) or result 205 orig(ui, wdirvfs, hgvfs, requirements, *args, **opts) or result
206 ) # Load .hg/hgrc 206 ) # Load .hg/hgrc
207 207
208 208
209 def vcrcommand(name, flags, spec, helpcategory=None, optionalrepo=False): 209 def vcrcommand(name, flags, spec, helpcategory=None, optionalrepo=False):
210 fullflags = flags + _VCR_FLAGS 210 fullflags = flags + _VCR_FLAGS