-
-
Notifications
You must be signed in to change notification settings - Fork 1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Don't give clips a hidden default name (Fix #5528) #5621
Conversation
- Stop giving clips the same name as their parent track on creation - Stop hiding clip names that match the parent track name - Never rename clips on track rename - Never clear clip name when a clip is copied to another track - Create an upgrade routine to clear default names from old projects (< 1.3.0-alpha-1) - Bump version to 1.3.0-alpha-1
For testersFirst and foremost, test that your old projects are correctly upgraded (I don't recommend saving over old projects when doing this!). Opening an old project should not lead to clip names becoming visible that were previously invisible. Then, for more thorough testing, you can test:
|
🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩
Linux
Windows
macOS🤖{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://8874-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-715%2Bg26ac891-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8874?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://8877-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-715%2Bg26ac89106-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8877?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://8875-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-715%2Bg26ac89106-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8875?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/11ankdhysxh4h2mt/artifacts/build/lmms-1.2.2-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35307328"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/dlfpirtg2b6bpksc/artifacts/build/lmms-1.2.2-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/35307328"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://8878-15778896-gh.circle-artifacts.com/0/lmms-1.2.3-715%2Bg26ac89106-mac10.13.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/8878?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "5d98a85d472250f4605d48b8b85222d549e9a367"} |
@PhysSong requesting review from you because I've seen you handle version bumps in the past, so I thought you might know why the bump to 1.3.0-alpha-1 didn't seem to work. |
If you build from a Git repository(not using the tarball), LMMS uses the output of |
@PhysSong in other words, once this PR is merged we need to make a 1.3.0-alpha-1 tag if we want the version to update? If so, do you mind if I do that? (assuming I have the correct permissions and can figure it out, haha) |
Also, I suppose now would be a good time to confirm if the version numbering I used is actually correct. It looks like the current state of the PR would generate
|
You should use either |
See also: #3594 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't tested, but LGTM
Note to self (emphasis mine):
Longer strings are bigger than smaller strings if the first part is the same. Testing a few strings with this site gives, in ascending order:
This means that |
semver ordering of examples and a few others, lower in the list is > higher |
It seems like new conflicts are not resolved properly. |
It seems like the merge commit wasn't marked as a merge commit for some reason. I added a commit to fix it. |
446d856
to
d2039fb
Compare
@PhysSong thank you, I was going to manually transfer the changes to a new branch if the diff didn't resolve to something sensible (as it's occasionally done before). This is ready for review now that it's no longer blocked by any other PRs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me mostly. Can you revert the formatting change in AutomationPattern.h
so it isn't touched unnecessarily? BBTrack.cpp
also has quite a few formatting changes, which I worry may cause conflicts with #5573.
…se of legacyFileVersion
Latest commit addresses Dom's most recent comment, and I used a new test file to confirm that the behavior was wrong before and isn't now. I also touched some code that should arguably be in a separate PR: Previously, |
* Automatic formatting changes * Give clips an empty name by default, display all names - Stop giving clips the same name as their parent track on creation - Stop hiding clip names that match the parent track name - Never rename clips on track rename - Never clear clip name when a clip is copied to another track - Create an upgrade routine to clear default names from old projects (< 1.3.0-alpha-1) - Bump version to 1.3.0-alpha-1 * Revert now-unnecessary version bump * Merge with master and fix conflicts * Formatting changes from review * Change weird for loop conditions * Properly revert AutomationPatter.h changes * Only clear names that match our parent track, be more generous with use of legacyFileVersion Co-authored-by: Hyunjin Song <tteu.ingog@gmail.com>
Fixes #5528 and simplifies/removes lots of name related logic by not giving clips a default name. Adds an upgrade routine to remove the default names in old projects, to avoid previously invisible clip names becoming visible.
Known issues:
Initial testing implies the upgrade routine isn't called for .mmp filesVersion bump doesn't work with LMMSBot builds nor builds from a git clone, so the upgrade logic isn't guaranteed to run once. Depending on your LMMS version and project version it could run multiple times or never run. However, I have confirmed that versions like "1.2.2.686" are correctly detected as less than "1.3.0-alpha-1".Fix: make a 1.3.0-alpha-1 tag when this PR is merged?For reviewers: The commit "Automatic formatting changes" can be ignored while reviewing.
A future improvement would be to stop abusing
name()
to give hints in automation clips, but IMO this is out of scope for this PR. There is adisplayName()
function that might be appropriate, but it's used inconsistently.