Mercurial > kallithea
changeset 2478:8eab81115660 beta
white space cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 18 Jun 2012 00:41:10 +0200 |
| parents | 19d94d752952 |
| children | 9225597688f4 |
| files | rhodecode/controllers/changeset.py rhodecode/controllers/pullrequests.py rhodecode/lib/base.py rhodecode/lib/dbmigrate/schema/db_1_4_0.py rhodecode/lib/diffs.py rhodecode/lib/vcs/nodes.py rhodecode/lib/vcs/utils/hgcompat.py rhodecode/model/changeset_status.py rhodecode/model/comment.py rhodecode/model/user.py rhodecode/templates/admin/users/user_edit.html rhodecode/templates/branches/branches.html rhodecode/templates/changeset/changeset_file_comment.html rhodecode/templates/changeset/diff_block.html rhodecode/templates/email_templates/changeset_comment.html rhodecode/templates/pullrequests/pullrequest_show.html rhodecode/templates/pullrequests/pullrequest_show_all.html rhodecode/tests/__init__.py rhodecode/tests/functional/test_compare.py |
| diffstat | 19 files changed, 37 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/controllers/changeset.py Mon Jun 18 00:41:10 2012 +0200 @@ -382,7 +382,7 @@ 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) )
--- a/rhodecode/controllers/pullrequests.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/controllers/pullrequests.py Mon Jun 18 00:41:10 2012 +0200 @@ -62,7 +62,7 @@ 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 @@ 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) )
--- a/rhodecode/lib/base.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/lib/base.py Mon Jun 18 00:41:10 2012 +0200 @@ -216,4 +216,4 @@ # 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)
--- a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py Mon Jun 18 00:41:10 2012 +0200 @@ -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 *
--- a/rhodecode/lib/diffs.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/lib/diffs.py Mon Jun 18 00:41:10 2012 +0200 @@ -566,7 +566,7 @@ 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:
--- a/rhodecode/lib/vcs/nodes.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/lib/vcs/nodes.py Mon Jun 18 00:41:10 2012 +0200 @@ -432,7 +432,7 @@ 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' ]
--- a/rhodecode/lib/vcs/utils/hgcompat.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/lib/vcs/utils/hgcompat.py Mon Jun 18 00:41:10 2012 +0200 @@ -12,4 +12,4 @@ 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
--- a/rhodecode/model/changeset_status.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/model/changeset_status.py Mon Jun 18 00:41:10 2012 +0200 @@ -120,7 +120,7 @@ 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
--- a/rhodecode/model/comment.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/model/comment.py Mon Jun 18 00:41:10 2012 +0200 @@ -59,7 +59,7 @@ 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:
--- a/rhodecode/model/user.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/model/user.py Mon Jun 18 00:41:10 2012 +0200 @@ -610,4 +610,4 @@ 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)
--- a/rhodecode/templates/admin/users/user_edit.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit.html Mon Jun 18 00:41:10 2012 +0200 @@ -209,7 +209,7 @@ <div class="title"> <h5>${_('Email addresses')}</h5> </div> - + <div class="emails_wrap"> <table class="noborder"> %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()} </td> </tr> %endfor </table> </div> - + ${h.form(url('user_emails', id=c.user.user_id),method='put')} <div class="form"> <!-- fields --> @@ -239,7 +239,7 @@ <div class="input"> ${h.text('new_email', class_='medium')} </div> - </div> + </div> <div class="buttons"> ${h.submit('save',_('Add'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")}
--- a/rhodecode/templates/branches/branches.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/branches/branches.html Mon Jun 18 00:41:10 2012 +0200 @@ -44,7 +44,7 @@ .replace('__OTHER__',other.value); window.location=u; } - + }) // main table sorting var myColumnDefs = [
--- a/rhodecode/templates/changeset/changeset_file_comment.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Mon Jun 18 00:41:10 2012 +0200 @@ -18,9 +18,9 @@ <div style="float:left" class="changeset-status-container"> <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">›</span></div> <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change.status_lbl}</div> - <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div> + <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div> </div> - %endif + %endif %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id: <div class="buttons"> <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span> @@ -117,15 +117,15 @@ _('Use @username inside this text to send notification to this RhodeCode user')))|n} | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')} <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" /> - </span> + </span> </div> <div id="status_block_container" class="status-block" style="display:none"> %for status,lbl in c.changeset_statuses: <div class=""> <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label> - </div> + </div> %endfor - </div> + </div> <div class="mentions-container" id="mentions_container"></div> ${h.textarea('text')} </div> @@ -139,17 +139,17 @@ <script> YUE.onDOMReady(function () { MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA); - + // changeset status box listener YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){ if(e.currentTarget.checked){ - YUD.setStyle('status_block_container','display',''); + YUD.setStyle('status_block_container','display',''); } else{ YUD.setStyle('status_block_container','display','none'); } }) - + }); </script> </%def>
--- a/rhodecode/templates/changeset/diff_block.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/changeset/diff_block.html Mon Jun 18 00:41:10 2012 +0200 @@ -44,7 +44,7 @@ %for op,filenode_path,diff in change: <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div> - <div id="${h.FID('',filenode_path)}" class="diffblock margined comm"> + <div id="${h.FID('',filenode_path)}" class="diffblock margined comm"> <div class="code-header"> <div class="changeset_header"> <div class="changeset_file"> @@ -58,4 +58,4 @@ </div> </div> %endfor -</%def> \ No newline at end of file +</%def>
--- a/rhodecode/templates/email_templates/changeset_comment.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/email_templates/changeset_comment.html Mon Jun 18 00:41:10 2012 +0200 @@ -8,5 +8,5 @@ % if status_change is not None: <div> New status -> ${status_change} -</div> -% endif \ No newline at end of file +</div> +% endif
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Mon Jun 18 00:41:10 2012 +0200 @@ -19,20 +19,20 @@ <div class="title"> ${self.breadcrumbs()} </div> - + <h3>${_('Title')}: ${c.pull_request.title}</h3> <div class="changeset-status-container" style="float:left;padding:0px 20px 20px 20px"> %if c.current_changeset_status: <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div> <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div> %endif - </div> + </div> <div style="padding:4px"> <div>${h.fmt_date(c.pull_request.created_on)}</div> </div> - + ##DIFF - + <div class="table"> <div id="body" class="diffblock"> <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div> @@ -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)} - + </div> <script type="text/javascript">
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html Mon Jun 18 00:41:10 2012 +0200 @@ -19,11 +19,11 @@ <div class="title"> ${self.breadcrumbs()} </div> - + %for pr in c.pull_requests: <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">#${pr.pull_request_id}</a> %endfor - + </div> <script type="text/javascript"></script>
--- a/rhodecode/tests/__init__.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/tests/__init__.py Mon Jun 18 00:41:10 2012 +0200 @@ -28,7 +28,7 @@ from rhodecode.model.meta import Session from rhodecode.model.db import User from rhodecode.tests.nose_parametrized import parameterized - + import pylons.test
--- a/rhodecode/tests/functional/test_compare.py Mon Jun 18 00:35:13 2012 +0200 +++ b/rhodecode/tests/functional/test_compare.py Mon Jun 18 00:41:10 2012 +0200 @@ -23,7 +23,7 @@ response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO) response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO) response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO) - + ## files diff response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''' % (HG_REPO, tag1, tag2)) response.mustcontain('''<div class="node"><a href="/%s/compare/tag@%s...tag@%s#C--e3305437df55">test_and_report.sh</a></div>''' % (HG_REPO, tag1, tag2))