kallithea Changeset - b50e79b4257a

Changeset - b50e79b4257a

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Marcin Kuzminski - 15 years ago 2010-09-28 21:53:52
marcin@python-works.com

fixes to pidlock, to not raise unneded execptions
few fixes in templating for empty repository to not show some labels, fixed tag/branch switcher

6 files changed with 35 insertions and 11 deletions:

pylons_app/lib/celerylib/tasks.py

pylons_app/lib/pidlock.py

pylons_app/templates/base/base.html

pylons_app/templates/index.html

pylons_app/templates/shortlog/shortlog_data.html

pylons_app/templates/summary/summary.html

0 comments (0 inline, 0 general)

pylons_app/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -64,64 +64,67 @@ def get_hg_ui_settings(): @@
         settings[each.ui_section + '_' + k] = v
     return settings
 @task
 @locked_task
 def whoosh_index(repo_location, full_index):
     log = whoosh_index.get_logger()
     from pylons_app.lib.indexers.daemon import WhooshIndexingDaemon
     WhooshIndexingDaemon(repo_location=repo_location).run(full_index=full_index)
 @task
 @locked_task
 def get_commits_stats(repo_name, ts_min_y, ts_max_y):
     from pylons_app.model.db import Statistics, Repository
     log = get_commits_stats.get_logger()
     author_key_cleaner = lambda k: person(k).replace('"', "") #for js data compatibilty
     commits_by_day_author_aggregate = {}
     commits_by_day_aggregate = {}
     repos_path = get_hg_ui_settings()['paths_root_path'].replace('*', '')
     repo = MercurialRepository(repos_path + repo_name)
     skip_date_limit = True
     parse_limit = 350 #limit for single task changeset parsing
+    parse_limit = 350 #limit for single task changeset parsing optimal for
     last_rev = 0
     last_cs = None
     timegetter = itemgetter('time')
     sa = get_session()
     dbrepo = sa.query(Repository)\
         .filter(Repository.repo_name == repo_name).scalar()
     cur_stats = sa.query(Statistics)\
         .filter(Statistics.repository == dbrepo).scalar()
     if cur_stats:
         last_rev = cur_stats.stat_on_revision
     if not repo.revisions:
         return True
     if last_rev == repo.revisions[-1] and len(repo.revisions) > 1:
         #pass silently without any work
         #pass silently without any work if we're not on first revision or current
         #state of parsing revision(from db marker) is the last revision
         return True
     if cur_stats:
         commits_by_day_aggregate = OrderedDict(
                                        json.loads(
                                         cur_stats.commit_activity_combined))
         commits_by_day_author_aggregate = json.loads(cur_stats.commit_activity)
     log.debug('starting parsing %s', parse_limit)
     for cnt, rev in enumerate(repo.revisions[last_rev:]):
         last_cs = cs = repo.get_changeset(rev)
         k = '%s-%s-%s' % (cs.date.timetuple()[0], cs.date.timetuple()[1],
                           cs.date.timetuple()[2])
         timetupple = [int(x) for x in k.split('-')]
         timetupple.extend([0 for _ in xrange(6)])
         k = mktime(timetupple)
         if commits_by_day_author_aggregate.has_key(author_key_cleaner(cs.author)):
             try:
                 l = [timegetter(x) for x in commits_by_day_author_aggregate\
                         [author_key_cleaner(cs.author)]['data']]
                 time_pos = l.index(k)
             except ValueError:
                 time_pos = False

pylons_app/lib/pidlock.py

➞

Show inline comments

@@ @@ -53,49 +53,50 @@ class DaemonLock(object): @@
     def trylock(self):
         running_pid = False
         if self.debug:
             print 'checking for already running process'
         try:
             pidfile = open(self.pidfile, "r")
             pidfile.seek(0)
             running_pid = int(pidfile.readline())
             pidfile.close()
             if self.debug:
                 print 'lock file present running_pid: %s, checking for execution'\
                 % running_pid
             # Now we check the PID from lock file matches to the current
             # process PID
             if running_pid:
                 try:
                     os.kill(running_pid, 0)
                 except OSError, exc:
                     if exc.errno in (errno.ESRCH, errno.EPERM):
                         print "Lock File is there but the program is not running"
                         print "Removing lock file for the: %s" % running_pid
                         self.release()
                     raise
                     else:
                         raise
                 else:
                     print "You already have an instance of the program running"
                     print "It is running as process %s" % running_pid
                     raise LockHeld()
         except IOError, e:
             if e.errno != 2:
                 raise
     def release(self):
         """releases the pid by removing the pidfile
         """
         if self.debug:
             print 'trying to release the pidlock'
         if self.callbackfn:
             #execute callback function on release
             if self.debug:
                 print 'executing callback function %s' % self.callbackfn
             self.callbackfn()
         try:
             if self.debug:
                 print 'removing pidfile %s' % self.pidfile
             os.remove(self.pidfile)

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -122,59 +122,67 @@ @@
                    </span>
                    <span>${_('Shortlog')}</span>
                    </a>
                 </li>
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/time.png" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>
                    </a>
                 </li>
                 <li ${is_current('switch_to')}>
                    <a title="${_('Switch to')}" href="#">
                    <span class="icon">
                        <img src="/images/icons/arrow_switch.png" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul>
                         <li>
                             ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
 						            <li>${h.link_to('%s - %s' % (branch[0],branch[1]),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
 						    %endif
                             </ul>
                         </li>
                         <li>
                             ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
                                  <li>${h.link_to('%s - %s' % (tag[0],tag[1]),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
                             %endif
                             </ul>
                         </li>
                     </ul>
                 </li>
                 <li ${is_current('files')}>
                    <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/file.png" alt="${_('Files')}" />
                    </span>
                    <span>${_('Files')}</span>
                    </a>
                 </li>
 				%if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                 <li ${is_current('settings')}>
                    <a title="${_('Settings')}" href="${h.url('repo_settings_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/cog_edit.png" alt="${_('Settings')}" />
                    </span>
                    <span>${_('Settings')}</span>
                    </a>
                 </li>
 				%endif
 	        </ul>
 		%else:

pylons_app/templates/index.html

➞

Show inline comments

@@ @@ -43,43 +43,49 @@ @@
 	            <tr>
 			        <th class="left">${get_sort(_('Name'))}</th>
 			        <th class="left">${get_sort(_('Description'))}</th>
 			        <th class="left">${get_sort(_('Last change'))}</th>
 			        <th class="left">${get_sort(_('Tip'))}</th>
 			        <th class="left">${get_sort(_('Contact'))}</th>
 			        <th class="left">${_('RSS')}</th>
 			        <th class="left">${_('Atom')}</th>
 	            </tr>
             </thead>
                         <tbody>
 					    %for cnt,repo in enumerate(c.repos_list):
 					        %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(repo['name'],'main page check'):
 					        <tr class="parity${cnt%2}">
 					            <td>
 					             %if repo['repo'].dbrepo.private:
 					                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
 					             %else:
 					                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 					             %endif
 					            ${h.link_to(repo['name'],
 					                h.url('summary_home',repo_name=repo['name']))}</td>
 					            <td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 					            <td>${h.age(repo['last_change'])}</td>
 					            <td>${h.link_to_if(repo['rev']>=0,'r%s:%s' % (repo['rev'],repo['tip']),
 					            <td>
 					            	%if repo['rev']>=0:
 					            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
 					                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 					                class_="tooltip",
 					                tooltip_title=h.tooltip(repo['last_msg']))}</td>
 					                tooltip_title=h.tooltip(repo['last_msg']))}
 					            	%else:
 					            		${_('No changesets yet')}
 					            	%endif
 					            </td>
 					            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
 					            <td>
 					                <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>
 					            </td>
 					            <td>
 					                <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>
 					            </td>
 					        </tr>
 					        %endif
 					    %endfor
                         </tbody>
                     </table>
             </div>
     </div>
 </%def>

pylons_app/templates/shortlog/shortlog_data.html

➞

Show inline comments

@@ @@ -17,47 +17,47 @@ @@
 		<td title="${cs.author}">${h.person(cs.author)}</td>
 		<td>r${cs.revision}:${cs.raw_id}</td>
 		<td>
 			${h.link_to(h.truncate(cs.message,60),
 			h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
 			title=cs.message)}
 		</td>
 		<td>
 			<span class="logtags">
 				<span class="branchtag">${cs.branch}</span>
 			</span>
 		</td>
 		<td>
 			<span class="logtags">
 				%for tag in cs.tags:
 					<span class="tagtag">${tag}</span>
 				%endfor
 			</span>
 		</td>
 		<td class="nowrap">
 		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+		|
 		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
 		</td>
-	</tr>
 	</tr>
 %endfor
 </table>
 <script type="text/javascript">
   var data_div = 'shortlog_data';
   YAHOO.util.Event.onDOMReady(function(){
     YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
             YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});});
 </script>
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next',
 onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{
 success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText;
 YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
         YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});
 YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}
 </div>
 %else:
-    ${_('There are no commits yet')}
+    ${_('There are no changes yet')}
 %endif

pylons_app/templates/summary/summary.html

➞

Show inline comments

@@ @@ -115,49 +115,49 @@ E.onDOMReady(function(e){ @@
 						var value = data[k];
 				  		var td1 = document.createElement('td');
 				  		td1.width=150;
 				  		var trending_language_label = document.createElement('div');
 				  		trending_language_label.innerHTML = k;
 				  		td1.appendChild(trending_language_label);
 				  		var td2 = document.createElement('td');
 			  		    var trending_language = document.createElement('div');
 			  		    trending_language.title = k;
 			  		    trending_language.innerHTML = "<b>"+value+" ${_('files')} - "+percentage+" %</b>";
 			  		    trending_language.setAttribute("class", 'trending_language');
 			  		    trending_language.style.width=percentage+"%";
 						td2.appendChild(trending_language);
 						tr.appendChild(td1);
 						tr.appendChild(td2);
 			  		    tbl.appendChild(tr);
  				  		//YAHOO.util.Dom.get('lang_stats').appendChild(trending_language_label);
+			  		}
 			  		if(no_data){
 			  			var tr = document.createElement('tr');
 			  			var td1 = document.createElement('td');
-			  			td1.innerHTML = "${_('No data loaded yet...')}";
 			  			td1.innerHTML = "${_('No data loaded yet')}";
 			  			tr.appendChild(td1);
 			  			tbl.appendChild(tr);
+					}
 			  		YAHOO.util.Dom.get('lang_stats').appendChild(tbl);
 			  	</script>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
 			  <div class="input-short">
 		        %for cnt,archive in enumerate(c.repo_info._get_archives()):
 		             %if cnt >=1:
+		             |
 		             %endif
 		             ${h.link_to(c.repo_info.name+'.'+archive['type'],
 		                h.url('files_archive_home',repo_name=c.repo_info.name,
 		                revision='tip',fileformat=archive['extension']),class_="archive_icon")}
 		        %endfor
 			  </div>
 			 </div>
@@ @@ -517,47 +517,53 @@ E.onDOMReady(function(e){ @@
 			overview.setSelection(initial_ranges);
 		    plot.subscribe("plotselected", plotselected);
 		    overview.subscribe("plotselected", function (ranges) {
 		        plot.setSelection(ranges);
 		    });
 		    plot.subscribe("plothover", plothover);
 		    YAHOO.util.Event.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]);
+		}
 			SummaryPlot(${c.ts_min},${c.ts_max},${c.commit_data|n},${c.overview_data|n});
 		</script>
     </div>
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Last ten changes'),h.url('changelog_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <%include file='../shortlog/shortlog_data.html'/>
         ${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
         %if c.repo_changesets:
         	${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
         %endif
     </div>
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Last ten tags'),h.url('tags_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <%include file='../tags/tags_data.html'/>
         ${h.link_to(_('show more'),h.url('tags_home',repo_name=c.repo_name))}
         %if c.repo_changesets:
         	${h.link_to(_('show more'),h.url('tags_home',repo_name=c.repo_name))}
         %endif
     </div>
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Last ten branches'),h.url('branches_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <%include file='../branches/branches_data.html'/>
         ${h.link_to(_('show more'),h.url('branches_home',repo_name=c.repo_name))}
         %if c.repo_changesets:
         	${h.link_to(_('show more'),h.url('branches_home',repo_name=c.repo_name))}
         %endif
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)