mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
019f456fab
Summary:
The headline changes of this revision are:
- Changes the format of the config file from INI to TOML
(the `edenrc` file under `~/local/.eden` has been replaced
with `config.toml`). This revision includes logic for automatically
performing the migration when Eden is restarted.
- Inlines data from `/etc/eden/config.d` into the TOML file.
Historically, the `edenrc` file for a client would contain the
name of the "configuration alias" defined in a config file like
`~/.edenrc` or `/etc/eden/config.d/00-defaults`. When Eden
loaded a client, it would have to first read the `edenrc` and
then reconstitute the rest of the client configuration by
looking up the alias in the set of config files that were used to
create the client in the first place.
This changes things so that all of the data that was being
cross-referenced is now inlined in the client's config file.
This makes loading a config considerably simpler at the cost
of no longer being able to change the config for multiple clients
that were cloned from the same configuration alias in one place.
It was questionable whether being able to modify a client from
a foreign config after it was created was a safe thing to do, anyway.
Eliminating the need for a historic link to the configuration alias
will make it easier to support running `eden clone` on an arbitrary
local Hg or Git repo. So long as `eden clone` can extract enough
information from the local repo to create an appropriate config file
for the new Eden client, there is no need for a configuration alias
to exist a priori.
Since we were already changing the data in the config file, this
seemed like an appropriate time to make the switch from INI to
TOML, as this was something we wanted to do, anyway.
In testing, I discovered a discrepancy between how boost's
`boost::property_tree::ptree` and Python's `ConfigParser` handled
the following section heading:
```
[repository ZtmpZsillyZeden-clone.LIkh32]
```
Apparently `hasSection("repository ZtmpZsillyZeden-clone.LIkh32")`
in boost would fail to find this section. Because
[[https://stackoverflow.com/questions/13109506/are-hyphens-allowed-in-section-definitions-in-ini-files | there is no spec for INI]],
it is not that surprising that boost and `ConfigParser` do not 100% agree
on what they accept. Moving to TOML means we have a configuration
language with the following desirable properties:
- It has a formal spec, unlike INI. This is important because there are parsers
in a wide range of programming languages that, in theory, accept a consistent
input language.
- It is reasonable for humans to write, as it supports comments, unlike JSON.
- It supports nested structures, like maps and arrays, without going crazy
on the input language it supports, unlike YAML.
Eden now depends on the following third-party TOML parsers:
* C++ https://github.com/skystrife/cpptoml
* Python https://github.com/uiri/toml
This revision also changes the organization of `~/local/.eden` slightly. For now,
there is still a `config.json` file, but the values are no longer hashes of the realpath
of the mount. Instead, we take the basename of the realpath and use that as the
name of the directory under `~/local/.eden/clients`. If there is a naming collision, we
add the first available integral suffix. Using the basename makes it easier to
navigate the `~/local/.eden/clients` directory.
Although the `edenrc` file under `~/local/.eden/clients` has been switched from INI
to TOML, the other Eden config files (`~/.edenrc` and `/etc/eden/config.d/*`) still use
INI. Migrating those to TOML will be done in a future revision.
Note this revision allowed us to eliminate `facebook::eden::InterpolatedPropertyTree`
as well as a number of uses of boost due to the elimination of
`ClientConfig::loadConfigData()` in the C++ code. Because `ClientConfig`
no longer does interpolation, a bit of `ClientConfigTest` was deleted as part of
this revision because it is no longer relevant.
Reviewed By: wez
Differential Revision: D6310325
fbshipit-source-id: 2548149c064cdf8e78a3b3ce6fe667ff70f94f84
61 lines
1.2 KiB
Plaintext
61 lines
1.2 KiB
Plaintext
include_defs("//eden/DEFS")
|
|
|
|
python_binary(
|
|
name = "cli",
|
|
srcs = ["main.py"],
|
|
main_module = "eden/cli/main",
|
|
deps = [
|
|
"@/eden/cli:debug",
|
|
"@/eden/cli:lib",
|
|
"@/eden/fs/service:py-client",
|
|
],
|
|
)
|
|
|
|
python_library(
|
|
name = "lib",
|
|
srcs = [
|
|
"cmd_util.py",
|
|
"config.py",
|
|
"configinterpolator.py",
|
|
"rage.py",
|
|
"stats.py",
|
|
"stats_print.py",
|
|
"util.py",
|
|
],
|
|
external_deps = [
|
|
"toml",
|
|
],
|
|
)
|
|
|
|
python_library(
|
|
name = "debug",
|
|
srcs = [
|
|
"debug.py",
|
|
],
|
|
deps = [
|
|
":lib",
|
|
"@/eden/fs/inodes:serialization-py",
|
|
"@/eden/py:py",
|
|
],
|
|
)
|
|
|
|
python_unittest(
|
|
name = "test",
|
|
srcs = glob(["test/*.py"]),
|
|
deps = [":lib"],
|
|
)
|
|
|
|
for build_target, suffix in get_daemon_versions():
|
|
# The :all rule is a convenience to ensure that the CLI, daemon, and Thrift
|
|
# Python client for the Hg extension are built.
|
|
buck_genrule(
|
|
name = 'all%s' % suffix,
|
|
srcs = [
|
|
':cli',
|
|
build_target.replace('@/', '//'),
|
|
'//eden/fs/service:thrift-EdenService-pyremote',
|
|
],
|
|
out = 'eden%s-stamp' % suffix,
|
|
cmd = 'touch $OUT',
|
|
)
|