Update univalue subtree by maflcko · Pull Request #14164 · bitcoin/bitcoin

maflcko · 2018-09-07T12:23:30Z

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

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

fanquake · 2018-09-07T13:02:26Z

utACK faad55a

Ran make check and tested the subtree merge.

merge 14164
[pull/14164/local-merge a83101646] Merge #14164: Update univalue subtree
 Date: Fri Sep 7 20:55:42 2018 +0800
#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 · 2018-09-07T13:51:21Z

tACK faad55a

DrahtBot · 2018-09-07T16:04:28Z

Note to reviewers: This pull request conflicts with the following ones:

RPC: Strict JSON-RPC 2.0 compliance (gated behind flag) #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 · 2018-09-09T22:53:41Z

utACK faad55a.

luke-jr

NACK, upstream is 88967f658663654a67f1cda93ca6f99de1f7c91f

Referenced 7890db99d693572d27ade3e14268bd7236134529 does not exist upstream

promag · 2018-09-09T23:23:29Z

@luke-jr upstream is now bitcoin-core/univalue-subtree@7890db9?

https://github.com/bitcoin/bitcoin/blame/master/doc/developer-notes.md#L711-L712 should be updated.

luke-jr · 2018-09-09T23:30:22Z

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 · 2018-09-10T01:40:40Z

utACK faad55a.

@luke-jr At least, it's a fork for now.

luke-jr · 2018-09-10T03:45:55Z

There's no reason for it, so NACK making it so...

jnewbery · 2018-09-10T14:30:13Z

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 faad55a

dc287c9 Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6 (MarcoFalke) Pull request description: This removes the deprecated `std::pair` wrappers from univalue, so that they are not accidentally re-introduced in our code base. Tree-SHA512: 46f6f7c7c7942a9e131d971c425cbde4159abcc1214235b61139ce97b174024e47b9c52e832cde89fbab9879f43d12c26b64d6def9907bd47883f1e574cf2e2e

…tes from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in #7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63

Summary: This removes the deprecated `std::pair` wrappers from univalue, so that they are not accidentally re-introduced in our code base. Backport of Bitcoin Core PR14164 bitcoin/bitcoin#14164 Test Plan: ``` make check ``` Reviewers: Fabien, #bitcoin_abc, deadalnix Reviewed By: Fabien, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D4007

…e deviates from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63

dc287c9 Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6 (MarcoFalke) Pull request description: This removes the deprecated `std::pair` wrappers from univalue, so that they are not accidentally re-introduced in our code base. Tree-SHA512: 46f6f7c7c7942a9e131d971c425cbde4159abcc1214235b61139ce97b174024e47b9c52e832cde89fbab9879f43d12c26b64d6def9907bd47883f1e574cf2e2e

…e deviates from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63

dc287c9 Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6 (MarcoFalke) Pull request description: This removes the deprecated `std::pair` wrappers from univalue, so that they are not accidentally re-introduced in our code base. Tree-SHA512: 46f6f7c7c7942a9e131d971c425cbde4159abcc1214235b61139ce97b174024e47b9c52e832cde89fbab9879f43d12c26b64d6def9907bd47883f1e574cf2e2e

…e deviates from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63

MarcoFalke added 2 commits September 7, 2018 08:20

Update univalue subtree

faad55a

maflcko added Utils/log/libs Build system and removed Build system labels Sep 7, 2018

luke-jr suggested changes Sep 9, 2018

View reviewed changes

maflcko merged commit faad55a into bitcoin:master Sep 10, 2018

maflcko deleted the Mf1809-univalueSubtree branch September 10, 2018 15:03

Bushstar mentioned this pull request Oct 11, 2018

Updates from bitcoin/master FeatherCoin/Feathercoin#366

Merged

Sjors mentioned this pull request Dec 6, 2018

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

Merged

jnewbery mentioned this pull request Dec 20, 2018

Bitcoin Core should not have a fork of univalue #15009

Closed

sickpig mentioned this pull request Jan 29, 2019

Use UniValue.pushKV rather than push_back(Pair()) BitcoinUnlimited/BitcoinUnlimited#1577

Merged

maflcko mentioned this pull request Oct 30, 2019

Update univalue subtree #17324

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update univalue subtree#14164

Update univalue subtree#14164
maflcko merged 2 commits intobitcoin:masterfrom
maflcko:Mf1809-univalueSubtree

maflcko commented Sep 7, 2018

Uh oh!

fanquake commented Sep 7, 2018

Uh oh!

jnewbery commented Sep 7, 2018

Uh oh!

DrahtBot commented Sep 7, 2018

Uh oh!

promag commented Sep 9, 2018

Uh oh!

luke-jr left a comment

Uh oh!

promag commented Sep 9, 2018

Uh oh!

luke-jr commented Sep 9, 2018

Uh oh!

ken2812221 commented Sep 10, 2018

Uh oh!

luke-jr commented Sep 10, 2018

Uh oh!

jnewbery commented Sep 10, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

maflcko commented Sep 7, 2018

Uh oh!

fanquake commented Sep 7, 2018

Uh oh!

jnewbery commented Sep 7, 2018

Uh oh!

DrahtBot commented Sep 7, 2018

Uh oh!

promag commented Sep 9, 2018

Uh oh!

luke-jr left a comment

Choose a reason for hiding this comment

Uh oh!

promag commented Sep 9, 2018

Uh oh!

luke-jr commented Sep 9, 2018

Uh oh!

ken2812221 commented Sep 10, 2018

Uh oh!

luke-jr commented Sep 10, 2018

Uh oh!

jnewbery commented Sep 10, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants