Page MenuHomePhabricator

Remove includeconf nested scope
ClosedPublic

Authored by deadalnix on Apr 30 2020, 12:22.

Details

Summary

Easier to review ignoring whitespace

Suggestion from John Newbery <john@johnnewbery.com> in
https://github.com/bitcoin/bitcoin/pull/15934#discussion_r343806860

This is a partial backport of Core PR15934 : https://github.com/bitcoin/bitcoin/pull/15934/commits/e2e37cfe8af088bd8ea884be2f79f0f3cac555d5

Test Plan
ninja all check

Diff Detail

Repository
rABC Bitcoin ABC
Branch
pr15934-4
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 10502
Build 18822: Default Diff Build & Tests
Build 18821: arc lint + arc unit

Event Timeline

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

Snippet of first build failure:

[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  77% (60/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  79% (61/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  80% (62/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  81% (63/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  83% (64/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  84% (65/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  85% (66/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  87% (67/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  88% (68/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  89% (69/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  90% (70/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  92% (71/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  93% (72/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  94% (73/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  96% (74/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  97% (75/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects:  98% (76/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects: 100% (77/77)        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Compressing objects: 100% (77/77), done.        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] remote: Total 77 (delta 65), reused 0 (delta 0), pack-reused 0        
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287] From ssh://reviews.bitcoinabc.org:2221/source/bitcoin-abc-staging
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/diff/19287 -> phabricator/diff/19287
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19269 -> phabricator/base/19269
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19270 -> phabricator/base/19270
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19271 -> phabricator/base/19271
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19277 -> phabricator/base/19277
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19281 -> phabricator/base/19281
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19285 -> phabricator/base/19285
[12:23:27]i:				 [/usr/bin/git -c credential.helper= fetch --progress origin +refs/tags/phabricator/diff/19287:refs/tags/phabricator/diff/19287]  * [new tag]             phabricator/base/19287 -> phabricator/base/19287
[12:23:27] :			 [Update git mirror (/home/teamcity/buildAgent/system/git/git-48AA3180.git)] /usr/bin/git log -n1 --pretty=format:%H%x20%s ee5761b698ee0c0ea8ecabe52aae638289cb6879 --
[12:23:27] :			 [Update git mirror (/home/teamcity/buildAgent/system/git/git-48AA3180.git)] /usr/bin/git pack-refs --all
[12:23:27] :		 [VCS Root: Bitcoin ABC Staging] Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] The .git directory is missing in '/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc'. Running 'git init'...
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git init
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git config lfs.storage /home/teamcity/buildAgent/system/git/git-48AA3180.git/lfs
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git config core.sparseCheckout true
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git config http.sslCAInfo
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git show-ref
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git show-ref refs/tags/phabricator/diff/19287
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git log -n1 --pretty=format:%H%x20%s ee5761b698ee0c0ea8ecabe52aae638289cb6879 --
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git -c credential.helper= checkout -q -f phabricator/diff/19287
[12:23:27] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git show-ref refs/tags/phabricator/diff/19287
[12:23:28] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] Cleaning Bitcoin ABC Staging in /home/teamcity/buildAgent/work/jailed-build/bitcoin-abc the file set ALL_UNTRACKED
[12:23:28] :			 [Update checkout directory (/home/teamcity/buildAgent/work/jailed-build/bitcoin-abc)] /usr/bin/git clean -f -d -x
[12:23:28] : Build preparation done
[12:23:28]E: Step 1/2: Command Line (9m:57s)
[12:23:28] :	 [Step 1/2] Ant JUnit report watcher
[12:23:28] :		 [Ant JUnit report watcher] Watching paths:
[12:23:28] :		 [Ant JUnit report watcher] +:results/test_bitcoin.xml
[12:23:28] :		 [Ant JUnit report watcher] +:results/**/junit_results*.xml
[12:23:28] :	 [Step 1/2] Starting: /home/teamcity/buildAgent/temp/agentTmp/custom_script9089422671033346703
[12:23:28] :	 [Step 1/2] in directory: /home/teamcity/buildAgent/work/jailed-build
[12:23:28] :	 [Step 1/2] ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[12:23:28] :	 [Step 1/2] ~/buildAgent/work/jailed-build
[12:23:28] :	 [Step 1/2] Building base image for: ee5761b69...
[12:23:28] :	 [Step 1/2] ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[12:23:28] :	 [Step 1/2] ~/buildAgent/work/jailed-build
[12:23:28] :	 [Step 1/2] Tag name: abc-base-image-ee5761b69
[12:33:24]W:	 [Step 1/2] Process exited with code 1
[12:33:24]E:	 [Step 1/2] Process exited with code 1 (Step: Command Line)
This revision is now accepted and ready to land.Apr 30 2020, 15:30
This revision was landed with ongoing or failed builds.Apr 30 2020, 15:51
This revision was automatically updated to reflect the committed changes.