Changeset - 432e86d1e555
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich - 13 years ago 2013-06-12 02:13:02
madski@unity3d.com
repo context bar: preserve current revision when navigating between changelog, changeset and file view
6 files changed with 26 insertions and 9 deletions:
kallithea/controllers/changelog.py
7
2
kallithea/controllers/files.py
1
1
kallithea/templates/base/base.html
7
2
kallithea/templates/changelog/changelog.html
9
2
kallithea/templates/changeset/changeset.html
1
1
kallithea/templates/files/files.html
1
1
0 comments (0 inline, 0 general)
kallithea/controllers/changelog.py
➞
Show inline comments
 
@@ -136,73 +136,78 @@ class ChangelogController(BaseRepoContro
 
            c.size = int(session.get('changelog_size', default))
 
        # min size must be 1
 
        c.size = max(c.size, 1)
 
        p = safe_int(request.GET.get('page', 1), 1)
 
        branch_name = request.GET.get('branch', None)
 
        if (branch_name and
 
            branch_name not in c.db_repo_scm_instance.branches and
 
            branch_name not in c.db_repo_scm_instance.closed_branches and
 
            not revision):
 
            return redirect(url('changelog_file_home', repo_name=c.repo_name,
 
                                    revision=branch_name, f_path=f_path or ''))
 

			




	
	
	
		
 
        if revision == 'tip':

			




	
	
	
		
 
            revision = None

			




	
	
	
		
 

			




	
	
	
		
 
        c.changelog_for_path = f_path

			




	
	
	
		
 
        try:

			




	
	
	
		
 

			




	
	
	
		
 
            if f_path:

			




	
	
	
		
 
                log.debug('generating changelog for path %s' % f_path)

			




	
	
	
		
 
                # get the history for the file !

			




	
	
	
		
 
                tip_cs = c.db_repo_scm_instance.get_changeset()

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    collection = tip_cs.get_file_history(f_path)

			




	
	
	
		
 
                except (NodeDoesNotExistError, ChangesetError):

			




	
	
	
		
 
                    #this node is not present at tip !

			




	
	
	
		
 
                    try:

			




	
	
	
		
 
                        cs = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
                        collection = cs.get_file_history(f_path)

			




	
	
	
		
 
                    except RepositoryError, e:

			




	
	
	
		
 
                        h.flash(safe_str(e), category='warning')

			




	
	
	
		
 
                        redirect(h.url('changelog_home', repo_name=repo_name))

			




	
	
	
		
 
                collection = list(reversed(collection))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                collection = c.db_repo_scm_instance.get_changesets(start=0,

			




	
	
	
		
 
                collection = c.db_repo_scm_instance.get_changesets(start=0, end=revision,

			




	
	
	
		
 
                                                        branch_name=branch_name)

			




	
	
	
		
 
            c.total_cs = len(collection)

			




	
	
	
		
 

			




	
	
	
		
 
            c.pagination = RepoPage(collection, page=p, item_count=c.total_cs,

			




	
	
	
		
 
                                    items_per_page=c.size, branch=branch_name,)

			




	
	
	
		
 
            collection = list(c.pagination)

			




	
	
	
		
 

			




	
	
	
		
 
            page_revisions = [x.raw_id for x in c.pagination]

			




	
	
	
		
 
            c.comments = c.db_repo.get_comments(page_revisions)

			




	
	
	
		
 
            c.statuses = c.db_repo.statuses(page_revisions)

			




	
	
	
		
 
        except (EmptyRepositoryError), e:

			




	
	
	
		
 
            h.flash(safe_str(e), category='warning')

			




	
	
	
		
 
            return redirect(url('summary_home', repo_name=c.repo_name))

			




	
	
	
		
 
        except (RepositoryError, ChangesetDoesNotExistError, Exception), e:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            h.flash(safe_str(e), category='error')

			




	
	
	
		
 
            return redirect(url('changelog_home', repo_name=c.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        c.branch_name = branch_name

			




	
	
	
		
 
        c.branch_filters = [('', _('All Branches'))] + \

			




	
	
	
		
 
            [(k, k) for k in c.db_repo_scm_instance.branches.keys()]

			




	
	
	
		
 
        if c.db_repo_scm_instance.closed_branches:

			




	
	
	
		
 
            prefix = _('(closed)') + ' '

			




	
	
	
		
 
            c.branch_filters += [('-', '-')] + \

			




	
	
	
		
 
                [(k, prefix + k) for k in c.db_repo_scm_instance.closed_branches.keys()]

			




	
	
	
		
 
        _revs = []

			




	
	
	
		
 
        if not f_path:

			




	
	
	
		
 
            _revs = [x.revision for x in c.pagination]

			




	
	
	
		
 
        self._graph(c.db_repo_scm_instance, _revs, c.total_cs, c.size, p)

			




	
	
	
		
 

			




	
	
	
		
 
        c.revision = revision # requested revision ref

			




	
	
	
		
 
        c.first_revision = c.pagination[0] # pagination is never empty here!

			




	
	
	
		
 
        return render('changelog/changelog.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def changelog_details(self, cs):

			




	
	
	
		
 
        if request.environ.get('HTTP_X_PARTIAL_XHR'):

			




	
	
	
		
 
            c.cs = c.db_repo_scm_instance.get_changeset(cs)

			




	
	
	
		
 
            return render('changelog/changelog_details.html')

			




	
	
	
		
 
        raise HTTPNotFound()

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




        

    


    
    

    

        

                

                    kallithea/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -127,29 +127,29 @@ class FilesController(BaseRepoController

			




	
	
	
		
 

			




	
	
	
		
 
        return file_node

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def index(self, repo_name, revision, f_path, annotate=False):

			




	
	
	
		
 
        # redirect to given revision from form if given

			




	
	
	
		
 
        post_revision = request.POST.get('at_rev', None)

			




	
	
	
		
 
        if post_revision:

			




	
	
	
		
 
            cs = self.__get_cs_or_redirect(post_revision, repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
        c.revision = revision

			




	
	
	
		
 
        c.changeset = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        c.branch = request.GET.get('branch', None)

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 
        c.annotate = annotate

			




	
	
	
		
 
        c.changeset = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        cur_rev = c.changeset.revision

			




	
	
	
		
 

			




	
	
	
		
 
        # prev link

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            prev_rev = c.db_repo_scm_instance.get_changeset(cur_rev).prev(c.branch)

			




	
	
	
		
 
            c.url_prev = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                         revision=prev_rev.raw_id, f_path=f_path)

			




	
	
	
		
 
            if c.branch:

			




	
	
	
		
 
                c.url_prev += '?branch=%s' % c.branch

			




	
	
	
		
 
        except (ChangesetDoesNotExistError, VCSError):

			




	
	
	
		
 
            c.url_prev = '#'

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -89,25 +89,26 @@

			




	
	
	
		
 
   %if repositories:

			




	
	
	
		
 
      <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if repository_groups:

			




	
	
	
		
 
      <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if user_groups:

			




	
	
	
		
 
      <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_context_bar(current=None)">

			




	
	
	
		
 
<%def name="repo_context_bar(current=None, rev=None)">

			




	
	
	
		
 
  <% rev = None if rev == 'tip' else rev %>

			




	
	
	
		
 
  <%

			




	
	
	
		
 
      def follow_class():

			




	
	
	
		
 
          if c.repository_following:

			




	
	
	
		
 
              return h.literal('following')

			




	
	
	
		
 
          else:

			




	
	
	
		
 
              return h.literal('follow')

			




	
	
	
		
 
  %>

			




	
	
	
		
 
  <%

			




	
	
	
		
 
    def is_current(selected):

			




	
	
	
		
 
        if selected == current:

			




	
	
	
		
 
            return h.literal('class="current"')

			




	
	
	
		
 
    %>

			




	
	
		
 
@@ -134,26 +135,30 @@

			




	
	
	
		
 
         - ${_('Create fork')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </h2>

			




	
	
	
		
 
      <!--

			




	
	
	
		
 
      <div id="breadcrumbs">

			




	
	
	
		
 
        ${h.link_to(_(u'Repositories'),h.url('home'))}

			




	
	
	
		
 
        &raquo;

			




	
	
	
		
 
        ${h.repo_link(c.db_repo.groups_and_repo)}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      -->

			




	
	
	
		
 
      <ul id="context-pages" class="horizontal-list">

			




	
	
	
		
 
        <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-file-text"></i> ${_('Summary')}</a></li>

			




	
	
	
		
 
        %if rev:

			




	
	
	
		
 
        <li ${is_current('changelog')}><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-time"></i> ${_('Changelog')}</a></li>

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
        <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-time"></i> ${_('Changelog')}</a></li>

			




	
	
	
		
 
        <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name)}"><i class="icon-file"></i> ${_('Files')}</a></li>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-file"></i> ${_('Files')}</a></li>

			




	
	
	
		
 
        <li ${is_current('switch-to')}>

			




	
	
	
		
 
          <a href="#" id="branch_tag_switcher_2" class="dropdown"><i class="icon-random"></i> ${_('Switch To')}</a>

			




	
	
	
		
 
          <ul id="switch_to_list_2" class="switch_to submenu">

			




	
	
	
		
 
            <li><a href="#">${_('Loading...')}</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li ${is_current('options')}>

			




	
	
	
		
 
             %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):

			




	
	
	
		
 
               <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>

			




	
	
	
		
 
             %else:

			




	
	
	
		
 
               <a href="#" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>

			




	
	
	
		
 
             %endif

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9,48 +9,55 @@

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    <% size = c.size if c.size <= c.total_cs else c.total_cs %>

			




	
	
	
		
 
    ${_('Changelog')}

			




	
	
	
		
 
    %if c.changelog_for_path:

			




	
	
	
		
 
     - /${c.changelog_for_path}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.revision:

			




	
	
	
		
 
    @ ${h.short_id(c.first_revision.raw_id)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        % if c.pagination:

			




	
	
	
		
 
            <div id="graph">

			




	
	
	
		
 
                <div style="overflow:auto; display:${'none' if c.changelog_for_path else ''}">

			




	
	
	
		
 
                    <div class="container_header">

			




	
	
	
		
 
                       <div style="float:right; margin: 0px 0px 0px 4px">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>

			




	
	
	
		
 
                       <div class="info_box" style="text-align: right; float: right">

			




	
	
	
		
 
                            <a href="#" class="btn btn-mini" id="rev_range_container" style="display:none"></a>

			




	
	
	
		
 
                            <a href="#" class="btn btn-mini" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>

			




	
	
	
		
 

			




	
	
	
		
 
                            %if c.revision:

			




	
	
	
		
 
                                <a class="btn btn-mini" href="${h.url('changelog_home', repo_name=c.repo_name)}">

			




	
	
	
		
 
                                    ${_('Go to tip of repository')}

			




	
	
	
		
 
                                </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            %if c.db_repo.fork:

			




	
	
	
		
 
                                <a id="compare_fork"

			




	
	
	
		
 
                                   title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"

			




	
	
	
		
 
                                   href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"

			




	
	
	
		
 
                                   class="btn btn-mini"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="btn btn-mini">${_('Open new pull request')}</a>

			




	
	
	
		
 
                       </div>

			




	
	
	
		
 

			




	
	
	
		
 
                       ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
                       <div style="float:left">

			




	
	
	
		
 
                           ${h.submit('set',_('Show'),class_="btn btn-mini")}

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9,25 +9,25 @@

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
${self.repo_context_bar('changelog', c.changeset.raw_id)}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
    var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
    var _GROUPS_AC_DATA = ${c.user_groups_array|n};

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    <div class="table">

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,25 +14,25 @@

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Files')}

			




	
	
	
		
 
    %if c.file:

			




	
	
	
		
 
        @ ${h.show_id(c.changeset)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
${self.repo_context_bar('files', c.revision)}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span><a href="#">${_('Branch')}: ${c.changeset.branch}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="files_data">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-1886
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support