kallithea Changeset - 370ed7829168

Changeset - 370ed7829168

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2012-07-14 19:09:35
marcin@python-works.com

Readme renderer now uses landing_rev parameter to render the readme based on
given revision, rather than tip

4 files changed with 18 insertions and 6 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/summary.py

rhodecode/model/db.py

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -208,12 +208,16 @@ class ReposController(BaseController): @@
         #    h.form(url('repo', repo_name=ID),
         #           method='put')
         # url('repo', repo_name=ID)
         self.__load_defaults()
         repo_model = RepoModel()
         changed_name = repo_name
         #override the choices with extracted revisions !
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo_name)
         c.landing_revs_choices = choices
         _form = RepoForm(edit=True, old_data={'repo_name': repo_name},
                          repo_groups=c.repo_groups_choices,
                          landing_revs=c.landing_revs_choices)()
         try:
             form_result = _form.to_python(dict(request.POST))
             repo = repo_model.update(repo_name, form_result)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -177,26 +177,27 @@ class SummaryController(BaseRepoControll @@
             c.no_data = True
         c.enable_downloads = dbrepo.enable_downloads
         if c.enable_downloads:
             c.download_options = self._get_download_links(c.rhodecode_repo)
         c.readme_data, c.readme_file = self.__get_readme_data(
             c.rhodecode_db_repo.repo_name, c.rhodecode_repo
+        )
         c.readme_data, c.readme_file = \
             self.__get_readme_data(c.rhodecode_db_repo)
         return render('summary/summary.html')
     def __get_readme_data(self, repo_name, repo):
     def __get_readme_data(self, db_repo):
         repo_name = db_repo.repo_name
         @cache_region('long_term')
         def _get_readme_from_cache(key):
             readme_data = None
             readme_file = None
             log.debug('Fetching readme file')
             try:
                 cs = repo.get_changeset()  # fetches TIP
                 # get's the landing revision! or tip if fails
                 cs = db_repo.get_landing_changeset()
                 renderer = MarkupRenderer()
                 for f in README_FILES:
                     try:
                         readme = cs.get_node(f)
                         if not isinstance(readme, FileNode):
                             continue

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -774,12 +774,19 @@ class Repository(Base, BaseModel): @@
     # SCM PROPERTIES
     #==========================================================================
     def get_changeset(self, rev=None):
         return get_changeset_safe(self.scm_instance, rev)
     def get_landing_changeset(self):
         """
         Returns landing changeset, or if that doesn't exist returns the tip
         """
         cs = self.get_changeset(self.landing_rev) or self.get_changeset()
         return cs
     @property
     def tip(self):
         return self.get_changeset('tip')
     @property
     def author(self):

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -223,13 +223,13 @@ @@
         </div>
     </div>
 </div>
 %if c.readme_data:
 <div id="readme" class="box header-pos-fix" style="background-color: #FAFAFA">
     <div id="readme" class="title">
+    <div id="readme" class="title" title="${_("Readme file at revision '%s'" % c.rhodecode_db_repo.landing_rev)}">
         <div class="breadcrumbs"><a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a></div>
     </div>
     <div id="readme" class="readme">
       <div class="readme_box">
         ${c.readme_data|n}
       </div>

0 comments (0 inline, 0 general)