--version flag behavior in bitcoind and bitcoin-wallet to have the same behavior.--version flag to bitcoin-tx to match.mitigates problem with issue #20412
Just noticed the failing checks. On mobile, not sure how to mark as in progress, will investigate.
Thank you! Need to test this but changes look good to me at first sight.
Implementing -version consistency across the tools makes sense too.
Travis failure is boring (due to trailing whitespace)
This diff appears to have added new lines with trailing whitespace.
The following changes were suspected:
diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh
@@ -20,0 +21,15 @@ BITCOINQT=${BITCOINQT:-$BINDIR/qt/bitcoin-qt}
+then
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -100,6 +101,9 @@ static int AppInitRawTx(int argc, char* argv[])
+
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
@@ -45,10 +46,12 @@ static bool WalletAppInit(int argc, char* argv[])
+ "Usage:\n"
^---- failure generated from test/lint/lint-whitespace.sh
62 | - } else { 63 | - strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n"; 64 | - strUsage += "\n" + args.GetHelpMessage(); 65 | + if (!args.IsArgSet("-version")) { 66 | + strUsage += FormatParagraph(LicenseInfo()) + "\n" 67 | + "\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n"
nit: whitespace issue on lint
fixed linting issues, we should be good to go now. thanks!
Concept NACK. No reason manpages shouldn't generate for any given checkout...
Maybe making sure the binaries match the current git describe would be okay.
Perhaps CI checks?
@luke-jr ci checks would be good.
How does everyone feel about a warning/notification echoed out instead of returning early?
The warning to prevent accidental check-ins + the CI checks should get the desired effect while allowing man page generation at any point.
A warning sounds fine to me too.
@luke-jr The problem is accidentally checking in manual pages with a -dirty tag. This happened to me a few times and more times almost.
This is why I'd like this behavior in. These scripts are part of our release process and should assist our release process by preventing common mistakes.
(I mean, the non-determinism implied by generating the pages from a state of the tree that was never checked in in the first place, isn't that wrong by default?)
CI checks are way too late. And I don't really want to do anything complicated with git check-in hooks either. This script seems to be the best place to ensure it.
But sure, I'm okay with adding a way to bypass the check if you really want to. For say, testing the script it could make sense.
Adjusted version flag behavior in bitcoin-tx, bitcoin-wallet, and
bitcoind to match. Added functionality in gen-manpages.sh to warning when
attempting to generate man pages for binaries built from a dirty
branch.
updated to warn instead of outright fail, which should solve some of the problem in the original issue while still providing flexibility, should one want to generate man pages for bins built from a dirty branch.
Tested ACK 6690adba08006739da0060eb4937126bdfa1181a
$ BUILDDIR="$PWD/build" contrib/devtools/gen-manpages.sh
$ cd build
$ make -j4
…
$ cd ..
$ BUILDDIR="$PWD/build" contrib/devtools/gen-manpages.sh
WARNING: the following binaries were built from a dirty tree:
/…/bitcoin/build/src/bitcoind
/…/bitcoin/build/src/bitcoin-cli
/…/bitcoin/build/src/bitcoin-tx
/…/bitcoin/build/src/bitcoin-wallet
/…/bitcoin/build/src/qt/bitcoin-qt
man pages generated from dirty binaries should NOT be committed.
To properly generate man pages, please commit your changes to the above binaries, rebuild them, then run this script again.
Yea seems strong enough warning. Thanks for working on this!
~NACK, this change makes command line options help unavailable for bitcoind.~
I had a broken setup. Sorry for noise.