diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -395,7 +395,7 @@ class ChangesetController(BaseRepoContro # 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: diff --git a/rhodecode/lib/compat.py b/rhodecode/lib/compat.py --- a/rhodecode/lib/compat.py +++ b/rhodecode/lib/compat.py @@ -589,6 +589,3 @@ else: self.__cond.wait(timeout) finally: self.__cond.release() - - - diff --git a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py --- a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py +++ b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py @@ -1317,4 +1317,4 @@ class PullRequest(Base, BaseModel): 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) diff --git a/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py b/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py --- a/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py +++ b/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py @@ -49,7 +49,7 @@ def upgrade(migrate_engine): 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() diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -206,7 +206,7 @@ def get_repos(path, recursive=False): 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: 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 @@ -15,4 +15,4 @@ from mercurial.encoding import tolocal 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 diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py --- a/rhodecode/model/forms.py +++ b/rhodecode/model/forms.py @@ -340,4 +340,4 @@ def PullRequestForm(): 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 diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html --- a/rhodecode/templates/admin/repos/repo_edit.html +++ b/rhodecode/templates/admin/repos/repo_edit.html @@ -115,7 +115,7 @@ ${h.checkbox('enable_locking',value="True")} ${_('Enable lock-by-pulling on repository.')} - +
@@ -193,7 +193,7 @@
  • ${_('Manually invalidate cache for this repository. On first access repository will be cached again')}
    • -
    +
    ${_('List of cached values')} -
    + ${h.end_form()} @@ -243,7 +243,7 @@
  • ${_('Force locking on repository. Works only when anonymous access is disabled')}
    • - + ${h.end_form()} @@ -259,9 +259,9 @@
  • ${_('''Manually set this repository as a fork of another from the list''')}
    • - + ${h.end_form()} - +

    ${_('Delete')}

    ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')}
    @@ -276,7 +276,7 @@
    - ${h.end_form()} + ${h.end_form()} diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -74,8 +74,8 @@ \ \ '""") - %> - ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' + %> + ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' diff --git a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html --- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html +++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html @@ -58,8 +58,8 @@ \ \ '""") - %> - ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' + %> + ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl' diff --git a/rhodecode/templates/admin/repos_groups/repos_groups.html b/rhodecode/templates/admin/repos_groups/repos_groups.html --- a/rhodecode/templates/admin/repos_groups/repos_groups.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups.html @@ -5,7 +5,7 @@ <%def name="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))} diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html @@ -69,7 +69,7 @@ ${h.checkbox('enable_locking',value="True")} ${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')} - +
    ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -154,7 +154,7 @@
  • [stale] stale
  • [dead] dead
  • [lang => lang] lang
    • -
  • [license => License] License
    • +
  • [license => License] License
  • [requires => Repo] requires => Repo
  • [recommends => Repo] recommends => Repo
  • [see => URI] see => URI
    • @@ -237,9 +237,9 @@ ## ${h.checkbox('extensions_hggit','True')} ## ##
    - ##${_('Requires hg-git library installed. Allows clonning from git remote locations')} + ##${_('Requires hg-git library installed. Allows clonning from git remote locations')} - +
    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 @@ -152,7 +152,7 @@ ${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')))}
    -
    +
    @@ -169,7 +169,7 @@ ${h.checkbox('fork_repo_perm',value=True)}
    -
    +
    ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -112,7 +112,7 @@
    ${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')))} -
    +
    @@ -130,7 +130,7 @@ ${h.checkbox('fork_repo_perm',value=True)}
    -
    +
    ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} diff --git a/rhodecode/templates/email_templates/pull_request.html b/rhodecode/templates/email_templates/pull_request.html --- a/rhodecode/templates/email_templates/pull_request.html +++ b/rhodecode/templates/email_templates/pull_request.html @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> - -User ${pr_user_created} opened pull request for repository + +User ${pr_user_created} opened pull request for repository ${pr_repo_url} and wants you to review changes.
    title: ${pr_title}
    diff --git a/rhodecode/templates/email_templates/pull_request_comment.html b/rhodecode/templates/email_templates/pull_request_comment.html --- a/rhodecode/templates/email_templates/pull_request_comment.html +++ b/rhodecode/templates/email_templates/pull_request_comment.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> - + User ${pr_comment_user} commented on pull request #${pr_id} for repository ${pr_target_repo} diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html --- a/rhodecode/templates/files/files.html +++ b/rhodecode/templates/files/files.html @@ -47,38 +47,38 @@ var url_base = '${h.url("files_nodelist_ 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 @@ var callbacks = function(State){ // 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 @@ YUE.onDOMReady(function(){ } }); } - }); - + }); + // init the search filter var _State = { url: "${h.url.current()}", diff --git a/rhodecode/templates/files/files_ypjax.html b/rhodecode/templates/files/files_ypjax.html --- a/rhodecode/templates/files/files_ypjax.html +++ b/rhodecode/templates/files/files_ypjax.html @@ -9,7 +9,7 @@ <%include file='files_browser.html'/> %else: <%include file='files_source.html'/> - %endif + %endif %else:

    ${_('Go back')} 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 @@ -23,7 +23,7 @@
    ${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}
    %endif

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

    - +
    @@ -46,9 +46,9 @@
    ${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}
    -
    +
    -
    +
    ${h.literal(c.pull_request.description)}
    ${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}
    diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -108,7 +108,7 @@
    ${h.urlify_text(h.desc_stylize(c.dbrepo.description))}
    %else:
    ${h.urlify_text(c.dbrepo.description)}
    - %endif + %endif
    diff --git a/rhodecode/tests/models/test_permissions.py b/rhodecode/tests/models/test_permissions.py --- a/rhodecode/tests/models/test_permissions.py +++ b/rhodecode/tests/models/test_permissions.py @@ -435,4 +435,3 @@ class TestPermissions(unittest.TestCase) set(['hg.create.repository', 'hg.fork.repository', 'hg.register.manual_activate', 'repository.read'])) -