studio/blender-studio-tools
13
32
Fork 19
Code Issues 21 Pull Requests 4 Projects Releases 1 Activity

Blender SVN: New Features #273

Open
Demeter Dzadik wants to merge 13 commits from New-SVN-features into main
pull from: New-SVN-features
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 13 Files Changed 12 +463 -121
Demeter Dzadik commented 2024-03-27 02:06:26 +01:00
Member
Copy Link

While on holiday, I coded some SVN stuff for fun. It's not quite done yet, so publishing this branch and PR to track. I'd probably need one more day to wrap this up. Aiming at April 7.

Done:

  • Auto-update
    • Gets disabled when reverting a single file or whole repository, of course.
    • Hides manual update button when enabled.
  • Ability to cancel running operations.
    • Useful when you remember something just as you press "Commit" or change your mind about wanting to download an update for a 4GB previz .blend.
    • Cancelled operations require Cleanup though, which will not run automatically atm.
  • File tree view
    • The default remains the "Updates" view, which is a flat list of only modified files (either locally or on the remote).
    • Works with search. Parent folders of each matching search result will be visible and collapsible. That makes it better than the Outliner search! :D
    • Intended to support future sparse check-out workflow.
  • File size info, including folders.
    • This uses the svn list command for the whole repo which is a massive request from the SVN server so I hope it won't hammer it too much. It only runs when a new file appears on the repo, or when Cleanup is ran.
    • Disabled by default, since you don't usually care about file sizes.
  • New file list UI layout: less jumpy, more appealing, deals better with different UI scales. (Somewhat adaptive, in fact!)

Still TODO:

  • Sort folders first: This is just a quick thing I forgot to add.
  • Fully support sparse check-outs.
    • This is extremely tricky while still supporting per-file update feedback, because the only way to set a directory's SVN depth to infinity is to actually download the entire folder in one go (with no way to give the user more granular progress feedback), but I have a plan to get around this, and the file tree UI was a key pre-requisite for that idea.
    • This will include the ability to initiate an SVN check-out with "Sparse Mode" that will only create the folder tree, and not download any files at first. Then, you can choose which folders you want to actually have a local copy of. From then on, as per SVN standard, those folders will behave as expected, and any new files and sub-folders within them will be grabbed on update.
    • This also includes the ability to see files that are on the remote but not on the local machine, so you can choose to download individual files if you want to, and later get rid of them again. Although the workflow for the "getting rid of" part may be a bit unintuitive, as that would involve updating a containing folder with --set-depth empty.
While on holiday, I coded some SVN stuff for fun. It's not quite done yet, so publishing this branch and PR to track. I'd probably need one more day to wrap this up. Aiming at April 7. Done: - Auto-update - Gets disabled when reverting a single file or whole repository, of course. - Hides manual update button when enabled. - Ability to cancel running operations. - Useful when you remember something just as you press "Commit" or change your mind about wanting to download an update for a 4GB previz .blend. - Cancelled operations require Cleanup though, which will not run automatically atm. - File tree view - The default remains the "Updates" view, which is a flat list of only modified files (either locally or on the remote). - Works with search. Parent folders of each matching search result will be visible and collapsible. That makes it better than the Outliner search! :D - Intended to support future sparse check-out workflow. - File size info, including folders. - This uses the `svn list` command for the whole repo which is a massive request from the SVN server so I hope it won't hammer it too much. It only runs when a new file appears on the repo, or when Cleanup is ran. - Disabled by default, since you don't usually care about file sizes. - New file list UI layout: less jumpy, more appealing, deals better with different UI scales. (Somewhat adaptive, in fact!) Still TODO: - Sort folders first: This is just a quick thing I forgot to add. - Fully support sparse check-outs. - This is extremely tricky while still supporting per-file update feedback, because the only way to set a directory's SVN depth to infinity is to actually download the entire folder in one go (with no way to give the user more granular progress feedback), but I have a plan to get around this, and the file tree UI was a key pre-requisite for that idea. - This will include the ability to initiate an SVN check-out with "Sparse Mode" that will only create the folder tree, and not download any files at first. Then, you can choose which folders you want to actually have a local copy of. From then on, as per SVN standard, those folders will behave as expected, and any new files and sub-folders within them will be grabbed on update. - This also includes the ability to see files that are on the remote but not on the local machine, so you can choose to download individual files if you want to, and later get rid of them again. Although the workflow for the "getting rid of" part may be a bit unintuitive, as that would involve updating a containing folder with `--set-depth empty`.
Demeter Dzadik added 13 commits 2024-03-27 02:06:27 +01:00 
But leave it disabled for now because it's super slow and should only run on demand.
Also comes with:
- svn_path setter now ensures consistent path separators
- File entries should now be added via new file_add() which also sets tree data
- Better UI messages for revert and update
- Revert and update now disable auto-update
- Auto-update now actually works
- Skip adding an entry for the SVN root directory
- SVN List is now a separate BackgroundProcess that is started only when a new file entry is added that isn't on the local repo. So it runs rarely.
- Tree view works well with search

TODO:
- Tree view currently not mutually exclusive with showing full paths, but will be soon.
- File and folder sizes are not yet displayed.
- UI for folder depth setting (sparse check-out) is pretty ugly atm.
- Don't force the search filter to be visible when it's empty
- Add a popover menu for file list display settings
- Tree View / Flat View is now an enum
- Switching to Tree View forces show_file_paths=False
- Fix active blend file was not displaying in flat view without search filter
- Increase indent distance of tree view
- Fix two cases of console errors on Reload Scripts

TODO:
- Still no file sizes
- The fact that Auto-Update isn't always visible in the UI feels wrong
- Move process info to the bottom so it doesn't make the UI jump around.
- Allow multiple processes' message to be shown.
- Calculate folder sizes.
- Tweak filelist UI columns.
- Auto-update button now always visible.
Merge conflict checking is in progress. Try again in few moments.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin New-SVN-features:New-SVN-features
git checkout New-SVN-features
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Kind
Breaking
Breaking change that won't be backward compatible

  
Kind
Bug
Something is not working

  
Kind: Community

Issues opened by members of the community / outside the studio

  
Kind
Documentation
Documentation changes

  
Kind
Easy
Simple to complete

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
Proposal
A proposal or idea that requires feedback

  
Kind
Security
This is security issue

  
Kind
Studio Request
Requested by a user at the Blender-Studio

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No Label
Kind
Breaking
Kind
Bug
Kind: Community
Kind
Documentation
Kind
Easy
Kind
Enhancement
Kind
Feature
Kind
Proposal
Kind
Security
Kind
Studio Request
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: studio/blender-studio-tools#273
No description provided.
Delete Branch "New-SVN-features"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?