Page MenuHomePhabricator

New -includeconf argument for including external configuration files
AcceptedPublic

Authored by Fabien on Mon, May 13, 14:01.

Details

Reviewers
deadalnix
markblundeberg
Group Reviewers
Restricted Project
Summary
  • adds -includeconf=<path>, where <path> is relative to datadir or to

the path of the file being read, if in a file

  • protects against circular includes
  • updates help docs

Backport of core PR10267
https://github.com/bitcoin/bitcoin/pull/10267/files

Includes a fix from PR13126
https://github.com/bitcoin/bitcoin/pull/10267#issuecomment-388580967

Completes T541
Progresses towards T652

Test Plan
make check
./test/functional/test_runner.py feature_includeconf

Diff Detail

Repository
rABC Bitcoin ABC
Branch
PR10267
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 5867
Build 9794: Bitcoin ABC Teamcity Staging
Build 9793: arc lint + arc unit

Event Timeline

Fabien created this revision.Mon, May 13, 14:01
Herald added a reviewer: Restricted Project. Β· View Herald TranscriptMon, May 13, 14:01
Herald added a reviewer: deadalnix. Β· View Herald Transcript

Which one should we do? ( D3026 ) πŸ˜‚

Fabien abandoned this revision.Mon, May 13, 14:38

You were first to submit, you get the priority

Ah I see the extra clause is the fix you mention.

doc/release-notes.md
7 β†—(On Diff #8631)

I like your release notes more than mine :)

src/init.cpp
391 β†—(On Diff #8631)

should alphabetically sort after -finalizationdelay

src/util.cpp
818 β†—(On Diff #8631)

hmm mine lacks this clause

test/functional/timing.json
108 β†—(On Diff #8631)

Interesting, didn't know about this file!

Fabien reclaimed this revision.Mon, May 13, 14:53
Fabien updated this revision to Diff 8632.Mon, May 13, 14:54

Update help ordering and add missing newline in release notes.

Fabien edited the summary of this revision. (Show Details)Mon, May 13, 14:55
markblundeberg accepted this revision.Mon, May 13, 14:58
This revision is now accepted and ready to land.Mon, May 13, 14:58
Fabien updated this revision to Diff 8685.Thu, May 16, 07:25

Rebase