Changeset - 00905ed03136
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 8 years ago 2017-08-28 05:25:40
mads@kiilerich.com
pullrequests: use shared changelog_table implementation

It will show pretty much the same information as before, but in a different
order.
3 files changed with 39 insertions and 80 deletions:
kallithea/templates/changelog/changelog_table.html
18
1
kallithea/templates/compare/compare_cs.html
5
63
kallithea/tests/functional/test_compare.py
16
16
0 comments (0 inline, 0 general)
kallithea/templates/changelog/changelog_table.html
➞
Show inline comments
 
## Render changelog table with id 'changesets' with the range of changesets,
 
## statuses, and comments.
 
## Optionally, pass a js snippet to run whenever a table resize is triggered.
 
<%def name="changelog(repo_name, cs_range, cs_statuses, cs_comments, show_checkbox=False, show_branch=True, resize_js='')">
 
<%def name="changelog(repo_name, cs_range, cs_statuses, cs_comments, show_checkbox=False, show_branch=True, show_index=False, resize_js='')">
 
    <% num_cs = len(cs_range) %>
 
    <table class="table" id="changesets">
 
    <tbody>
 
      %for cnt,cs in enumerate(cs_range):
 
      <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
 
        %if show_checkbox:
 
        <td class="checkbox-column">
 
          ${h.checkbox(cs.raw_id,class_="changeset_range")}
 
        </td>
 
        %endif
 
        %if show_index:
 
        <td class="changeset-logical-index">
 
          <%
 
              index = num_cs - cnt
 
              if index == 1:
 
                  title = _('First (oldest) changeset in this list')
 
              elif index == num_cs:
 
                  title = _('Last (most recent) changeset in this list')
 
              else:
 
                  title = _('Position in this list of changesets')
 
          %>
 
          <span data-toggle="tooltip" title="${title}">
 
            ${index}
 
          </span>
 
        </td>
 
        %endif
 
        <td class="status">
 
          %if cs_statuses.get(cs.raw_id):
 
            %if cs_statuses.get(cs.raw_id)[2]:
 
              <a data-toggle="tooltip"
 
                  title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (cs_statuses.get(cs.raw_id)[1], cs_statuses.get(cs.raw_id)[5].username, cs_statuses.get(cs.raw_id)[4])}"
 
                  href="${h.url('pullrequest_show',repo_name=cs_statuses.get(cs.raw_id)[3],pull_request_id=cs_statuses.get(cs.raw_id)[2])}">
 
                <i class="icon-circle changeset-status-${cs_statuses.get(cs.raw_id)[0]}"></i>
 
              </a>
 
            %else:
 
              <a data-toggle="tooltip"
 
                  title="${_('Changeset status: %s by %s') % (cs_statuses.get(cs.raw_id)[1], cs_statuses.get(cs.raw_id)[5].username)}"
 
                  href="${cs_comments[cs.raw_id][0].url()}">
kallithea/templates/compare/compare_cs.html
➞
Show inline comments
 
## Changesets table !
 
## Changesets table with graph
 
<%namespace name="changelog_table" file="/changelog/changelog_table.html"/>
 
<div>
 
  %if not c.cs_ranges:
 
    <span class="empty_data">${_('No changesets')}</span>
 
  %else:
 

			




	
	
	
		
 
    %if c.ancestors:

			




	
	
	
		
 
      <div class="ancestor">

			




	
	
	
		
 
        %if len(c.ancestors) > 1:

			




	
	
	
		
 
        <div class="text-danger">

			




	
	
	
		
 
          ${_('Criss cross merge situation with multiple merge ancestors detected!')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div>

			




	
	
		
 
@@ -19,86 +20,27 @@

			




	
	
	
		
 
          %for ancestor in c.ancestors:

			




	
	
	
		
 
            ${h.link_to(h.short_id(ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=ancestor), class_="changeset_hash")}

			




	
	
	
		
 
          %endfor

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_nodes">

			




	
	
	
		
 
        <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_content_pr">

			




	
	
	
		
 

			




	
	
	
		
 
    <table class="table compare_view_commits">

			




	
	
	
		
 
    %for cnt, cs in enumerate(reversed(c.cs_ranges)):

			




	
	
	
		
 
      <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
          %if cs.raw_id in c.cs_statuses:

			




	
	
	
		
 
              <i class="icon-circle changeset-status-${c.cs_statuses[cs.raw_id][0]}" title="${_('Changeset status: %s') % c.cs_statuses[cs.raw_id][1]}"></i>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
          %if c.cs_comments.get(cs.raw_id):

			




	
	
	
		
 
              <div class="comments-container">

			




	
	
	
		
 
                  <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                      <a href="${c.cs_comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                          ${len(c.cs_comments[cs.raw_id])}

			




	
	
	
		
 
                          <i class="icon-comment"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="changeset-logical-index">

			




	
	
	
		
 
          <%

			




	
	
	
		
 
              num_cs = len(c.cs_ranges)

			




	
	
	
		
 
              index = num_cs - cnt

			




	
	
	
		
 
              if index == 1:

			




	
	
	
		
 
                  title = _('First (oldest) changeset in this list')

			




	
	
	
		
 
              elif index == num_cs:

			




	
	
	
		
 
                  title = _('Last (most recent) changeset in this list')

			




	
	
	
		
 
              else:

			




	
	
	
		
 
                  title = _('Position in this list of changesets')

			




	
	
	
		
 
          %>

			




	
	
	
		
 
          <span data-toggle="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
        <td class="author">

			




	
	
	
		
 
            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




	
	
	
		
 
            <span data-toggle="tooltip" title="${cs.author}" class="user">${h.person(cs.author)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="expand_commit" title="${_('Expand commit message')}">

			




	
	
	
		
 
            <i class="icon-align-left"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="mid">

			




	
	
	
		
 
            <div class="pull-right">

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                        ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="message">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
      </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    </table>

			




	
	
	
		
 

			




	
	
	
		
 
      ${changelog_table.changelog(c.cs_repo.repo_name, list(reversed(c.cs_ranges)), c.cs_statuses, c.cs_comments,

			




	
	
	
		
 
                                  show_index=True,

			




	
	
	
		
 
                                  resize_js='graph.render(jsdata)')}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.is_ajax_preview:

			




	
	
	
		
 
      <h5>

			




	
	
	
		
 
      ## links should perhaps use ('rev', c.a_rev) instead ...

			




	
	
	
		
 
      ${h.link_to(_('Show merge diff'),

			




	
	
	
		
 
        h.url('compare_url',

			




	
	
	
		
 
          repo_name=c.a_repo.repo_name,

			




	
	
	
		
 
          org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,

			




	
	
	
		
 
          other_repo=c.cs_repo.repo_name,

			




	
	
	
		
 
          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,

			




	
	
	
		
 
          merge='1')

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# -*- coding: utf-8 -*-

			




	
	
	
		
 
from kallithea.tests.base import *

			




	
	
	
		
 
from kallithea.model.repo import RepoModel

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.tests.fixture import Fixture

			




	
	
	
		
 

			




	
	
	
		
 
fixture = Fixture()

			




	
	
	
		
 

			




	
	
	
		
 
def _commit_ref(sha, msg):

			




	
	
	
		
 
    return '''<div class="message">%s</div>''' % msg

			




	
	
	
		
 
def _commit_ref(repo_name, sha, msg):

			




	
	
	
		
 
    return '''<div class="message-firstline"><a class="message-link" href="/%s/changeset/%s">%s</a></div>''' % (repo_name, sha, msg)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class TestCompareController(TestController):

			




	
	
	
		
 

			




	
	
	
		
 
    def setup_method(self, method):

			




	
	
	
		
 
        self.r1_id = None

			




	
	
	
		
 
        self.r2_id = None

			




	
	
	
		
 

			




	
	
	
		
 
    def teardown_method(self, method):

			




	
	
	
		
 
        if self.r2_id:

			




	
	
	
		
 
            RepoModel().delete(self.r2_id)

			




	
	
	
		
 
        if self.r1_id:

			




	
	
		
 
@@ -56,26 +56,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        repo1 = fixture.create_repo(u'one-git', repo_type='git',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
		
 
@@ -107,26 +107,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incoming_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo(u'one', repo_type='hg',

			




	
	
		
 
@@ -166,26 +166,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incoming_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = fixture.create_repo(u'one-git', repo_type='git',

			




	
	
		
 
@@ -225,26 +225,26 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref_name=rev1,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, rev2))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, rev1))

			




	
	
	
		
 
        response.mustcontain("""Showing 2 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs1.raw_id, 'commit2'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo2.repo_name, cs2.raw_id, 'commit3'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changesets_from_bottom(self):

			




	
	
	
		
 

			




	
	
	
		
 
#        repo1:

			




	
	
	
		
 
#            cs0:

			




	
	
		
 
@@ -293,27 +293,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=cs1.short_id,  # parent of cs2, in repo2

			




	
	
	
		
 
                                    other_repo=repo1.repo_name,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=cs4.short_id,

			




	
	
	
		
 
                                    merge='True',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo2.repo_name, cs1.short_id))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, cs4.short_id))

			




	
	
	
		
 
        response.mustcontain("""Showing 3 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs4.raw_id, 'commit5'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo1.repo_name, cs2.raw_id, 'commit3'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo1.repo_name, cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo1.repo_name, cs4.raw_id, 'commit5'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo1.repo_name, cs2.raw_id, cs2.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changesets_from_top(self):

			




	
	
	
		
 
#        repo1:

			




	
	
	
		
 
#            cs0:

			




	
	
	
		
 
#            cs1:

			




	
	
	
		
 
#        repo1-fork- in which we will cherry pick bottom changesets

			




	
	
		
 
@@ -359,27 +359,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=cs2.short_id, # parent of cs3, not in repo2

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=cs5.short_id,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, cs2.short_id))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (repo1.repo_name, cs5.short_id))

			




	
	
	
		
 
        response.mustcontain("""Showing 3 commits""")

			




	
	
	
		
 
        response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs4.raw_id, 'commit5'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(cs5.raw_id, 'commit6'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo1.repo_name, cs3.raw_id, 'commit4'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo1.repo_name, cs4.raw_id, 'commit5'))

			




	
	
	
		
 
        response.mustcontain(_commit_ref(repo1.repo_name, cs5.raw_id, 'commit6'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id))

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""#C--826e8142e6ba">file1</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changeset_mixed_branches(self):

			




	
	
	
		
 
        #TODO: write this

			




	
	
	
		
 
        assert 1

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_remote_branches_hg(self):

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.