Commit 17899d35 authored by Michal Čihař's avatar Michal Čihař

Set default branch in cleanup as well

Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent c84a7546
...@@ -898,6 +898,13 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin): ...@@ -898,6 +898,13 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
self.update_remote_branch() self.update_remote_branch()
self.update_branch() self.update_branch()
def set_default_branch(self):
'''
Set default VCS branch if empty
'''
if self.branch == '':
self.branch = VCS_REGISTRY[self.vcs].default_branch
def clean_repo_link(self): def clean_repo_link(self):
''' '''
Validates repository link. Validates repository link.
...@@ -1078,6 +1085,8 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin): ...@@ -1078,6 +1085,8 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
if self.project_id is None: if self.project_id is None:
return return
self.set_default_branch()
# Check if we should rename # Check if we should rename
if self.id: if self.id:
old = SubProject.objects.get(pk=self.id) old = SubProject.objects.get(pk=self.id)
...@@ -1146,10 +1155,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin): ...@@ -1146,10 +1155,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
Save wrapper which updates backend repository and regenerates Save wrapper which updates backend repository and regenerates
translation data. translation data.
''' '''
self.set_default_branch()
# Set default VCS branch if empty
if self.branch == '':
self.branch = VCS_REGISTRY[self.vcs].default_branch
# Detect if VCS config has changed (so that we have to pull the repo) # Detect if VCS config has changed (so that we have to pull the repo)
changed_git = True changed_git = True
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment