kallithea Changeset - 61c5f0ab24b9

Changeset - 61c5f0ab24b9

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-03-01 10:05:43
marcin@python-works.com

Added branch filter to repo pager
fixed stop condition for building statistics

2 files changed with 9 insertions and 5 deletions:

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/helpers.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -112,18 +112,21 @@ def get_commits_stats(repo_name, ts_min_ @@
     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:
     if cur_stats is not None:
         last_rev = cur_stats.stat_on_revision
     #return if repo is empty
     if not repo.revisions:
         return True
-    if last_rev == repo.revisions[-1] and len(repo.revisions) > 1:
+    if last_rev == repo.get_changeset().revision and len(repo.revisions) > 1:
         #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(

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -581,13 +581,13 @@ def gravatar_url(email_address, size=30) @@
 #==============================================================================
 # REPO PAGER
 #==============================================================================
 class RepoPage(Page):
     def __init__(self, collection, page=1, items_per_page=20,
         item_count=None, url=None, **kwargs):
+        item_count=None, url=None, branch_name=None, **kwargs):
         """Create a "RepoPage" instance. special pager for paging
         repository
         """
         self._url_generator = url
@@ @@ -627,17 +627,18 @@ class RepoPage(Page): @@
             elif self.page < self.first_page:
                 self.page = self.first_page
             # Note: the number of items on this page can be less than
             #       items_per_page if the last page is not full
             self.first_item = max(0, (self.item_count) - (self.page * items_per_page))
-            self.last_item = ((self.item_count - 1) - items_per_page * (self.page - 1)) + 1
             self.last_item = ((self.item_count - 1) - items_per_page * (self.page - 1))
             iterator = self.collection.get_changesets(start=self.first_item,
                                                       end=self.last_item,
                                                       reverse=True)
                                                       reverse=True,
                                                       branch_name=branch_name)
             self.items = list(iterator)
             # Links to previous and next page
             if self.page > self.first_page:
                 self.previous_page = self.page - 1
             else:

0 comments (0 inline, 0 general)