##// END OF EJS Templates
whitespace and formatting
marcink -
r3057:79c5967a beta
parent child Browse files
Show More
@@ -1812,4 +1812,3 b' class DbMigrateVersion(Base, BaseModel):'
1812 repository_id = Column('repository_id', String(250), primary_key=True)
1812 repository_id = Column('repository_id', String(250), primary_key=True)
1813 repository_path = Column('repository_path', Text)
1813 repository_path = Column('repository_path', Text)
1814 version = Column('version', Integer)
1814 version = Column('version', Integer)
1815
@@ -291,7 +291,7 b' class GitChangeset(BaseChangeset):'
291 include = [self.id]
291 include = [self.id]
292 walker = Walker(self.repository._repo.object_store, include,
292 walker = Walker(self.repository._repo.object_store, include,
293 paths=[path], max_entries=1)
293 paths=[path], max_entries=1)
294 return [self.repository.get_changeset(sha)
294 return [self.repository.get_changeset(sha)
295 for sha in (x.commit.id for x in walker)]
295 for sha in (x.commit.id for x in walker)]
296
296
297 def get_file_annotate(self, path):
297 def get_file_annotate(self, path):
@@ -43,4 +43,3 b' class ThreadLocalLazyProperty(LazyProper'
43
43
44 result = obj.__tl_dict__[self.__name__] = self._func(obj)
44 result = obj.__tl_dict__[self.__name__] = self._func(obj)
45 return result
45 return result
46
@@ -21,7 +21,7 b''
21 <div class="title">
21 <div class="title">
22 ${self.breadcrumbs()}
22 ${self.breadcrumbs()}
23 </div>
23 </div>
24
24
25 <h3>${_('Repositories defaults')}</h3>
25 <h3>${_('Repositories defaults')}</h3>
26
26
27 ${h.form(url('default', id='defaults'),method='put')}
27 ${h.form(url('default', id='defaults'),method='put')}
@@ -29,7 +29,7 b''
29 <!-- fields -->
29 <!-- fields -->
30
30
31 <div class="fields">
31 <div class="fields">
32
32
33 <div class="field">
33 <div class="field">
34 <div class="label">
34 <div class="label">
35 <label for="default_repo_type">${_('Type')}:</label>
35 <label for="default_repo_type">${_('Type')}:</label>
@@ -37,7 +37,7 b''
37 <div class="input">
37 <div class="input">
38 ${h.select('default_repo_type','hg',c.backends,class_="medium")}
38 ${h.select('default_repo_type','hg',c.backends,class_="medium")}
39 </div>
39 </div>
40 </div>
40 </div>
41
41
42 <div class="field">
42 <div class="field">
43 <div class="label label-checkbox">
43 <div class="label label-checkbox">
@@ -86,8 +86,8 b''
86 </div>
86 </div>
87 </div>
87 </div>
88 ${h.end_form()}
88 ${h.end_form()}
89
89
90 ##<h3>${_('Groups defaults')}</h3>
90 ##<h3>${_('Groups defaults')}</h3>
91
91
92 </div>
92 </div>
93 </%def>
93 </%def>
@@ -61,7 +61,7 b''
61 <span class="tooltip"
61 <span class="tooltip"
62 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'))}">
62 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'))}">
63 ${_('overwrite existing settings')}</span> </label>
63 ${_('overwrite existing settings')}</span> </label>
64
64
65 </div>
65 </div>
66 </div>
66 </div>
67 <div class="field">
67 <div class="field">
@@ -12,7 +12,7 b''
12 ${h.text('repo_name',c.new_repo,class_="small")}
12 ${h.text('repo_name',c.new_repo,class_="small")}
13 %if not h.HasPermissionAll('hg.admin')('repo create form'):
13 %if not h.HasPermissionAll('hg.admin')('repo create form'):
14 ${h.hidden('user_created',True)}
14 ${h.hidden('user_created',True)}
15 %endif
15 %endif
16 </div>
16 </div>
17 </div>
17 </div>
18 <div class="field">
18 <div class="field">
@@ -182,5 +182,3 b' def _get_repo_create_params(**custom):'
182 defs.update({'repo_name_full': defs['repo_name']})
182 defs.update({'repo_name_full': defs['repo_name']})
183
183
184 return defs
184 return defs
185
186
@@ -26,7 +26,7 b' class TestAdminReposController(TestContr'
26 self.log_user()
26 self.log_user()
27 repo_name = NEW_HG_REPO
27 repo_name = NEW_HG_REPO
28 description = 'description for newly created repo'
28 description = 'description for newly created repo'
29 response = self.app.post(url('repos'),
29 response = self.app.post(url('repos'),
30 _get_repo_create_params(repo_private=False,
30 _get_repo_create_params(repo_private=False,
31 repo_name=repo_name,
31 repo_name=repo_name,
32 repo_description=description))
32 repo_description=description))
@@ -262,7 +262,7 b' class TestAdminReposController(TestContr'
262 repo_name = 'vcs_test_new_to_delete'
262 repo_name = 'vcs_test_new_to_delete'
263 description = 'description for newly created repo'
263 description = 'description for newly created repo'
264 private = False
264 private = False
265 response = self.app.post(url('repos'),
265 response = self.app.post(url('repos'),
266 _get_repo_create_params(repo_private=False,
266 _get_repo_create_params(repo_private=False,
267 repo_type='git',
267 repo_type='git',
268 repo_name=repo_name,
268 repo_name=repo_name,
General Comments 0
You need to be logged in to leave comments. Login now