studio/blender-studio-pipeline
13
30
Fork 19
Code Issues 18 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 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 559b57f83e - Show all commits

2
scripts-blender/addons/blender_svn/threaded/svn_status.py
View File

@ -167,7 +167,7 @@ class BGP_SVN_Status(BackgroundProcess):
self.timestamp_last_update = time.time() self.timestamp_last_update = time.time()
if prefs.do_auto_updates: if prefs.do_auto_updates:
if any([f.repos_status != 'normal' for f in repo.external_files]): if any([f.repos_status != 'normal' for f in repo.external_files]):
print("Automatic updates would start now.") Processes.start('Update')
def get_ui_message(self, context): def get_ui_message(self, context):
time_since_last_update = time.time() - self.timestamp_last_update time_since_last_update = time.time() - self.timestamp_last_update

2
scripts-blender/addons/blender_svn/threaded/update.py
View File

@ -64,7 +64,7 @@ class BGP_SVN_Update(BackgroundProcess):
print(self.message) print(self.message)
self.set_predicted_file_status(file) self.set_predicted_file_status(file)
command = ["svn", "up", file.svn_path, "--accept", "postpone", "--depth", "empty"] command = ["svn", "up", file.svn_path, "--accept", "postpone"]#, "--depth", "empty"]
if self.revision > 0: if self.revision > 0:
command.insert(2, f"-r{self.revision}") command.insert(2, f"-r{self.revision}")
self.output = execute_svn_command(context, command, use_cred=True) self.output = execute_svn_command(context, command, use_cred=True)