fix(build): fix version number when building with old Sapling #712
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: Fix a bug (facebook#711) in Sapling that causes `sl --version` to not work when building Sapling with an old version of Sapling. The way `setup.py` gets the version number is by first **finding the path to the vc exe** (`findhg`) and then running the `sl log ...` (or `git show ...`). `findhg` interprets the `hint[old-version]` as an error and aborts. This commit fixes the bug by simply adding `hint[old-version]` to `filterhgerr` Test Plan: It doesn't seem straightforward to write an automated test for this since we don't have tests for `setup.py`. The manual steps to test would be: 1. get an old `sl` ```sh $ sl go "bsearch(date('-50'),main)" ``` - verify it's old by running any `sl` command and make sure you get `hint[old-version]: WARNING! ...` 2. build Sapling (`make oss`) 3. `./sl --version` Before this commit: ```sh $ sl --version Saping 4.4.2 ``` This commit: ```sh $ sl --version Sapling <date-and-stuff> ``` Closes facebook#711
|
LGTM! Thanks for fixing it. |
|
@zzl0 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix(build): fix version number when building with old Sapling
Summary:
Fix a bug (#711) in Sapling that causes
sl --versionto not work whenbuilding Sapling with an old version of Sapling.
The way
setup.pygets the version number is by first finding the path tothe vc exe (
findhg) and then running thesl log ...(orgit show ...).findhginterprets the
hint[old-version]as an error and aborts.This commit fixes the bug by simply adding
hint[old-version]tofilterhgerrTest Plan:
It doesn't seem straightforward to write an automated test for this since we
don't have tests for
setup.py. The manual steps to test would be:sl$ sl go "bsearch(date('-50'),main)"make oss)./sl --versionBefore this commit:
This commit:
Closes #711