Use git info only when Expand to Working Set is enabled #6944
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
dkashyn-sfdc
requested review from
mai93,
tpasternak and
agluszak
as code owners
github-actions
bot
added
product: CLion
dkashyn-sfdc
commented
Oct 30, 2024
| vcsState.flatMap(s -> s.workspaceSnapshotPath).map(Object::toString).orElse("<none>"))); | ||
|
|
||
| Optional<VcsState> vcsState = Optional.empty(); | ||
| if (BlazeUserSettings.getInstance().getExpandSyncToWorkingSet()) { |
There was a problem hiding this comment.
Probably other option should be added for QS yet even QS-relevant delta calculation will be taxing in some cases.
Also Sync to Working Set is enabled by default, iirc. So default QS behavior won't change.
dkashyn-sfdc
commented
Oct 30, 2024
| @@ -125,7 +126,7 @@ private SyncProjectState getProjectState(BlazeContext context, BlazeSyncParams p | |||
| createBazelInfoFuture(context, syncFlags, params.syncMode()); | |||
|
|
|||
| ListenableFuture<WorkingSet> workingSetFuture; | |||
| if (params.addWorkingSet() || params.syncMode() == SyncMode.FULL) { | |||
| if (params.addWorkingSet() || (BlazeUserSettings.getInstance().getExpandSyncToWorkingSet() && params.syncMode() == SyncMode.FULL)) { | |||
There was a problem hiding this comment.
Don't know when this one is used but it is bad to ignore the setting anyway so we need to double check here.
There was a problem hiding this comment.
Oh, params.addWorkingSet already checks for that, but I'll merge
There was a problem hiding this comment.
I want to avoid unconditional params.syncMode() == SyncMode.FULL this is quite recent change from September
dkashyn-sfdc
force-pushed
the
respect-workset-settings-query-sync-and-beyond
branch
from
56b104c
to
087553f
Compare
tpasternak
approved these changes
Oct 30, 2024
| @@ -125,7 +126,7 @@ private SyncProjectState getProjectState(BlazeContext context, BlazeSyncParams p | |||
| createBazelInfoFuture(context, syncFlags, params.syncMode()); | |||
|
|
|||
| ListenableFuture<WorkingSet> workingSetFuture; | |||
| if (params.addWorkingSet() || params.syncMode() == SyncMode.FULL) { | |||
| if (params.addWorkingSet() || (BlazeUserSettings.getInstance().getExpandSyncToWorkingSet() && params.syncMode() == SyncMode.FULL)) { | |||
There was a problem hiding this comment.
Oh, params.addWorkingSet already checks for that, but I'll merge
github-actions
bot
removed
the
awaiting-review
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.
Checklist
Please note that the maintainers will not be reviewing this change until all checkboxes are ticked. See
the Contributions section in the README for more
details.
Discussion thread for this change
Issue number: (#6943)
Description of this change