Update univalue subtree #14164

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:Mf1809-univalueSubtree changing 6 files +27 −104

MarcoFalke commented at 12:23 PM on September 7, 2018: member

This removes the deprecated std::pair wrappers from univalue, so that they are not accidentally re-introduced in our code base.

Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6

7890db99d6 Merge #11: Remove deprecated std pair wrappers
40e34852ac Merge #14: Cleaned up namespace imports to reduce symbol collisions
85052a4819 Remove deprecated std::pair wrappers
d208f986dd Cleaned up namespace imports to reduce symbol collisions

git-subtree-dir: src/univalue
git-subtree-split: 7890db99d693572d27ade3e14268bd7236134529

dc287c98f8

Update univalue subtree faad55a9a2
MarcoFalke added the label Utils/log/libs on Sep 7, 2018
MarcoFalke added the label Build system on Sep 7, 2018
MarcoFalke removed the label Build system on Sep 7, 2018

fanquake commented at 1:02 PM on September 7, 2018: member

utACK https://github.com/bitcoin/bitcoin/pull/14164/commits/faad55a9a24601aac47b5e3bc44827ddb41d8f93

Ran make check and tested the subtree merge.

merge 14164
[pull/14164/local-merge a83101646] Merge [#14164](/bitcoin-bitcoin/14164/): Update univalue subtree
 Date: Fri Sep 7 20:55:42 2018 +0800
[#14164](/bitcoin-bitcoin/14164/) Update univalue subtree into master
* faad55a9a Update univalue subtree (MarcoFalke) (pull/14164/head)
* dc287c98f Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6 (MarcoFalke)

Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.
bash-3.2$ git fetch https://github.com/bitcoin-core/univalue.git
warning: no common commits
remote: Counting objects: 604, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 604 (delta 0), reused 1 (delta 0), pack-reused 602
Receiving objects: 100% (604/604), 125.21 KiB | 265.00 KiB/s, done.
Resolving deltas: 100% (332/332), done.
From https://github.com/bitcoin-core/univalue
 * branch                HEAD       -> FETCH_HEAD
bash-3.2$ ./test/lint/git-subtree-check.sh src/univalue
src/univalue in HEAD currently refers to tree e73765406fc0a0fb4796504ea08a2e05cfea8bc0
src/univalue in HEAD was last updated in commit dc287c98f8b33576f3c71db02a232106ef0e57d9 (tree e73765406fc0a0fb4796504ea08a2e05cfea8bc0)
src/univalue in HEAD was last updated to upstream commit 7890db99d693572d27ade3e14268bd7236134529 (tree e73765406fc0a0fb4796504ea08a2e05cfea8bc0)
GOOD

jnewbery commented at 1:51 PM on September 7, 2018: member

tACK faad55a9a24601aac47b5e3bc44827ddb41d8f93
DrahtBot commented at 4:04 PM on September 7, 2018: member
Note to reviewers: This pull request conflicts with the following ones:
- #12435 (RPC: Strict JSON-RPC 2.0 compliance (gated behind flag) by esotericnonsense)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
promag commented at 10:53 PM on September 9, 2018: member

utACK faad55a.
luke-jr changes_requested
luke-jr commented at 10:59 PM on September 9, 2018: member

NACK, upstream is 88967f658663654a67f1cda93ca6f99de1f7c91f

Referenced 7890db99d693572d27ade3e14268bd7236134529 does not exist upstream
promag commented at 11:23 PM on September 9, 2018: member

@luke-jr upstream is now https://github.com/bitcoin-core/univalue/commit/7890db99d693572d27ade3e14268bd7236134529?

https://github.com/bitcoin/bitcoin/blame/master/doc/developer-notes.md#L711-L712 should be updated.
luke-jr commented at 11:30 PM on September 9, 2018: member

Upstream is jgarzik/univalue

bitcoin-core/univalue should not exist. There is no rationale for deviating from upstream, and if anything, we should be working toward removing the subtree entirely and just using the system install.
ken2812221 commented at 1:40 AM on September 10, 2018: contributor

utACK faad55a. @luke-jr At least, it's a fork for now.
luke-jr commented at 3:45 AM on September 10, 2018: member

There's no reason for it, so NACK making it so...
jnewbery commented at 2:30 PM on September 10, 2018: member

Upstream has been bitcoin-core/univalue since at least #8807.

This PR doesn't change what the upstream branch is, so discussion of that seems off-topic for me.

ACK faad55a9a24601aac47b5e3bc44827ddb41d8f93
MarcoFalke referenced this in commit 793d2b7430 on Sep 10, 2018
MarcoFalke merged this on Sep 10, 2018
MarcoFalke closed this on Sep 10, 2018
MarcoFalke deleted the branch on Sep 10, 2018
MarcoFalke referenced this in commit 4987cdd16d on Dec 6, 2018
jasonbcox referenced this in commit 55441ec79b on Sep 13, 2019
PastaPastaPasta referenced this in commit d45118cda9 on Jun 27, 2021
PastaPastaPasta referenced this in commit c004d97ec3 on Jun 28, 2021
PastaPastaPasta referenced this in commit 94c21bf890 on Jun 29, 2021
PastaPastaPasta referenced this in commit 0aafa74228 on Jul 1, 2021
PastaPastaPasta referenced this in commit 4bb42c5c07 on Jul 1, 2021
PastaPastaPasta referenced this in commit db0cc20f55 on Jul 1, 2021
Munkybooty referenced this in commit f598cd4233 on Jul 1, 2021
Munkybooty referenced this in commit 45608e4052 on Jul 2, 2021
Munkybooty referenced this in commit a9e3dd18b0 on Jul 2, 2021
Munkybooty referenced this in commit 4de6c16291 on Jul 3, 2021
UdjinM6 referenced this in commit 9836944088 on Jul 3, 2021
Munkybooty referenced this in commit 5759da8e64 on Jul 3, 2021
UdjinM6 referenced this in commit e116d82e61 on Jul 3, 2021
UdjinM6 referenced this in commit 4862d9c864 on Jul 5, 2021
Munkybooty referenced this in commit 9deb90e526 on Jul 7, 2021
PastaPastaPasta referenced this in commit 752797b6bf on Jul 8, 2021
Munkybooty referenced this in commit 6add739ab1 on Jul 8, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#14882 [doc] developer-notes.md: point out that UniValue deviates from upstream