This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7935

phabricator: use .arcconfig for `phabricator.url` if not set locally
ClosedPublic

Authored by mharbison72 on Jan 17 2020, 5:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGff396501e841: phabricator: use .arcconfig for `phabricator.url` if not set locally
Summary

This setting is also per repo; see the previous commit for details.

The existing conduit_uri setting is the previous name of phabricator.uri[1]
and while it could easily be queried before the latter for compatibility, the
config in this repo has '/api' appended. That's already done in callconduit(),
which would clearly end up giving the wrong result. It looks like the path of
the URL is now ignored in user configs[2], so add the modern setting without it
to this repo's .arcconfig.

Sadly, we still need to have contributors configure auth.hg.phabtoken (and
therefore auth.hg.prefix to link it to phabricator.url) in order to submit
patches, but at least now it's localized to a single section.

[1] https://secure.phabricator.com/book/phabricator/article/arcanist_new_project/
[2] https://github.com/phacility/arcanist/blob/cc850163f30c4697e925df0d6212469679600a2c/scripts/arcanist.php#L271

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

mharbison72 created this revision.Jan 17 2020, 5:47 PM
mharbison72 added a commit: rHGff396501e841: phabricator: use .arcconfig for `phabricator.url` if not set locally.Jan 21 2020, 11:26 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGff396501e841: phabricator: use .arcconfig for `phabricator.url` if not set locally (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
M.arcconfig (1 line)
Mhgext/phabricator.py (13 lines)
Mtests/test-phabricator.t (2 lines)

Diff 19486

.arcconfig

{ {
"conduit_uri": "https://phab.mercurial-scm.org/api", "conduit_uri": "https://phab.mercurial-scm.org/api",
"phabricator.uri": "https://phab.mercurial-scm.org/",
"repository.callsign": "HG", "repository.callsign": "HG",
"arc.land.onto.default": "@", "arc.land.onto.default": "@",
"base": "hg:.^" "base": "hg:.^"
} }

hgext/phabricator.py

) )
result = True result = True
except ValueError: except ValueError:
ui.warn(_(b"invalid JSON in %s\n") % wdirvfs.join(b".arcconfig")) ui.warn(_(b"invalid JSON in %s\n") % wdirvfs.join(b".arcconfig"))
except IOError: except IOError:
pass pass
cfg = util.sortdict()
if b"repository.callsign" in arcconfig: if b"repository.callsign" in arcconfig:
ui.applyconfig( cfg[(b"phabricator", b"callsign")] = arcconfig[b"repository.callsign"]
{(b"phabricator", b"callsign"): arcconfig[b"repository.callsign"]},
source=wdirvfs.join(b".arcconfig"), if b"phabricator.uri" in arcconfig:
) cfg[(b"phabricator", b"url")] = arcconfig[b"phabricator.uri"]
if cfg:
ui.applyconfig(cfg, source=wdirvfs.join(b".arcconfig"))
return orig(ui, wdirvfs, hgvfs, requirements) or result # Load .hg/hgrc return orig(ui, wdirvfs, hgvfs, requirements) or result # 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):

tests/test-phabricator.t

> [phabricator] > [phabricator]
> url = global > url = global
> callsign = global > callsign = global
> EOF > EOF
$ cp $TESTDIR/../.arcconfig . $ cp $TESTDIR/../.arcconfig .
$ mv .hg/hgrc .hg/hgrc.bak $ mv .hg/hgrc .hg/hgrc.bak
$ hg config phabricator --debug $ hg config phabricator --debug
read config from: */.hgrc (glob) read config from: */.hgrc (glob)
*/.hgrc:*: phabricator.url=global (glob)
$TESTTMP/repo/.arcconfig: phabricator.callsign=HG $TESTTMP/repo/.arcconfig: phabricator.callsign=HG
$TESTTMP/repo/.arcconfig: phabricator.url=https://phab.mercurial-scm.org/
But it doesn't override local config But it doesn't override local config
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [phabricator] > [phabricator]
> url = local > url = local
> callsign = local > callsign = local
> EOF > EOF
$ hg config phabricator --debug $ hg config phabricator --debug
read config from: */.hgrc (glob) read config from: */.hgrc (glob)
$TESTTMP/repo/.hg/hgrc:*: phabricator.url=local (glob) $TESTTMP/repo/.hg/hgrc:*: phabricator.url=local (glob)
$TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=local (glob) $TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=local (glob)
$ mv .hg/hgrc.bak .hg/hgrc $ mv .hg/hgrc.bak .hg/hgrc
$ cd .. $ cd ..