kallithea Changeset - 373ee7031003

Changeset - 373ee7031003

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 15 years ago 2010-11-06 16:14:49
marcin@python-works.com

fixed annotation bug, added history to annotation.
multiple fixes for raw_id length
removed unneded function from index daemon.

4 files changed with 15 insertions and 18 deletions:

rhodecode/controllers/files.py

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/helpers.py

rhodecode/lib/indexers/daemon.py

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ class FilesController(BaseController): @@
     def __before__(self):
         super(FilesController, self).__before__()
         c.file_size_limit = 250 * 1024 #limit of file size to display
     def index(self, repo_name, revision, f_path):
         hg_model = HgModel()
-        c.repo = repo = hg_model.get_repo(c.repo_name)
         c.repo = hg_model.get_repo(c.repo_name)
         revision = request.POST.get('at_rev', None) or revision
         def get_next_rev(cur):
             max_rev = len(c.repo.revisions) - 1
             r = cur + 1
             if r > max_rev:
@@ @@ -65,25 +65,25 @@ class FilesController(BaseController): @@
             return r
         c.f_path = f_path
         try:
             c.changeset = repo.get_changeset(revision)
+            c.changeset = c.repo.get_changeset(revision)
             cur_rev = c.changeset.revision
             prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).raw_id
             next_rev = repo.get_changeset(get_next_rev(cur_rev)).raw_id
             prev_rev = c.repo.get_changeset(get_prev_rev(cur_rev)).raw_id
             next_rev = c.repo.get_changeset(get_next_rev(cur_rev)).raw_id
             c.url_prev = url('files_home', repo_name=c.repo_name,
                              revision=prev_rev, f_path=f_path)
             c.url_next = url('files_home', repo_name=c.repo_name,
                          revision=next_rev, f_path=f_path)
             try:
                 c.files_list = c.changeset.get_node(f_path)
                 c.file_history = self._get_history(repo, c.files_list, f_path)
+                c.file_history = self._get_history(c.repo, c.files_list, f_path)
             except RepositoryError, e:
                 h.flash(str(e), category='warning')
                 redirect(h.url('files_home', repo_name=repo_name, revision=revision))
         except RepositoryError, e:
@@ @@ -111,17 +111,16 @@ class FilesController(BaseController): @@
         return file_node.content
     def annotate(self, repo_name, revision, f_path):
         hg_model = HgModel()
         c.repo = hg_model.get_repo(c.repo_name)
         cs = c.repo.get_changeset(revision)
         c.file = cs.get_node(f_path)
         c.file_msg = cs.get_file_message(f_path)
         c.cur_rev = cs.raw_id
         c.rev_nr = cs.revision
         c.cs = c.repo.get_changeset(revision)
         c.file = c.cs.get_node(f_path)
         c.file_history = self._get_history(c.repo, c.file, f_path)
         c.f_path = f_path
         return render('files/files_annotate.html')
     def archivefile(self, repo_name, revision, fileformat):
         archive_specs = {
@@ @@ -188,13 +187,13 @@ class FilesController(BaseController): @@
                                                     % diff_name
             return diff.raw_diff()
         elif c.action == 'raw':
             response.content_type = 'text/plain'
             return diff.raw_diff()
         elif c.action == 'diff':
             if node1.size > c.file_size_limit or node2.size > c.file_size_limit:
                 c.cur_diff = _('Diff is to big to display')
             else:
                 c.cur_diff = diff.as_html()
         else:

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -85,13 +85,15 @@ def get_hg_ui_settings(): @@
 @task
 @locked_task
 def whoosh_index(repo_location, full_index):
     log = whoosh_index.get_logger()
     from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
     WhooshIndexingDaemon(repo_location=repo_location).run(full_index=full_index)
     index_location = ''
     WhooshIndexingDaemon(index_location=index_location,
                          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 rhodecode.model.db import Statistics, Repository
     log = get_commits_stats.get_logger()

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -268,14 +268,14 @@ def pygmentize_annotation(filenode, **kw @@
         tooltip_html = "<div style='font-size:0.8em'><b>Author:</b>" + \
         " %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>"
         tooltip_html = tooltip_html % (changeset.author,
                                                changeset.date,
                                                tooltip(changeset.message))
         lnk_format = 'r%-5s:%s' % (changeset.revision,
                                  changeset.raw_id)
         lnk_format = '%5s:%s' % ('r%s' % changeset.revision,
                                  short_id(changeset.raw_id))
         uri = link_to(
                 lnk_format,
                 url('changeset_home', repo_name=changeset.repository.name,
                     revision=changeset.raw_id),
                 style=get_color_string(changeset.raw_id),
                 class_='tooltip',

rhodecode/lib/indexers/daemon.py

➞

Show inline comments

@@ @@ -58,16 +58,12 @@ formatter = logging.Formatter("%(asctime @@
 # add formatter to ch
 ch.setFormatter(formatter)
 # add ch to logger
 log.addHandler(ch)
 def get_repos_location():
     return HgModel.get_repos_location()
 class WhooshIndexingDaemon(object):
     """
     Deamon for atomic jobs
     """
     def __init__(self, indexname='HG_INDEX', index_location=None,

0 comments (0 inline, 0 general)