No description provided.
Fix typos and cleanup in various files #12593
pull rex4539 wants to merge 1 commits into bitcoin:master from rex4539:rex4539-typos changing 50 files +63 −63-
rex4539 commented at 9:42 AM on March 4, 2018: contributor
- randolf changes_requested
-
randolf commented at 4:49 PM on March 4, 2018: contributor
These are excellent edits, but I need you to do the following...
Move all the changes in
src/qt/locale/bitcoin_el_GR.tsto a separate Pull Request because this is in a different language than all the other changes (I don't know enough German to review German-language corrections).Revert change in
test/functional/p2p_fingerprint.pyback to its original "its" (line 7).Thank you.
UPDATE: Thank you for making these changes.
NOTE: The Greek (not German) Translation corrections can be found in PR #12598.
-
rex4539 commented at 4:52 PM on March 4, 2018: contributor
The translation corrections are actually Greek :)
-
rex4539 commented at 6:17 PM on March 4, 2018: contributor
I have no idea how idea how to move all the changes in src/qt/locale/bitcoin_el_GR.ts to a separate Pull Request (and then I guess remove that commit from the PR).
The commits are already squashed and googling didn't help.
If you can post the exact commands I need to paste into the command line, I would be happy to apply them.
Another solution would be to have the person who usually reviews the Greek translations review and approve.
-
randolf commented at 6:49 PM on March 4, 2018: contributor
@rex4539 Ah, Greek. Ha! Thanks for correcting me on that (I should have clued in that German's code should be "de" and not "el" -- I was thrown off by "GR").
The problem is that I can't approve something that I don't understand. I'll ask someone to take a look at this and give you some suggestions on the git commands to use. In the meantime, there's also the #github channel in irc.freenode.net which has a lot very helpful people as well (they've been a great help to me in the past).
-
dongcarl commented at 7:25 PM on March 4, 2018: member
@rex4539 on branch rex4539-typos:
git reset --soft 90a0aed51194ad82da8e011b96f9561c685e40b7 git reset HEAD src/qt/locale/bitcoin_el_GR.ts <make other changes if needed> git commit -m 'blah blah' <then force push to your own remote>It'll say that the
.tsfile is not staged for commit but that's what you want. - randolf approved
-
in src/core_write.cpp:109 in 0164906291 outdated
105 | @@ -106,7 +106,7 @@ std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDeco 106 | const unsigned char chSigHashType = vch.back(); 107 | if (mapSigHashTypes.count(chSigHashType)) { 108 | strSigHashDecode = "[" + mapSigHashTypes.find(chSigHashType)->second + "]"; 109 | - vch.pop_back(); // remove the sighash type byte. it will be replaced by the decode. 110 | + vch.pop_back(); // Remove the sighash type byte. It will be replaced by the decode.
practicalswift commented at 9:10 AM on March 5, 2018:Capitalization changes like these are unlikely to achieve consensus ACK, so please skip the changes made to this file to maximize the likelihood of merge :-)
randolf commented at 1:27 PM on March 5, 2018:While this change may appear to be purely cosmetic, I do think that it's okay since it is being included with a number of other changes and because the overall intention is to ensure greater consistency.
rex4539 commented at 6:05 PM on March 5, 2018:I didn't change this one. Let me know if you still need this changed.
practicalswift commented at 6:46 PM on March 5, 2018:I would revert this change in order to maximize the chance of merge.
rex4539 commented at 7:44 PM on March 5, 2018:Reverted.
in src/secp256k1/src/java/org/bitcoin/NativeSecp256k1Test.java:55 in 0164906291 outdated
51 | @@ -52,7 +52,7 @@ public static void testSecKeyVerifyPos() throws AssertFailException{ 52 | } 53 | 54 | /** 55 | - * This tests secret key verify() for a invalid secretkey 56 | + * This tests secret key verify() for an invalid secretkey
practicalswift commented at 9:11 AM on March 5, 2018:These changes should be reported upstream (to the
secp256k1project: https://github.com/bitcoin-core/secp256k1) . Please skip the changes made to this file.
rex4539 commented at 6:05 PM on March 5, 2018:Fixed.
in src/univalue/lib/univalue_get.cpp:38 in 0164906291 outdated
34 | @@ -35,7 +35,7 @@ bool ParseInt32(const std::string& str, int32_t *out) 35 | errno = 0; // strtol will not set errno if valid 36 | long int n = strtol(str.c_str(), &endp, 10); 37 | if(out) *out = (int32_t)n; 38 | - // Note that strtol returns a *long int*, so even if strtol doesn't report a over/underflow 39 | + // Note that strtol returns a *long int*, so even if strtol doesn't report an over/underflow
practicalswift commented at 9:12 AM on March 5, 2018:These changes should be reported upstream (to the
univalueproject: https://github.com/bitcoin-core/univalue). Please skip the changes made to this file.
rex4539 commented at 6:04 PM on March 5, 2018:Fixed.
in test/functional/wallet_basic.py:358 in 0164906291 outdated
354 | @@ -355,7 +355,7 @@ def run_test(self): 355 | for mode in [True, False]: 356 | self.nodes[0].ensure_ascii = mode 357 | # unicode check: Basic Multilingual Plane, Supplementary Plane respectively 358 | - for s in [u'рыба', u'𝅘𝅥𝅯']: 359 | + for s in [u'рыба', u'𝅘𝅥𝅯']:
practicalswift commented at 9:12 AM on March 5, 2018:Please revert this change. It looks accidental.
rex4539 commented at 6:04 PM on March 5, 2018:Hopefully fixed.
practicalswift commented at 6:45 PM on March 5, 2018:No, the change is still there. You can check it on https://github.com/bitcoin/bitcoin/pull/12593/files after pushing your latest version.
rex4539 commented at 8:12 PM on March 5, 2018:This was very weird. It's some strange character encoding that my machine somehow automatically converts when the file is opened. I did several attempts to fix it using the command line and different text editors and I think I did it...
in src/net_processing.cpp:342 in 0164906291 outdated
338 | @@ -339,7 +339,7 @@ bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const CBlockIndex* 339 | CNodeState *state = State(nodeid); 340 | assert(state != nullptr); 341 | 342 | - // Short-circuit most stuff in case its from the same node 343 | + // Short-circuit most stuff in case it's from the same node
practicalswift commented at 9:16 AM on March 5, 2018:Nit: Prefer "it is" to "it's". Applies to "its"/"it's" changes below.
randolf commented at 1:30 PM on March 5, 2018:Either "it is" or "it's" is acceptable to me. Since you prefer "it is" I support this.
practicalswift commented at 1:46 PM on March 5, 2018:I prefer "it is" since it is unambiguous. "It's" can be "it is" or "it has".
rex4539 commented at 6:04 PM on March 5, 2018:Fixed.
in src/validation.cpp:952 in 0164906291 outdated
948 | @@ -949,7 +949,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool 949 | 950 | // This transaction should only count for fee estimation if: 951 | // - it isn't a BIP 125 replacement transaction (may not be widely supported) 952 | - // - it's not being readded during a reorg which bypasses typical mempool fee limits 953 | + // - it's not being read during a reorg which bypasses typical mempool fee limits
practicalswift commented at 9:18 AM on March 5, 2018:Shouldn't this be "re-added"?
rex4539 commented at 6:04 PM on March 5, 2018:Fixed.
in src/wallet/rpcwallet.cpp:1990 in 0164906291 outdated
1986 | @@ -1987,7 +1987,7 @@ UniValue listsinceblock(const JSONRPCRequest& request) 1987 | " ],\n" 1988 | " \"removed\": [\n" 1989 | " <structure is the same as \"transactions\" above, only present if include_removed=true>\n" 1990 | - " Note: transactions that were readded in the active chain will appear as-is in this array, and may thus have a positive confirmation count.\n" 1991 | + " Note: transactions that were read in the active chain will appear as-is in this array, and may thus have a positive confirmation count.\n"
practicalswift commented at 9:18 AM on March 5, 2018:Shouldn't this be "re-added"?
rex4539 commented at 6:05 PM on March 5, 2018:Fixed.
in src/test/util_tests.cpp:757 in 0164906291 outdated
753 | @@ -754,7 +754,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory) 754 | thr.join(); 755 | BOOST_CHECK_EQUAL(threadresult, true); 756 | #ifndef WIN32 757 | - // Try to aquire lock in child process while we're holding it, this should fail. 758 | + // Try to acquire lock in child process while we're holding it, this should fail.
practicalswift commented at 9:22 AM on March 5, 2018:Already reported in #12543.
rex4539 commented at 6:07 PM on March 5, 2018:So should I revert this one or just do nothing?
practicalswift commented at 6:45 PM on March 5, 2018:Revert or rebase on top of master now that #12543 is merged.
rex4539 commented at 7:46 PM on March 5, 2018:Reverted. Not familiar with git rebase and such...
in src/test/util_tests.cpp:768 in 0164906291 outdated
764 | @@ -765,7 +765,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory) 765 | // Probing lock from our side now should succeed, but not hold on to the lock. 766 | BOOST_CHECK_EQUAL(LockDirectory(dirname, lockname, true), true); 767 | 768 | - // Try to acquire the lock in the child process, this should be succesful. 769 | + // Try to acquire the lock in the child process, this should be successful.
practicalswift commented at 9:22 AM on March 5, 2018:Already reported in #12543.
rex4539 commented at 6:07 PM on March 5, 2018:So should I revert this one or just do nothing?
practicalswift commented at 6:44 PM on March 5, 2018:Revert or rebase on top of
masternow that #12543 is merged.
rex4539 commented at 7:48 PM on March 5, 2018:Reverted. Not familiar with git rebase and such...
in test/functional/wallet_dump.py:52 in 0164906291 outdated
48 | @@ -49,7 +49,7 @@ def read_dump(file_name, addrs, script_addrs, hd_master_addr_old): 49 | # count key types 50 | for addrObj in addrs: 51 | if addrObj['address'] == addr.split(",")[0] and addrObj['hdkeypath'] == keypath and keytype == "label=": 52 | - # a labled entry in the wallet should contain both a native address 53 | + # a labeled entry in the wallet should contain both a native address
practicalswift commented at 9:23 AM on March 5, 2018:Already reported in #12543.
rex4539 commented at 6:07 PM on March 5, 2018:So should I revert this one or just do nothing?
practicalswift commented at 6:44 PM on March 5, 2018:Revert or rebase on top of
masternow that #12543 is merged.
rex4539 commented at 7:44 PM on March 5, 2018:Reverted. Not familiar with git rebase and such...
fanquake added the label Docs on Mar 5, 2018in src/test/cuckoocache_tests.cpp:166 in 0164906291 outdated
162 | @@ -163,7 +163,7 @@ void test_cache_erase(size_t megabytes) 163 | for (uint32_t i = (n_insert / 2); i < n_insert; ++i) 164 | set.insert(hashes_insert_copy[i]); 165 | 166 | - /** elements that we marked erased but that are still there */ 167 | + /** elements that we marked erased but are still there */
practicalswift commented at 3:26 PM on March 5, 2018:Nit: Also change "marked erased" to "marked as erased".
rex4539 commented at 6:09 PM on March 5, 2018:Fixed.
in src/wallet/wallet.cpp:4188 in 0164906291 outdated
4183 | @@ -4184,8 +4184,8 @@ bool CWalletTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& 4184 | // We must set fInMempool here - while it will be re-set to true by the 4185 | // entered-mempool callback, if we did not there would be a race where a 4186 | // user could call sendmoney in a loop and hit spurious out of funds errors 4187 | - // because we think that the transaction they just generated's change is 4188 | - // unavailable as we're not yet aware its in mempool. 4189 | + // because we think that the just generated transaction's change is 4190 | + // unavailable as we're not yet aware it's in mempool.
practicalswift commented at 3:29 PM on March 5, 2018:A bit unclear. Perhaps change it to "as we're not yet aware that it is in the mempool"?
rex4539 commented at 6:11 PM on March 5, 2018:Fixed.
practicalswift commented at 8:02 PM on March 5, 2018: contributorPlease revert the unrelated change in
wallet_basic.py(the Unicode check) and squash the commits into one commit.rex4539 commented at 8:20 PM on March 5, 2018: contributorCould you please post the exact command(s) I need to paste into the command line?
Not familiar at all with squashing :)
practicalswift commented at 8:22 PM on March 5, 2018: contributorSeems like you accidentally re-introduced some of the previous reverts.
Please make sure that:
- There is only be one commit listed here: https://github.com/bitcoin/bitcoin/pull/12593/commits
- There are only wanted changes listed here: https://github.com/bitcoin/bitcoin/pull/12593/files
rex4539 commented at 8:44 PM on March 5, 2018: contributorok, I think I reverted all the newly-accidental commits. All typos should be the correct ones now.
If you could just post the exact command(s) I need to paste into the command line so I could squash?
rex4539 commented at 5:12 PM on March 15, 2018: contributor@practicalswift Squashed and ready for merge :)
practicalswift commented at 10:56 PM on March 15, 2018: contributorutACK 5fe43d6e2cc4b9bc35390cd4fe9f3d318440f732
Fix typos and cleanup 7dd454222ain src/leveldb/db/version_set.cc:348 in 5fe43d6e2c outdated
344 | @@ -345,7 +345,7 @@ Status Version::Get(const ReadOptions& options, 345 | 346 | // We can search level-by-level since entries never hop across 347 | // levels. Therefore we are guaranteed that if we find data 348 | - // in an smaller level, later levels are irrelevant. 349 | + // in a smaller level, later levels are irrelevant.
MarcoFalke commented at 9:02 PM on March 17, 2018:Please submit those upstream
rex4539 closed this on Mar 18, 2018MarcoFalke referenced this in commit 4ad3b3c72c on Mar 21, 2018PastaPastaPasta referenced this in commit 2da7e1f032 on Jun 9, 2020PastaPastaPasta referenced this in commit 8d37681a49 on Jun 9, 2020PastaPastaPasta referenced this in commit 28d54440f7 on Jun 10, 2020PastaPastaPasta referenced this in commit 88486d27ba on Jun 10, 2020PastaPastaPasta referenced this in commit e30560588a on Jun 11, 2020PastaPastaPasta referenced this in commit 262600e691 on Jun 11, 2020PastaPastaPasta referenced this in commit 1921f98f9e on Jun 11, 2020PastaPastaPasta referenced this in commit bb035972ee on Jun 12, 2020gades referenced this in commit 9fc4a91b63 on Jun 30, 2021MarcoFalke locked this on Sep 8, 2021ContributorsLabels
github-metadata-mirror
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-16 18:15 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me