Commit 22d323d1 authored by Michal Čihař's avatar Michal Čihař

Use VCS agnostic method names

We already support Git and Mercurial and this naming can be confusing.
Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent d1cdc8a5
{% load i18n %}
{% load translations %}
{% with object.git_needs_commit as needs_commit %}
{% with object.repo_needs_commit as needs_commit %}
<div class="row">
<div class="col-md-8">
......@@ -18,13 +18,13 @@
<p><a href="{% documentation "faq" "merge" %}">{% trans "Check our FAQ for information how to resolve this." %}</a></p>
</div>
{% else %}
{% if object.git_needs_merge %}
{% if object.repo_needs_merge %}
<div class="alert alert-warning" role="alert">{% trans "The remote repository needs to be merged!" %}</div>
{% endif %}
{% if object.git_needs_push %}
{% if object.repo_needs_push %}
<div class="alert alert-warning" role="alert">{% trans "There are some new commits in the local repository!" %}</div>
{% endif %}
{% if not needs_commit and not object.git_needs_merge and not object.git_needs_push %}
{% if not needs_commit and not object.repo_needs_merge and not object.repo_needs_push %}
<div class="alert alert-success" role="alert">{% trans "The local repository is up to date." %}</div>
{% endif %}
{% endif %}
......
......@@ -42,7 +42,7 @@ class Command(WeblateLangCommand):
age = timezone.now() - timedelta(hours=options['age'])
for translation in self.get_translations(*args, **options):
if not translation.git_needs_commit():
if not translation.repo_needs_commit():
continue
last_change = translation.last_change
......
......@@ -343,24 +343,24 @@ class Project(models.Model, PercentMixin, URLMixin, PathMixin):
"""
return self.get_languages().count()
def git_needs_commit(self):
def repo_needs_commit(self):
"""
Checks whether there are some not committed changes.
"""
for component in self.subproject_set.all():
if component.git_needs_commit():
if component.repo_needs_commit():
return True
return False
def git_needs_merge(self):
def repo_needs_merge(self):
for component in self.subproject_set.all():
if component.git_needs_merge():
if component.repo_needs_merge():
return True
return False
def git_needs_push(self):
def repo_needs_push(self):
for component in self.subproject_set.all():
if component.git_needs_push():
if component.repo_needs_push():
return True
return False
......
......@@ -651,7 +651,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
self.update_remote_branch()
# do we have something to merge?
if not self.git_needs_merge() and method != 'rebase':
if not self.repo_needs_merge() and method != 'rebase':
return True
# commit possible pending changes
......@@ -667,7 +667,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
self.create_translations(request=request)
# Push after possible merge
if (self.git_needs_push() and
if (self.repo_needs_push() and
ret and
self.project.push_on_commit and
self.can_push()):
......@@ -696,7 +696,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
self.commit_pending(request, skip_push=True)
# Do we have anything to push?
if not self.git_needs_push():
if not self.repo_needs_push():
return False
if do_update:
......@@ -704,7 +704,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
self.do_update(request)
# Were all changes merged?
if self.git_needs_merge():
if self.repo_needs_merge():
return False
# Do actual push
......@@ -1282,28 +1282,28 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
'''
return self.translation_set.get_percents()
def git_needs_commit(self):
def repo_needs_commit(self):
'''
Checks whether there are some not committed changes.
'''
if self.is_repo_link:
return self.linked_subproject.git_needs_commit()
return self.linked_subproject.repo_needs_commit()
return self.repository.needs_commit()
def git_needs_merge(self):
def repo_needs_merge(self):
'''
Checks whether there is something to merge from remote repository.
'''
if self.is_repo_link:
return self.linked_subproject.git_needs_merge()
return self.linked_subproject.repo_needs_merge()
return self.repository.needs_merge(self.branch)
def git_needs_push(self):
def repo_needs_push(self):
'''
Checks whether there is something to push to remote repository.
'''
if self.is_repo_link:
return self.linked_subproject.git_needs_push()
return self.linked_subproject.repo_needs_push()
return self.repository.needs_push(self.branch)
@property
......
......@@ -777,17 +777,17 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
if sync:
self.store_hash()
def git_needs_commit(self):
def repo_needs_commit(self):
'''
Checks whether there are some not committed changes.
'''
return self.repository.needs_commit(self.filename)
def git_needs_merge(self):
return self.subproject.git_needs_merge()
def repo_needs_merge(self):
return self.subproject.repo_needs_merge()
def git_needs_push(self):
return self.subproject.git_needs_push()
def repo_needs_push(self):
return self.subproject.repo_needs_push()
def git_commit(self, request, author, timestamp, force_commit=False,
sync=False, skip_push=False):
......@@ -800,7 +800,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
translation rescan will be needed)
'''
# Is there something for commit?
if not self.git_needs_commit():
if not self.repo_needs_commit():
return False
# Can we delay commit?
......
......@@ -608,25 +608,25 @@ class EditTest(ViewTestCase):
)
# We should get to second message
self.assertRedirectsOffset(response, self.translate_url, 1)
self.assertTrue(self.translation.git_needs_commit())
self.assertTrue(self.subproject.git_needs_commit())
self.assertTrue(self.subproject.project.git_needs_commit())
self.assertTrue(self.translation.repo_needs_commit())
self.assertTrue(self.subproject.repo_needs_commit())
self.assertTrue(self.subproject.project.repo_needs_commit())
self.translation.commit_pending(self.get_request('/'))
self.assertFalse(self.translation.git_needs_commit())
self.assertFalse(self.subproject.git_needs_commit())
self.assertFalse(self.subproject.project.git_needs_commit())
self.assertFalse(self.translation.repo_needs_commit())
self.assertFalse(self.subproject.repo_needs_commit())
self.assertFalse(self.subproject.project.repo_needs_commit())
self.assertTrue(self.translation.git_needs_push())
self.assertTrue(self.subproject.git_needs_push())
self.assertTrue(self.subproject.project.git_needs_push())
self.assertTrue(self.translation.repo_needs_push())
self.assertTrue(self.subproject.repo_needs_push())
self.assertTrue(self.subproject.project.repo_needs_push())
self.translation.do_push(self.get_request('/'))
self.assertFalse(self.translation.git_needs_push())
self.assertFalse(self.subproject.git_needs_push())
self.assertFalse(self.subproject.project.git_needs_push())
self.assertFalse(self.translation.repo_needs_push())
self.assertFalse(self.subproject.repo_needs_push())
self.assertFalse(self.subproject.project.repo_needs_push())
def test_auto(self):
'''
......
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