Mercurial > kallithea
changeset 3057:79c5967a1e5c beta
whitespace and formatting
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 03 Dec 2012 02:56:57 +0100 |
| parents | 6104dfd35b16 |
| children | 294413a5f11d |
| files | rhodecode/lib/dbmigrate/schema/db_1_4_0.py rhodecode/lib/vcs/backends/git/changeset.py rhodecode/lib/vcs/utils/lazy.py rhodecode/templates/admin/defaults/defaults.html rhodecode/templates/admin/permissions/permissions.html rhodecode/templates/admin/repos/repo_add_base.html rhodecode/tests/__init__.py rhodecode/tests/functional/test_admin_repos.py |
| diffstat | 8 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py Mon Dec 03 02:56:57 2012 +0100 @@ -1812,4 +1812,3 @@ repository_id = Column('repository_id', String(250), primary_key=True) repository_path = Column('repository_path', Text) version = Column('version', Integer) -
--- a/rhodecode/lib/vcs/backends/git/changeset.py Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/lib/vcs/backends/git/changeset.py Mon Dec 03 02:56:57 2012 +0100 @@ -291,7 +291,7 @@ include = [self.id] walker = Walker(self.repository._repo.object_store, include, paths=[path], max_entries=1) - return [self.repository.get_changeset(sha) + return [self.repository.get_changeset(sha) for sha in (x.commit.id for x in walker)] def get_file_annotate(self, path):
--- a/rhodecode/lib/vcs/utils/lazy.py Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/lib/vcs/utils/lazy.py Mon Dec 03 02:56:57 2012 +0100 @@ -43,4 +43,3 @@ result = obj.__tl_dict__[self.__name__] = self._func(obj) return result -
--- a/rhodecode/templates/admin/defaults/defaults.html Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/templates/admin/defaults/defaults.html Mon Dec 03 02:56:57 2012 +0100 @@ -21,7 +21,7 @@ <div class="title"> ${self.breadcrumbs()} </div> - + <h3>${_('Repositories defaults')}</h3> ${h.form(url('default', id='defaults'),method='put')} @@ -29,7 +29,7 @@ <!-- fields --> <div class="fields"> - + <div class="field"> <div class="label"> <label for="default_repo_type">${_('Type')}:</label> @@ -37,7 +37,7 @@ <div class="input"> ${h.select('default_repo_type','hg',c.backends,class_="medium")} </div> - </div> + </div> <div class="field"> <div class="label label-checkbox"> @@ -86,8 +86,8 @@ </div> </div> ${h.end_form()} - + ##<h3>${_('Groups defaults')}</h3> - + </div> </%def>
--- a/rhodecode/templates/admin/permissions/permissions.html Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/templates/admin/permissions/permissions.html Mon Dec 03 02:56:57 2012 +0100 @@ -61,7 +61,7 @@ <span class="tooltip" title="${h.tooltip(_('All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repositories group will be lost'))}"> ${_('overwrite existing settings')}</span> </label> - + </div> </div> <div class="field">
--- a/rhodecode/templates/admin/repos/repo_add_base.html Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/templates/admin/repos/repo_add_base.html Mon Dec 03 02:56:57 2012 +0100 @@ -12,7 +12,7 @@ ${h.text('repo_name',c.new_repo,class_="small")} %if not h.HasPermissionAll('hg.admin')('repo create form'): ${h.hidden('user_created',True)} - %endif + %endif </div> </div> <div class="field">
--- a/rhodecode/tests/__init__.py Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/tests/__init__.py Mon Dec 03 02:56:57 2012 +0100 @@ -182,5 +182,3 @@ defs.update({'repo_name_full': defs['repo_name']}) return defs - -
--- a/rhodecode/tests/functional/test_admin_repos.py Mon Dec 03 02:55:08 2012 +0100 +++ b/rhodecode/tests/functional/test_admin_repos.py Mon Dec 03 02:56:57 2012 +0100 @@ -26,7 +26,7 @@ self.log_user() repo_name = NEW_HG_REPO description = 'description for newly created repo' - response = self.app.post(url('repos'), + response = self.app.post(url('repos'), _get_repo_create_params(repo_private=False, repo_name=repo_name, repo_description=description)) @@ -262,7 +262,7 @@ repo_name = 'vcs_test_new_to_delete' description = 'description for newly created repo' private = False - response = self.app.post(url('repos'), + response = self.app.post(url('repos'), _get_repo_create_params(repo_private=False, repo_type='git', repo_name=repo_name,