Mercurial > kallithea
changeset 2815:acc05c33cc0c beta
White space cleanup
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/controllers/changeset.py Thu Sep 06 00:10:34 2012 +0200 @@ -395,7 +395,7 @@ # get status if set ! if status and change_status: # if latest status was from pull request and it's closed - # disallow changing status ! + # disallow changing status ! # dont_allow_on_closed_pull_request = True ! try:
--- a/rhodecode/lib/compat.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/lib/compat.py Thu Sep 06 00:10:34 2012 +0200 @@ -589,6 +589,3 @@ self.__cond.wait(timeout) finally: self.__cond.release() - - -
--- a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py Thu Sep 06 00:10:34 2012 +0200 @@ -1317,4 +1317,4 @@ org_repo_id = Column('org_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False) org_ref = Column('org_ref', Unicode(256), nullable=False) other_repo_id = Column('other_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False) - other_ref = Column('other_ref', Unicode(256), nullable=False) \ No newline at end of file + other_ref = Column('other_ref', Unicode(256), nullable=False)
--- a/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py Thu Sep 06 00:10:34 2012 +0200 @@ -49,7 +49,7 @@ tbl = ChangesetStatus.__table__ tbl.create() - ## RESET COMPLETLY THE metadata for sqlalchemy to use the 1_3_0 Base + ## RESET COMPLETLY THE metadata for sqlalchemy to use the 1_3_0 Base Base = declarative_base() Base.metadata.clear() Base.metadata = MetaData()
--- a/rhodecode/lib/utils.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/lib/utils.py Thu Sep 06 00:10:34 2012 +0200 @@ -206,7 +206,7 @@ def is_valid_repo(repo_name, base_path, scm=None): """ Returns True if given path is a valid repository False otherwise. - If scm param is given also compare if given scm is the same as expected + If scm param is given also compare if given scm is the same as expected from scm parameter :param repo_name:
--- a/rhodecode/lib/vcs/utils/hgcompat.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/lib/vcs/utils/hgcompat.py Thu Sep 06 00:10:34 2012 +0200 @@ -15,4 +15,4 @@ from mercurial import discovery from mercurial import localrepo from mercurial import scmutil -from mercurial.discovery import findcommonoutgoing \ No newline at end of file +from mercurial.discovery import findcommonoutgoing
--- a/rhodecode/model/forms.py Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/model/forms.py Thu Sep 06 00:10:34 2012 +0200 @@ -340,4 +340,4 @@ pullrequest_title = v.UnicodeString(strip=True, required=True, min=3) pullrequest_desc = v.UnicodeString(strip=True, required=False) - return _PullRequestForm \ No newline at end of file + return _PullRequestForm
--- a/rhodecode/templates/admin/repos/repo_edit.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/repos/repo_edit.html Thu Sep 06 00:10:34 2012 +0200 @@ -115,7 +115,7 @@ ${h.checkbox('enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span> </div> - </div> + </div> <div class="field"> <div class="label"> <label for="user">${_('Owner')}:</label> @@ -193,7 +193,7 @@ <li>${_('Manually invalidate cache for this repository. On first access repository will be cached again')} </li> </ul> - </div> + </div> <div class="field" style="border:none;"> ${_('List of cached values')} <ul> @@ -201,7 +201,7 @@ <li>INSTANCE ID:${cache.prefix or '-'} ${cache.cache_args} CACHED: ${h.bool2icon(cache.cache_active)}</li> %endfor </ul> - </div> + </div> </div> </div> ${h.end_form()} @@ -243,7 +243,7 @@ <li>${_('Force locking on repository. Works only when anonymous access is disabled')} </li> </ul> - </div> + </div> </div> ${h.end_form()} @@ -259,9 +259,9 @@ <li>${_('''Manually set this repository as a fork of another from the list''')}</li> </ul> </div> - </div> + </div> ${h.end_form()} - + <h3>${_('Delete')}</h3> ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')} <div class="form"> @@ -276,7 +276,7 @@ </ul> </div> </div> - ${h.end_form()} + ${h.end_form()} </div> </%def>
--- a/rhodecode/templates/admin/repos/repo_edit_perms.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html Thu Sep 06 00:10:34 2012 +0200 @@ -74,8 +74,8 @@ </div> \ </td> \ <td></td>'""") - %> - ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' + %> + ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' <tr class="new_members last_new_member" id="add_perm_input"></tr> <tr> <td colspan="6">
--- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html Thu Sep 06 00:10:34 2012 +0200 @@ -58,8 +58,8 @@ </div> \ </td> \ <td></td>'""") - %> - ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' + %> + ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' <tr class="new_members last_new_member" id="add_perm_input"></tr> <tr> <td colspan="6">
--- a/rhodecode/templates/admin/repos_groups/repos_groups.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/repos_groups/repos_groups.html Thu Sep 06 00:10:34 2012 +0200 @@ -5,7 +5,7 @@ </%def> <%def name="breadcrumbs()"> - <span class="groups_breadcrumbs"> + <span class="groups_breadcrumbs"> ${h.link_to(_(u'Home'),h.url('/'))} %if c.group.parent_group: » ${h.link_to(c.group.parent_group.name,h.url('repos_group_home',group_name=c.group.parent_group.group_name))}
--- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html Thu Sep 06 00:10:34 2012 +0200 @@ -69,7 +69,7 @@ ${h.checkbox('enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span> </div> - </div> + </div> <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")}
--- a/rhodecode/templates/admin/settings/settings.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/settings/settings.html Thu Sep 06 00:10:34 2012 +0200 @@ -154,7 +154,7 @@ <li>[stale] <span class="metatag" tag="stale">stale</span></li> <li>[dead] <span class="metatag" tag="dead">dead</span></li> <li>[lang => lang] <span class="metatag" tag="lang" >lang</span></li> - <li>[license => License] <span class="metatag" tag="license"><a href="http://www.opensource.org/licenses/License" >License</a></span></li> + <li>[license => License] <span class="metatag" tag="license"><a href="http://www.opensource.org/licenses/License" >License</a></span></li> <li>[requires => Repo] <span class="metatag" tag="requires" >requires => <a href="#" >Repo</a></span></li> <li>[recommends => Repo] <span class="metatag" tag="recommends" >recommends => <a href="#" >Repo</a></span></li> <li>[see => URI] <span class="metatag" tag="see">see => <a href="#">URI</a> </span></li> @@ -237,9 +237,9 @@ ## ${h.checkbox('extensions_hggit','True')} ## <label for="extensions_hggit">${_('hg-git extensions')}</label> ##</div> - ##<span class="help-block">${_('Requires hg-git library installed. Allows clonning from git remote locations')}</span> + ##<span class="help-block">${_('Requires hg-git library installed. Allows clonning from git remote locations')}</span> </div> - </div> + </div> <div class="field"> <div class="label"> <label for="paths_root_path">${_('Repositories location')}:</label>
--- a/rhodecode/templates/admin/users/user_edit.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit.html Thu Sep 06 00:10:34 2012 +0200 @@ -152,7 +152,7 @@ <span class="help-block">${h.literal(_('Select to inherit permissions from %s settings. ' 'With this selected below options does not have any action') % h.link_to('default', url('edit_permission', id='default')))}</span> </div> - <div id="inherit_overlay" style="${'opacity:0.3' if c.user.inherit_default_permissions else ''}" > + <div id="inherit_overlay" style="${'opacity:0.3' if c.user.inherit_default_permissions else ''}" > <div class="field"> <div class="label label-checkbox"> <label for="create_repo_perm">${_('Create repositories')}:</label> @@ -169,7 +169,7 @@ ${h.checkbox('fork_repo_perm',value=True)} </div> </div> - </div> + </div> <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")}
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html Thu Sep 06 00:10:34 2012 +0200 @@ -112,7 +112,7 @@ </div> <span class="help-block">${h.literal(_('Select to inherit permissions from %s settings. ' 'With this selected below options does not have any action') % h.link_to('default', url('edit_permission', id='default')))}</span> - </div> + </div> <div id="inherit_overlay" style="${'opacity:0.3' if c.users_group.inherit_default_permissions else ''}" > <div class="field"> <div class="label label-checkbox"> @@ -130,7 +130,7 @@ ${h.checkbox('fork_repo_perm',value=True)} </div> </div> - </div> + </div> <div class="buttons"> ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")}
--- a/rhodecode/templates/email_templates/pull_request.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/email_templates/pull_request.html Thu Sep 06 00:10:34 2012 +0200 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> - -User <b>${pr_user_created}</b> opened pull request for repository + +User <b>${pr_user_created}</b> opened pull request for repository ${pr_repo_url} and wants you to review changes. <div>title: ${pr_title}</div>
--- a/rhodecode/templates/email_templates/pull_request_comment.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/email_templates/pull_request_comment.html Thu Sep 06 00:10:34 2012 +0200 @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> - + User <b>${pr_comment_user}</b> commented on pull request #${pr_id} for repository ${pr_target_repo}
--- a/rhodecode/templates/files/files.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/files/files.html Thu Sep 06 00:10:34 2012 +0200 @@ -47,38 +47,38 @@ var ypjax_links = function(){ YUE.on(YUQ('.ypjax-link'), 'click',function(e){ - + //don't do ypjax on middle click - if(e.which == 2 || !History.enabled){ + if(e.which == 2 || !History.enabled){ return true; } - + var el = e.currentTarget; var url = el.href; var _base_url = '${h.url("files_home",repo_name=c.repo_name,revision='',f_path='')}'; _base_url = _base_url.replace('//','/') - + //extract rev and the f_path from url. parts = url.split(_base_url) if(parts.length != 2){ return false; } - + var parts2 = parts[1].split('/'); var rev = parts2.shift(); // pop the first element which is the revision var f_path = parts2.join('/'); - + var title = "${_('%s files') % c.repo_name}" + " - " + f_path; - + var _node_list_url = node_list_url.replace('__REV__',rev); var _url_base = url_base.replace('__REV__',rev).replace('__FPATH__', f_path); // Change our States and save some data for handling events var data = {url:url,title:title, url_base:_url_base, node_list_url:_node_list_url}; - History.pushState(data, title, url); - + History.pushState(data, title, url); + //now we're sure that we can do ypjax things YUE.preventDefault(e) return false; @@ -92,10 +92,10 @@ // Inform Google Analytics of the change if ( typeof window.pageTracker !== 'undefined' ) { window.pageTracker._trackPageview(State.url); - } + } } -YUE.onDOMReady(function(){ +YUE.onDOMReady(function(){ ypjax_links(); var container = 'files_data'; //Bind to StateChange Event @@ -124,8 +124,8 @@ } }); } - }); - + }); + // init the search filter var _State = { url: "${h.url.current()}",
--- a/rhodecode/templates/files/files_ypjax.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/files/files_ypjax.html Thu Sep 06 00:10:34 2012 +0200 @@ -9,7 +9,7 @@ <%include file='files_browser.html'/> %else: <%include file='files_source.html'/> - %endif + %endif %else: <h2> <a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a>
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Thu Sep 06 00:10:34 2012 +0200 @@ -23,7 +23,7 @@ <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}</div> %endif <h3>${_('Title')}: ${c.pull_request.title}</h3> - + <div class="form"> <div id="summary" class="fields"> <div class="field"> @@ -46,9 +46,9 @@ <div class="input"> <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> </div> - </div> + </div> </div> - </div> + </div> <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div> <div style="padding:4px 4px 10px 20px"> <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div>
--- a/rhodecode/templates/summary/summary.html Thu Sep 06 00:06:39 2012 +0200 +++ b/rhodecode/templates/summary/summary.html Thu Sep 06 00:10:34 2012 +0200 @@ -108,7 +108,7 @@ <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(c.dbrepo.description))}</div> %else: <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.dbrepo.description)}</div> - %endif + %endif </div> <div class="field">