Skip to content
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

Make use of the new --workingbranch to filter multiple destination branches #110

Merged
merged 10 commits into from
Mar 5, 2024

Conversation

SRombautsU
Copy link

@SRombautsU SRombautsU commented Feb 19, 2024

Within the Content Browser, filter the list of Locks to only display those applying to the same destination branch as the current branch (eg all locks targeting /main/release if currently working on /main/release/hotfixXXX)

On the other hand, the View Locks windows still display locks for all destination branches.

This require to different calls to cm lock list, and as such, two different caches for their different results.

@SRombautsU SRombautsU self-assigned this Feb 19, 2024
@SRombautsU SRombautsU force-pushed the 1004874-smartlocks-workingbranch-filter branch 3 times, most recently from 67de8d3 to 965de6a Compare February 21, 2024 17:45
…h to filter multiple destination branches

Only retrieve Locks that are sharing the same destination branch as the current branch
@SRombautsU SRombautsU force-pushed the 1004874-smartlocks-workingbranch-filter branch from 965de6a to 740d279 Compare February 23, 2024 09:09
…llDestBranches

Retrieve locks for all destination branches, or restrict them to only those applying to the working branch
1. locks applying to the working branch only, to be displayed as status overlay icons in the content browser
2. locks for all destination branches, to show in the View Locks list
…in the context menu

Get only the locks applying to the working branch and for the specified files.
…rWorkingBranch() to handle Lock Refs directly instead of dealing with FAssetData (basically file path)

It means that the "Unlock" operation is now always called with Locks and not solely with Files, which simplifies it
@SRombautsU SRombautsU force-pushed the 1004874-smartlocks-workingbranch-filter branch from 68d841c to b553be4 Compare February 23, 2024 11:24
@SRombautsU SRombautsU marked this pull request as ready for review February 23, 2024 17:10
…ays trigger a refresh of the List of Locks

It's needed since when removing the Lock of a Checked Out asset there is actually no change in local status as the asset remains Checked Out!
@juliomaqueda juliomaqueda merged commit 7829ac7 into master Mar 5, 2024
@juliomaqueda juliomaqueda deleted the 1004874-smartlocks-workingbranch-filter branch March 5, 2024 12:27
@SRombautsU SRombautsU added this to the 1.10.0 milestone May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants