Page MenuHomePhabricator
Differential D3035

New -includeconf argument for including external configuration files
ClosedPublic
Actions

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

Details

Reviewers
deadalnix
markblundeberg
Group Reviewers
Restricted Project
Maniphest Tasks
T541: Backport Core PR10267 to support includeconf
Commits
rSTAGING4c2024cfdb6a: New -includeconf argument for including external configuration files
rABC4c2024cfdb6a: New -includeconf argument for including external configuration files
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 Passed
Unit
No Test Coverage
Build Status
Buildable 5867
Build 9794: Bitcoin ABC Buildbot (legacy)
Build 9793: arc lint + arc unit

Event Timeline

Fabien created this revision.May 13 2019, 14:01
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 13 2019, 14:01
Herald added a reviewer: deadalnix. · View Herald Transcript
teamcity added a comment.May 13 2019, 14:02

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster completed remote builds in B5831: Diff 8631.May 13 2019, 14:16
teamcity added a comment.May 13 2019, 14:16

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

markblundeberg added a subscriber: markblundeberg.May 13 2019, 14:34

Which one should we do? ( D3026 ) 😂

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

You were first to submit, you get the priority

markblundeberg added a comment.May 13 2019, 14:43

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.May 13 2019, 14:53
Fabien updated this revision to Diff 8632.May 13 2019, 14:54

Update help ordering and add missing newline in release notes.

teamcity added a comment.May 13 2019, 14:55

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Fabien edited the summary of this revision. (Show Details)May 13 2019, 14:55
markblundeberg accepted this revision.May 13 2019, 14:58
This revision is now accepted and ready to land.May 13 2019, 14:58
teamcity added a comment.May 13 2019, 15:09

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5832: Diff 8632.May 13 2019, 15:09
Fabien mentioned this in D3026: Merge #10267: New -includeconf argument for including external configuration files.May 14 2019, 11:53
Fabien updated this revision to Diff 8685.May 16 2019, 07:25

Rebase

teamcity added a comment.May 16 2019, 07:25

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.May 16 2019, 07:40

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5867: Diff 8685.May 16 2019, 07:40
markblundeberg accepted this revision.May 16 2019, 13:13

OK :)

markblundeberg added a task: T541: Backport Core PR10267 to support includeconf.May 20 2019, 18:04
Fabien updated this revision to Diff 8773.May 21 2019, 09:24

Rebase

teamcity added a comment.May 21 2019, 09:25

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.May 21 2019, 09:40

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5922: Diff 8773.May 21 2019, 09:40
Closed by commit rABC4c2024cfdb6a: New -includeconf argument for including external configuration files (authored by Karl-Johan Alm <karljohan-alm@garage.co.jp>, committed by Fabien). · Explain WhyMay 21 2019, 10:18
This revision was automatically updated to reflect the committed changes.
Fabien added a commit: rSTAGING4c2024cfdb6a: New -includeconf argument for including external configuration files.Sep 18 2019, 23:38
jasonbcox mentioned this in D4965: Merge #13126: util: Add Clang thread safety annotations for variables guarded by cs_args.Jan 16 2020, 23:25

Revision Contents
Changeset List

PathSize
doc/
8 lines
src/
2 lines
2 lines
4 lines
interfaces/
2 lines
4 lines
qt/
2 lines
2 lines
49 lines
test/
functional/
86 lines
4 lines

Diff 8685

View Options

doc/release-notes.md

Loading...
View Options

src/bitcoin-cli.cpp

Loading...
View Options

src/bitcoind.cpp

Loading...
View Options

src/init.cpp

Loading...
View Options

src/interfaces/node.h

Loading...
View Options

src/interfaces/node.cpp

Loading...
View Options

src/qt/bitcoin.cpp

Loading...
View Options

src/util.h

Loading...
View Options

src/util.cpp

Loading...
View Options

test/functional/feature_includeconf.py

Loading...
View Options

test/functional/timing.json

Loading...