( )⚙ D8659 config: add `--shared` flag to edit config file of shared source

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8659

config: add `--shared` flag to edit config file of shared source
ClosedPublic

Authored by pulkit on Jun 25 2020, 4:53 AM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers
Commits
rHGac7a3da0dbb6: config: add `--shared` flag to edit config file of shared source
Summary

With format.exp-share-safe enabled, we now read the .hg/hgrc of the shared
source also.
This patch adds --shared flag to hg config command which can be used to edit
that shared source config file. It only works if the repository is shared one
and is shared using the safe method.

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

pulkit created this revision.Jun 25 2020, 4:53 AM
pulkit updated this revision to Diff 21744.Jul 1 2020, 6:01 AM
pulkit updated this revision to Diff 21753.Jul 2 2020, 7:17 AM
marmoute accepted this revision.Jul 15 2020, 2:11 PM
pulkit removed a parent revision: D8658: commands: use any() instead of `if a or b or c`.Jul 20 2020, 8:15 AM
pulkit retitled this revision from config: add `--share` flag to edit config file of shared source to config: add `--shared` flag to edit config file of shared source.
pulkit edited the summary of this revision. (Show Details)
pulkit updated this revision to Diff 21978.
pulkit updated this revision to Diff 22383.Aug 10 2020, 11:28 AM
pulkit updated this revision to Diff 22445.Aug 25 2020, 7:39 AM
pulkit updated this revision to Diff 22656.Sep 16 2020, 7:56 AM
indygreg accepted this revision.Sep 17 2020, 9:38 PM
indygreg added a subscriber: indygreg.

I may tweak the language of the user-facing messages in flight to make them slightly more readable.

This revision is now accepted and ready to land.Sep 17 2020, 9:38 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (31 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-share-safe.t (12 lines)

Diff 22694

mercurial/commands.py

narrowspec, narrowspec,
obsolete, obsolete,
obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
rcutil, rcutil,
registrar, registrar,
requirements,
revsetlang, revsetlang,
rewriteutil, rewriteutil,
scmutil, scmutil,
server, server,
shelve as shelvemod, shelve as shelvemod,
state as statemod, state as statemod,
streamclone, streamclone,
tags as tagsmod, tags as tagsmod,
ui as uimod, ui as uimod,
util, util,
verify as verifymod, verify as verifymod,
vfs as vfsmod,
wireprotoserver, wireprotoserver,
) )
from .utils import ( from .utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
table = {} table = {}
@command( @command(
b'config|showconfig|debugconfig', b'config|showconfig|debugconfig',
[ [
(b'u', b'untrusted', None, _(b'show untrusted configuration options')), (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
(b'e', b'edit', None, _(b'edit user config')), (b'e', b'edit', None, _(b'edit user config')),
(b'l', b'local', None, _(b'edit repository config')), (b'l', b'local', None, _(b'edit repository config')),
(
b'',
b'shared',
None,
_(b'edit shared source repository config (EXPERIMENTAL)'),
),
(b'g', b'global', None, _(b'edit global config')), (b'g', b'global', None, _(b'edit global config')),
] ]
+ formatteropts, + formatteropts,
_(b'[-u] [NAME]...'), _(b'[-u] [NAME]...'),
helpcategory=command.CATEGORY_HELP, helpcategory=command.CATEGORY_HELP,
optionalrepo=True, optionalrepo=True,
intents={INTENT_READONLY}, intents={INTENT_READONLY},
) )
Template: Template:
The following keywords are supported. See also :hg:`help templates`. The following keywords are supported. See also :hg:`help templates`.
:name: String. Config name. :name: String. Config name.
:source: String. Filename and line number where the item is defined. :source: String. Filename and line number where the item is defined.
:value: String. Config value. :value: String. Config value.
The --shared flag can be used to edit the config file of shared source
repository. It only works when you have shared using the experimental
share safe feature.
Returns 0 on success, 1 if NAME does not exist. Returns 0 on success, 1 if NAME does not exist.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
editopts = (b'edit', b'local', b'global') editopts = (b'edit', b'local', b'global', b'shared')
if any(opts.get(o) for o in editopts): if any(opts.get(o) for o in editopts):
if opts.get(b'local') and opts.get(b'global'): cmdutil.check_at_most_one_arg(opts, *editopts[1:])
raise error.Abort(_(b"can't use --local and --global together"))
if opts.get(b'local'): if opts.get(b'local'):
if not repo: if not repo:
raise error.Abort(_(b"can't use --local outside a repository")) raise error.Abort(_(b"can't use --local outside a repository"))
paths = [repo.vfs.join(b'hgrc')] paths = [repo.vfs.join(b'hgrc')]
elif opts.get(b'global'): elif opts.get(b'global'):
paths = rcutil.systemrcpath() paths = rcutil.systemrcpath()
elif opts.get(b'shared'):
if not repo.shared():
raise error.Abort(
_(b"repository is not shared; can't use --shared")
)
if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
raise error.Abort(
_(
b"share safe feature not unabled; "
b"unable to edit shared source repository config"
)
)
paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
else: else:
paths = rcutil.userrcpath() paths = rcutil.userrcpath()
for f in paths: for f in paths:
if os.path.exists(f): if os.path.exists(f):
break break
else: else:
if opts.get(b'global'): if opts.get(b'global'):

tests/test-completion.t

bisect: reset, good, bad, skip, extend, command, noupdate bisect: reset, good, bad, skip, extend, command, noupdate
bookmarks: force, rev, delete, rename, inactive, list, template bookmarks: force, rev, delete, rename, inactive, list, template
branch: force, clean, rev branch: force, clean, rev
branches: active, closed, rev, template branches: active, closed, rev, template
bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
cat: output, rev, decode, include, exclude, template cat: output, rev, decode, include, exclude, template
clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure
commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos
config: untrusted, edit, local, global, template config: untrusted, edit, local, shared, global, template
continue: dry-run continue: dry-run
copy: forget, after, at-rev, force, include, exclude, dry-run copy: forget, after, at-rev, force, include, exclude, dry-run
debugancestor: debugancestor:
debugantivirusrunning: debugantivirusrunning:
debugapplystreamclonebundle: debugapplystreamclonebundle:
debugbackupbundle: recover, patch, git, limit, no-merges, stat, graph, style, template debugbackupbundle: recover, patch, git, limit, no-merges, stat, graph, style, template
debugbuilddag: mergeable-file, overwritten-file, new-file debugbuilddag: mergeable-file, overwritten-file, new-file
debugbundle: all, part-type, spec debugbundle: all, part-type, spec

tests/test-share-safe.t

revlogv1 revlogv1
sparserevlog sparserevlog
store store
$ echo a > a $ echo a > a
$ hg ci -Aqm "added a" $ hg ci -Aqm "added a"
$ echo b > b $ echo b > b
$ hg ci -Aqm "added b" $ hg ci -Aqm "added b"
$ HGEDITOR=cat hg config --shared
abort: repository is not shared; can't use --shared
[255]
$ cd .. $ cd ..
Create a shared repo and check the requirements are shared and read correctly Create a shared repo and check the requirements are shared and read correctly
$ hg share source shared1 $ hg share source shared1
updating working directory updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd shared1 $ cd shared1
$ cat .hg/requires $ cat .hg/requires
However, local .hg/hgrc should override the config set by share source However, local .hg/hgrc should override the config set by share source
$ echo "[ui]" >> .hg/hgrc $ echo "[ui]" >> .hg/hgrc
$ echo "curses=false" >> .hg/hgrc $ echo "curses=false" >> .hg/hgrc
$ hg showconfig ui.curses $ hg showconfig ui.curses
false false
$ HGEDITOR=cat hg config --shared
[ui]
curses=true
$ HGEDITOR=cat hg config --local
[ui]
curses=false
Testing that hooks set in source repository also runs in shared repo Testing that hooks set in source repository also runs in shared repo
$ cd ../source $ cd ../source
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [extensions] > [extensions]
> hooklib= > hooklib=
> [hooks] > [hooks]
> pretxnchangegroup.reject_merge_commits = \ > pretxnchangegroup.reject_merge_commits = \