diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -382,7 +382,7 @@ class ChangesetController(BaseRepoContro revision=revision, f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), - status_change=(ChangesetStatus.get_status_lbl(status) + status_change=(ChangesetStatus.get_status_lbl(status) if status and change_status else None) ) diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -62,7 +62,7 @@ class PullrequestsController(BaseRepoCon k, v in repo.branches.iteritems()], _("Branches")) bookmarks_group = ([('book:%s:%s' % (k, v), k) for k, v in repo.bookmarks.iteritems()], _("Bookmarks")) - tags_group = ([('tag:%s:%s' % (k, v), k) for + tags_group = ([('tag:%s:%s' % (k, v), k) for k, v in repo.tags.iteritems()], _("Tags")) hist_l.append(bookmarks_group) @@ -242,7 +242,7 @@ class PullrequestsController(BaseRepoCon pull_request=pull_request_id, f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), - status_change=(ChangesetStatus.get_status_lbl(status) + status_change=(ChangesetStatus.get_status_lbl(status) if status and change_status else None) ) diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py --- a/rhodecode/lib/base.py +++ b/rhodecode/lib/base.py @@ -216,4 +216,4 @@ class BaseRepoController(BaseController) # some globals counter for menu c.repository_followers = self.scm_model.get_followers(dbr) c.repository_forks = self.scm_model.get_forks(dbr) - c.repository_pull_requests = self.scm_model.get_pull_requests(dbr) \ No newline at end of file + c.repository_pull_requests = self.scm_model.get_pull_requests(dbr) diff --git a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py --- a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py @@ -25,4 +25,4 @@ #TODO: replace that will db.py content after 1.5 Release -from rhodecode.model.db import * \ No newline at end of file +from rhodecode.model.db import * diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py --- a/rhodecode/lib/diffs.py +++ b/rhodecode/lib/diffs.py @@ -566,7 +566,7 @@ class InMemoryBundleRepo(bundlerepositor def differ(org_repo, org_ref, other_repo, other_ref, discovery_data=None): """ - General differ between branches, bookmarks or separate but releated + General differ between branches, bookmarks or separate but releated repositories :param org_repo: diff --git a/rhodecode/lib/vcs/nodes.py b/rhodecode/lib/vcs/nodes.py --- a/rhodecode/lib/vcs/nodes.py +++ b/rhodecode/lib/vcs/nodes.py @@ -432,7 +432,7 @@ class RemovedFileNode(FileNode): RemovedFileNodeError. """ ALLOWED_ATTRIBUTES = [ - 'name', 'path', 'state', 'is_root', 'is_file', 'is_dir', 'kind', + 'name', 'path', 'state', 'is_root', 'is_file', 'is_dir', 'kind', 'added', 'changed', 'not_changed', 'removed' ] diff --git a/rhodecode/lib/vcs/utils/hgcompat.py b/rhodecode/lib/vcs/utils/hgcompat.py --- a/rhodecode/lib/vcs/utils/hgcompat.py +++ b/rhodecode/lib/vcs/utils/hgcompat.py @@ -12,4 +12,4 @@ from mercurial.match import match from mercurial.mdiff import diffopts from mercurial.node import hex from mercurial.encoding import tolocal -from mercurial import discovery \ No newline at end of file +from mercurial import discovery diff --git a/rhodecode/model/changeset_status.py b/rhodecode/model/changeset_status.py --- a/rhodecode/model/changeset_status.py +++ b/rhodecode/model/changeset_status.py @@ -120,7 +120,7 @@ class ChangesetStatusModel(BaseModel): if revision: new_status = _create_status(user=user, repo=repo, status=status, - comment=comment, revision=revision, + comment=comment, revision=revision, pull_request=None) self.sa.add(new_status) return new_status diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py --- a/rhodecode/model/comment.py +++ b/rhodecode/model/comment.py @@ -59,7 +59,7 @@ class ChangesetCommentsModel(BaseModel): f_path=None, line_no=None, status_change=None): """ Creates new comment for changeset or pull request. - IF status_change is not none this comment is associated with a + IF status_change is not none this comment is associated with a status change of changeset or changesets associated with pull request :param text: diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -610,4 +610,4 @@ class UserModel(BaseModel): user = self._get_user(user) obj = UserEmailMap.query().get(email_id) if obj: - self.sa.delete(obj) \ No newline at end of file + self.sa.delete(obj) diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -209,7 +209,7 @@
${_('Email addresses')}
- +
%for em in c.user_email_map: @@ -221,13 +221,13 @@ ${h.hidden('del_email',em.email_id)} ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id, class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} - ${h.end_form()} + ${h.end_form()} %endfor
- + ${h.form(url('user_emails', id=c.user.user_id),method='put')}
@@ -239,7 +239,7 @@
${h.text('new_email', class_='medium')}
-
+
${h.submit('save',_('Add'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html --- a/rhodecode/templates/branches/branches.html +++ b/rhodecode/templates/branches/branches.html @@ -44,7 +44,7 @@ YUE.on('compare_branches','click',functi .replace('__OTHER__',other.value); window.location=u; } - + }) // main table sorting var myColumnDefs = [ diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -18,9 +18,9 @@
›
${co.status_change.status_lbl}
-
+
- %endif + %endif %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
${_('Delete')} @@ -117,15 +117,15 @@ _('Use @username inside this text to send notification to this RhodeCode user')))|n} | ${_('change status')} - +
%endfor -
+
${h.textarea('text')} @@ -139,17 +139,17 @@ diff --git a/rhodecode/templates/changeset/diff_block.html b/rhodecode/templates/changeset/diff_block.html --- a/rhodecode/templates/changeset/diff_block.html +++ b/rhodecode/templates/changeset/diff_block.html @@ -44,7 +44,7 @@ %for op,filenode_path,diff in change:
-
+
@@ -58,4 +58,4 @@
%endfor - \ No newline at end of file + diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html --- a/rhodecode/templates/email_templates/changeset_comment.html +++ b/rhodecode/templates/email_templates/changeset_comment.html @@ -8,5 +8,5 @@ % if status_change is not None:
New status -> ${status_change} -
-% endif \ No newline at end of file +
+% endif diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -19,20 +19,20 @@
${self.breadcrumbs()}
- +

${_('Title')}: ${c.pull_request.title}

%if c.current_changeset_status:
[${h.changeset_status_lbl(c.current_changeset_status)}]
%endif -
+
${h.fmt_date(c.pull_request.created_on)}
- + ##DIFF - +
${h.literal(c.pull_request.description)}
@@ -72,7 +72,7 @@ ## render comments main comments form and it status ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), c.current_changeset_status)} - +
diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py --- a/rhodecode/tests/__init__.py +++ b/rhodecode/tests/__init__.py @@ -28,7 +28,7 @@ from rhodecode import is_windows from rhodecode.model.meta import Session from rhodecode.model.db import User from rhodecode.tests.nose_parametrized import parameterized - + import pylons.test diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py --- a/rhodecode/tests/functional/test_compare.py +++ b/rhodecode/tests/functional/test_compare.py @@ -23,7 +23,7 @@ class TestCompareController(TestControll response.mustcontain('''r116:9749bfbfc0d2''' % HG_REPO) response.mustcontain('''r115:70d4cef8a376''' % HG_REPO) response.mustcontain('''r112:c5ddebc06eaa''' % HG_REPO) - + ## files diff response.mustcontain('''
docs/api/utils/index.rst
''' % (HG_REPO, tag1, tag2)) response.mustcontain('''
test_and_report.sh
''' % (HG_REPO, tag1, tag2))