| marmoute |
| hg-reviewers |
Previous patches add a safe mode for sharing repositories which involve sharing
of source requirements and config files.
In certain situations we might need to add a config to source repository which
we does not want to share. For this, we add a .hg/hgrc-not-shared which won't
be shared.
This also adds a --non-shared flag to hg config command to see the
non-shared config.
| No Linters Available |
| No Unit Test Coverage |
Request changes because of my inline question on the conditional.
Extra question: Do we need a "non-shared" option on hg config to edit the new file ?
| mercurial/localrepo.py | ||
|---|---|---|
| 725 | Why this limitation ? Can't a share have this file too ? | |
In D8673#130735, @marmoute wrote:Request changes because of my inline question on the conditional.
Extra question: Do we need a "non-shared" option on hg config to edit the new file ?
Seems like yes. We will need one. Adding a patch for that too.
| mercurial/localrepo.py | ||
|---|---|---|
| 725 | It can have. Fixing in next version. | |
Before approving this, I'd like to have a quick conversation about the file name and documentation.
Do we think we'd be better off having the new config begin with hgrc so all the config files are in proximity in sorted file lists?
What are your plans to document this feature? We definitely want the semantics of this file to be documented in at least hg help hgrc.
In D8673#135473, @indygreg wrote:Before approving this, I'd like to have a quick conversation about the file name and documentation.
Do we think we'd be better off having the new config begin with hgrc so all the config files are in proximity in sorted file lists?
Yes, sounds like a nice idea. hgrc-non-shared sounds like good name.
What are your plans to document this feature? We definitely want the semantics of this file to be documented in at least hg help hgrc.
I definitely want to document it. Unfortunately missed it. Will update the patch to do so.
looks good, but please follow up with a patch for hg help hgrc and other location where standard config path might be setup.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (5 lines) | |||
| M | mercurial/localrepo.py (14 lines) | |||
| M | tests/test-completion.t (2 lines) | |||
| M | tests/test-share-safe.t (19 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 7dc042d436b5 | 056403a8986d | Pulkit Goyal | Jul 1 2020, 5:44 AM |
| @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 share source config (EXPERIMENTAL)')), | (b'', b'shared', None, _(b'edit share source config (EXPERIMENTAL)')), | ||||
| (b'', b'non-shared', None, _(b'edit non shared 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}, | ||||
| ) | ) | ||||
| repository. It only works when you have shared using the experimental safe | repository. It only works when you have shared using the experimental safe | ||||
| method. | method. | ||||
| 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', b'shared') | editopts = (b'edit', b'local', b'global', b'shared', b'non_shared') | ||||
| if any(opts.get(o) for o in editopts): | if any(opts.get(o) for o in editopts): | ||||
| cmdutil.check_at_most_one_arg(opts, *editopts[1:]) | cmdutil.check_at_most_one_arg(opts, *editopts[1:]) | ||||
| 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'): | elif opts.get(b'shared'): | ||||
| if not repo.shared(): | if not repo.shared(): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"repository is not shared one, can't use --shared") | _(b"repository is not shared one, can't use --shared") | ||||
| ) | ) | ||||
| if requirements.SHARESAFE_REQUIREMENT not in repo.requirements: | if requirements.SHARESAFE_REQUIREMENT not in repo.requirements: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"this does not support editing share source config") | _(b"this does not support editing share source config") | ||||
| ) | ) | ||||
| paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')] | paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')] | ||||
| elif opts.get(b'non_shared'): | |||||
| paths = [repo.vfs.join(b'nonsharedrc')] | |||||
| 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'): | ||||
| 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, shared, global, template | config: untrusted, edit, local, shared, non-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 | ||||
| $ cd ../shared1 | $ cd ../shared1 | ||||
| $ hg log -r . | $ hg log -r . | ||||
| changeset: 2:155349b645be | changeset: 2:155349b645be | ||||
| tag: tip | tag: tip | ||||
| user: test | user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: added c | summary: added c | ||||
| Testing that nonsharedrc is loaded for source and not shared | |||||
| $ cd ../source | |||||
| $ touch .hg/nonsharedrc | |||||
| $ echo "[ui]" >> .hg/nonsharedrc | |||||
| $ echo "traceback=true" >> .hg/nonsharedrc | |||||
| $ hg showconfig ui.traceback | |||||
| true | |||||
| $ HGEDITOR=cat hg config --non-shared | |||||
| [ui] | |||||
| traceback=true | |||||
| $ cd ../shared1 | |||||
| $ hg showconfig ui.traceback | |||||
| [1] | |||||
| Unsharing works | Unsharing works | ||||
| $ hg unshare | $ hg unshare | ||||
| Test that source config is added to the shared one after unshare, and the config | Test that source config is added to the shared one after unshare, and the config | ||||
| of current repo is still respected over the config which came from source config | of current repo is still respected over the config which came from source config | ||||
| $ cd ../cloned | $ cd ../cloned | ||||
| $ hg push ../shared1 | $ hg push ../shared1 | ||||
Why this limitation ? Can't a share have this file too ?