kallithea Changeset - 36f839886e0d

Changeset - 36f839886e0d

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 4 0

Marcin Kuzminski - 15 years ago 2010-11-05 18:39:09
marcin@python-works.com

merge

4 files changed with 13 insertions and 12 deletions:

rhodecode/lib/utils.py

rhodecode/model/repo.py

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -333,32 +333,27 @@ def repo2db_mapper(initial_repo_list, re @@
     """
     maps all found repositories into db
     """
     sa = meta.Session()
     rm = RepoModel(sa)
     user = sa.query(User).filter(User.admin == True).first()
     for name, repo in initial_repo_list.items():
         if not rm.get(name, cache=False):
             log.info('repository %s not found creating default', name)
             if isinstance(repo, MercurialRepository):
                 repo_type = 'hg'
             if isinstance(repo, GitRepository):
                 repo_type = 'git'
             form_data = {
                          'repo_name':name,
-                         'repo_type':repo_type,
+                         'repo_type':repo.alias,
                          'description':repo.description if repo.description != 'unknown' else \
                                         'auto description for %s' % name,
                          'private':False
+                         }
             rm.create(form_data, user, just_db=True)
     if remove_obsolete:
         #remove from database those repositories that are not in the filesystem
         for repo in sa.query(Repository).all():
             if repo.repo_name not in initial_repo_list.keys():
                 sa.delete(repo)

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -102,24 +102,25 @@ class RepoModel(object): @@
                 #rename our data
                 self.__rename_repo(repo_name, form_data['repo_name'])
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def create(self, form_data, cur_user, just_db=False, fork=False):
         try:
             if fork:
                 #force str since hg doesn't go with unicode
                 repo_name = str(form_data['fork_name'])
                 org_name = str(form_data['repo_name'])
             else:
                 org_name = repo_name = str(form_data['repo_name'])
             new_repo = Repository()
             for k, v in form_data.items():
                 if k == 'repo_name':
                     v = repo_name
                 setattr(new_repo, k, v)
             if fork:

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1533,43 +1533,45 @@ background:#BFB; @@
+}
 .right .changes .changed {
 background:#FD8;
+}
 .right .changes .removed {
 background:#F88;
+}
 .right .merge {
 vertical-align:top;
-font-size:60%;
+font-size:0.75em;
 font-weight:700;
+}
 .right .parent {
 font-size:90%;
 font-family:monospace;
+}
 .right .logtags .branchtag {
 background:#FFF url("../images/icons/arrow_branch.png") no-repeat right 6px;
 display:block;
 padding:8px 16px 0 0;
 font-size:0.8em;
 padding:11px 16px 0 0;
+}
 .right .logtags .tagtag {
 background:#FFF url("../images/icons/tag_blue.png") no-repeat right 6px;
 display:block;
 padding:6px 18px 0 0;
 font-size:0.8em;
 padding:11px 16px 0 0;
+}
 div.browserblock {
 overflow:hidden;
 border:1px solid #ccc;
 background:#f8f8f8;
 font-size:100%;
 line-height:125%;
 padding:0;
+}
 div.browserblock .browser-header {

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -49,27 +49,30 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 							<div class="date">${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
 								</div>
 								<span>${h.person(cs.author)}</span><br/>
 								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 							</div>
 							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 						</div>
 						<div class="right">
 									<div class="changes">
 										<span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
 										<span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
 										<span class="added" title="${_('added')}">${len(cs.added)}</span>
 										<span class="removed" title="${_('removed')}: ${' | '.join([x.name for x in cs.removed])}">
 										${len(cs.removed)}</span>
 										<span class="changed" title="${_('changed')}: ${' | '.join([x.name for x in cs.changed])}">
 										${len(cs.changed)}</span>
 										<span class="added" title="${_('added')}: ${' | '.join([x.name for x in cs.added])}">
 										${len(cs.added)}</span>
 									</div>
 										%if len(cs.parents)>1:
 										<div class="merge">
 											${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
 										</div>
 										%endif
 								   %if cs.parents:
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
 										</div>
 									%endfor

0 comments (0 inline, 0 general)