This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8673

config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode
ClosedPublic

Authored by pulkit on Jul 1 2020, 6:01 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG88a47cbf063c: config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode
Summary

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.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Jul 1 2020, 6:01 AM
pulkit updated this revision to Diff 21755.Jul 2 2020, 7:17 AM
marmoute requested changes to this revision.Jul 15 2020, 2:14 PM
marmoute added a subscriber: marmoute.

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
733

Why this limitation ? Can't a share have this file too ?

This revision now requires changes to proceed.Jul 15 2020, 2:14 PM
pulkit added a comment.Jul 17 2020, 6:08 AM
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
733

It can have. Fixing in next version.

pulkit edited the summary of this revision. (Show Details)Jul 20 2020, 8:16 AM
pulkit updated this revision to Diff 21980.
marmoute accepted this revision.Jul 20 2020, 1:23 PM
pulkit updated this revision to Diff 22003.Jul 21 2020, 9:43 AM
pulkit updated this revision to Diff 22072.Jul 23 2020, 10:54 AM
pulkit updated this revision to Diff 22224.Aug 3 2020, 9:14 AM
pulkit updated this revision to Diff 22385.Aug 10 2020, 11:29 AM
pulkit updated this revision to Diff 22400.Aug 11 2020, 5:07 AM
pulkit updated this revision to Diff 22446.Aug 25 2020, 7:40 AM
pulkit updated this revision to Diff 22452.Aug 26 2020, 6:06 AM
pulkit updated this revision to Diff 22657.Sep 16 2020, 7:56 AM
indygreg added a subscriber: indygreg.Sep 17 2020, 10:03 PM

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.

pulkit added a comment.Sep 18 2020, 9:18 AM
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.

pulkit edited parent revisions, added: D9047: dispatch: load shared source repository config in share-safe mode; removed: D8660: upgrade: support running upgrade if repository has share-safe requirement.Sep 18 2020, 10:41 AM
pulkit retitled this revision from config: add a .hg/nonsharedrc which won't be shared in share-safe mode to config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode.
pulkit edited the summary of this revision. (Show Details)
pulkit updated this revision to Diff 22721.
pulkit updated this revision to Diff 22774.Sep 23 2020, 3:22 AM
pulkit updated this revision to Diff 23060.Oct 6 2020, 9:50 AM
pulkit updated this revision to Diff 23257.Oct 16 2020, 4:02 AM
marmoute accepted this revision.Oct 16 2020, 6:29 AM

looks good, but please follow up with a patch for hg help hgrc and other location where standard config path might be setup.

pulkit added a commit: rHG88a47cbf063c: config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode.Oct 28 2020, 9:59 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG88a47cbf063c: config: add a .hg/hgrc-not-shared which won't be shared in share-safe mode (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (15 lines)
Mtests/test-share-safe.t (14 lines)

Diff 21745

mercurial/localrepo.py

configs from alternate files or sources. configs from alternate files or sources.
sharedvfs is vfs object pointing to source repo if the current one is a sharedvfs is vfs object pointing to source repo if the current one is a
shared one shared one
""" """
if not rcutil.use_repo_hgrc(): if not rcutil.use_repo_hgrc():
return False return False
ret = False
# first load config from shared source if we has to # first load config from shared source if we has to
if SHARESAFE_REQUIREMENT in requirements and sharedvfs: if SHARESAFE_REQUIREMENT in requirements and sharedvfs:
try: try:
ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base)
ret = True
except IOError: except IOError:
pass pass
try: try:
ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
return True ret = True
except IOError: except IOError:
return False pass
if sharedvfs is None:
marmouteUnsubmitted
Not Done

Why this limitation ? Can't a share have this file too ?

marmoute: Why this limitation ? Can't a share have this file too ?
pulkitAuthorUnsubmitted
Done

It can have. Fixing in next version.

pulkit: It can have. Fixing in next version.
try:
ui.readconfig(hgvfs.join(b'nonsharedrc'), root=wdirvfs.base)
ret = True
except IOError:
pass
return ret
def afterhgrcload(ui, wdirvfs, hgvfs, requirements): def afterhgrcload(ui, wdirvfs, hgvfs, requirements):
"""Perform additional actions after .hg/hgrc is loaded. """Perform additional actions after .hg/hgrc is loaded.
This function is called during repository loading immediately after This function is called during repository loading immediately after
the .hg/hgrc file is loaded and before per-repo extensions are loaded. the .hg/hgrc file is loaded and before per-repo extensions are loaded.

tests/test-share-safe.t

$ 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
$ cd ../shared1
$ hg showconfig ui.traceback
[1]
$ hg unshare $ hg unshare