Changeset - 12919ffab34c
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
Mads Kiilerich - 10 years ago 2016-08-12 03:04:48
madski@unity3d.com
pullrequests: use monospace for hashes - columns of hashes look messy when they have different lenght

17f9f921a538 was insufficient.
7 files changed with 52 insertions and 54 deletions:
kallithea/templates/changelog/changelog.html
1
3
kallithea/templates/changeset/changeset.html
2
2
kallithea/templates/compare/compare_cs.html
3
3
kallithea/templates/pullrequests/pullrequest_show.html
2
2
kallithea/tests/functional/test_changelog.py
4
4
kallithea/tests/functional/test_compare.py
20
20
kallithea/tests/functional/test_compare_local.py
20
20
0 comments (0 inline, 0 general)
kallithea/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -97,27 +97,25 @@ ${self.repo_context_bar('changelog', c.f
 
                                 href="${c.comments[cs.raw_id][0].url()}">
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                              </a>
 
                            %endif
 
                            </div>
 
                          %endif
 
                        </td>
 
                        <td class="author">
 
                            ${h.gravatar(h.email_or_none(cs.author), size=16)}
 
                            <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
 
                        </td>
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">
 
                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
 
                                <span class="changeset_hash">${h.show_id(cs)}</span>
 
                            </a>
 
                            ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}
 
                        </td>
 
                        <td class="date">
 
                            <div class="date tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
 
                        </td>
 
                        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
 
                            <i class="icon-align-left" style="color:#999"></i>
 
                        </td>
 
                        <td class="mid">
 
                            <div class="log-container">
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 
                                <div class="extra-container">
 
                                    %if c.comments.get(cs.raw_id):
kallithea/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -109,31 +109,31 @@ ${self.repo_context_bar('changelog', c.c
 
                        %endif
 
                    </span>
 
                </div>
 
                <div class="left">
 
                     <div class="author">
 
                         ${h.gravatar_div(h.email_or_none(c.changeset.author), size=20)}
 
                         <span><b>${h.person(c.changeset.author,'full_name_and_username')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>
 
                         <span>${h.email_or_none(c.changeset.author)}</span><br/>
 
                     </div>
 
                     <% rev = c.changeset.extra.get('source') %>
 
                     %if rev:
 
                     <div>
 
                       ${_('Grafted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev))}
 
                       ${_('Grafted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}
 
                     </div>
 
                     %endif
 
                     <% rev = c.changeset.extra.get('transplant_source', '').encode('hex') %>
 
                     %if rev:
 
                     <div>
 
                       ${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev))}
 
                       ${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}
 
                     </div>
 
                     %endif
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'successors') and c.changeset.successors:

			




	
	
	
		
 
                     <div class='successors'>

			




	
	
	
		
 
                       <span class='successors_header'>${_('Replaced by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.successors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.successors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




	
	
	
		
 
    <span class="empty_data">${_('No changesets')}</span>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.ancestor:

			




	
	
	
		
 
    <div class="ancestor">${_('Ancestor')}:

			




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

			




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

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_nodes">

			




	
	
	
		
 
        <canvas id="graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_content_pr" style="margin-left: 100px;">

			




	
	
	
		
 

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




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

			




	
	
	
		
 
        <tr id="chg_${cnt+1}">

			




	
	
		
 
@@ -47,25 +47,25 @@

			




	
	
	
		
 
              else:

			




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

			




	
	
	
		
 
          %>

			




	
	
	
		
 
          <span class="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
        %if c.visual.use_gravatar:

			




	
	
	
		
 
        <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</td>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        <td><div class="author">${h.person(cs.author)}</div></td>

			




	
	
	
		
 
        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</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" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div style="float: right; margin-top: -4px;">

			




	
	
	
		
 
                %for tag in cs.tags:

			




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

			




	
	
		
 
@@ -87,25 +87,25 @@

			




	
	
	
		
 
      ${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')

			




	
	
	
		
 
        )}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
        ${_('Common ancestor')}:

			




	
	
	
		
 
        %if c.ancestor:

			




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

			




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

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
        ${_('No common ancestor found - repositories are unrelated')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.cs_ranges_org is not None:

			




	
	
	
		
 
      ## TODO: list actual changesets?

			




	
	
	
		
 
      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
        ${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}

			




	
	
	
		
 
        ${_('is')}

			




	
	
	
		
 
        <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>

			




	
	
	
		
 
        ${_('behind')}

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -187,25 +187,25 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                          %if editable:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value='', checked=True)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td colspan="4">${_("Current revision - no change")}</td>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable and cs.revision in c.avail_revs:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value=cs.raw_id)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td style="width: 120px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</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))}</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>

			




	
	
	
		
 
                          <div style="float: right; margin-top: -4px;">

			




	
	
	
		
 
                            %for tag in cs.tags:

			




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

			




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

			




	
	
	
		
 
                              </div>

			




	
	
	
		
 
                            %endfor

			




	
	
	
		
 
                          </div>

			




	
	
	
		
 
                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
		
 
@@ -308,25 +308,25 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
          <div id="changeset_compare_view_content">

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
                  ${comment.comment_count(c.inline_cnt, len(c.comments))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              ##CS

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
                ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
              ${_('Common ancestor')}:

			




	
	
	
		
 
              ${h.link_to(h.short_id(c.a_rev),h.url('changeset_home',repo_name=c.a_repo.repo_name,revision=c.a_rev))}

			




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

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              ## FILES

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 

			




	
	
	
		
 
              </div>

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_changelog.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -8,25 +8,25 @@ class TestChangelogController(TestContro

			




	
	
	
		
 
        response = self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('''id="chg_20" class="container mergerow"''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<input class="changeset_range" """

			




	
	
	
		
 
            """id="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """

			




	
	
	
		
 
            """name="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """

			




	
	
	
		
 
            """type="checkbox" value="1" />"""

			




	
	
	
		
 
        )

			




	
	
	
		
 
        #rev 640: code garden

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<span class="changeset_hash">r640:0a4e54a44604</span>"""

			




	
	
	
		
 
            """<a class="changeset_hash" href="/%s/changeset/0a4e54a4460401d6dbbd6a3604b17cd2b3606b82">r640:0a4e54a44604</a>""" % HG_REPO

			




	
	
	
		
 
        )

			




	
	
	
		
 
        response.mustcontain("""code garden""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""var jsdata = [[[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 1, 2, 0], [0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0], [1, 1, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 3, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 3, 0]], 0, 0, 0, 0, 0, 0], [[1, 3], [[0, 0, 2, 0], [1, 1, 3, 0]], 0, 0, 0, 0, 0, 0], [[1, 3], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 4, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 5, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 5, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 5, 0]], 0, 0, 0, 0, 0, 0], [[1, 5], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 6, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 6, 0]], 0, 0, 0, 0, 0, 0], [[1, 6], [[0, 0, 2, 0], [1, 1, 6, 0]], 0, 0, 0, 0, 0, 0], [[1, 6], [[0, 0, 2, 0], [1, 1, 6, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 6, 0]], 0, 0, 0, 0, 0, 0], [[1, 6], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 7, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 7, 0]], 0, 0, 0, 0, 0, 0], [[1, 7], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 8, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 8, 0]], 0, 0, 0, 0, 0, 0], [[1, 8], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 9, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 10, 0], [0, 0, 2, 0], [1, 2, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 10, 0], [2, 2, 9, 0]], 0, 0, 0, 0, 0, 0], [[2, 9], [[0, 0, 2, 0], [1, 1, 10, 0], [2, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 1, 10, 0]], 0, 0, 0, 0, 0, 0], [[1, 10], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[1, 11], [[0, 0, 2, 0], [1, 1, 11, 0]], 1, 0, 0, 0, 0, 0], [[2, 12], [[0, 0, 2, 0], [2, 1, 12, 0]], 1, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 13, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 13, 0]], 0, 0, 0, 0, 0, 0], [[1, 13], [[0, 0, 2, 0], [1, 1, 13, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 13, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 13, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 13, 0]], 0, 0, 0, 0, 0, 0], [[1, 13], [[0, 0, 2, 0], [1, 1, 13, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 14, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0]], 0, 0, 0, 0, 0, 0]];""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_pagination_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        #pagination

			




	
	
	
		
 
        self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO), {'page': 1})

			




	
	
	
		
 
        self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO), {'page': 2})

			




	
	
		
 
@@ -39,42 +39,42 @@ class TestChangelogController(TestContro

			




	
	
	
		
 
        response = self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO), {'page': 6, 'size': 20})

			




	
	
	
		
 

			




	
	
	
		
 
        # Test response after pagination...

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<input class="changeset_range" """

			




	
	
	
		
 
            """id="22baf968d547386b9516965ce89d189665003a31" """

			




	
	
	
		
 
            """name="22baf968d547386b9516965ce89d189665003a31" """

			




	
	
	
		
 
            """type="checkbox" value="1" />"""

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<span class="changeset_hash">r539:22baf968d547</span>"""

			




	
	
	
		
 
            """<a class="changeset_hash" href="/vcs_test_hg/changeset/22baf968d547386b9516965ce89d189665003a31">r539:22baf968d547</a>"""

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    repo_name=GIT_REPO))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('''id="chg_20" class="container "''') # why no mergerow for git?

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<input class="changeset_range" """

			




	
	
	
		
 
            """id="95f9a91d775b0084b2368ae7779e44931c849c0e" """

			




	
	
	
		
 
            """name="95f9a91d775b0084b2368ae7779e44931c849c0e" """

			




	
	
	
		
 
            """type="checkbox" value="1" />"""

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<span class="changeset_hash">r613:95f9a91d775b</span>"""

			




	
	
	
		
 
            """<a class="changeset_hash" href="/vcs_test_git/changeset/95f9a91d775b0084b2368ae7779e44931c849c0e">r613:95f9a91d775b</a>"""

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""fixing stupid typo in context for mercurial""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""var jsdata = [[[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 1, 2, 0], [0, 0, 1, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 1, 0], [1, 1, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 1], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 3, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 3, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 3, 0]], 0, 0, 0, 0, 0, 0], [[1, 3], [[0, 0, 2, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 1, 4, 0], [0, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0], [1, 0, 2, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[1, 4], [[0, 0, 2, 0], [1, 1, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 2], [[0, 0, 4, 0], [1, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 1, 5, 0], [0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 5, 0]], 0, 0, 0, 0, 0, 0], [[1, 5], [[0, 0, 4, 0], [1, 1, 5, 0]], 0, 0, 0, 0, 0, 0], [[1, 5], [[0, 0, 4, 0], [1, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 1, 6, 0], [0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 6, 0]], 0, 0, 0, 0, 0, 0], [[1, 6], [[0, 0, 4, 0], [1, 1, 6, 0]], 0, 0, 0, 0, 0, 0], [[1, 6], [[0, 0, 4, 0], [1, 1, 6, 0], [1, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 6, 0]], 0, 0, 0, 0, 0, 0], [[1, 6], [[0, 0, 4, 0], [1, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 1, 7, 0], [0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 7, 0]], 0, 0, 0, 0, 0, 0], [[1, 7], [[0, 0, 4, 0], [1, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 1, 8, 0], [0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 8, 0]], 0, 0, 0, 0, 0, 0], [[1, 8], [[0, 0, 4, 0], [1, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 1, 9, 0], [0, 0, 4, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[1, 9], [[0, 0, 4, 0], [1, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[1, 9], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 4, 0], [1, 1, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 4], [[0, 0, 9, 0], [1, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 1, 10, 0], [0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 1, 11, 0], [0, 0, 9, 0], [1, 2, 10, 0]], 0, 0, 0, 0, 0, 0], [[2, 10], [[0, 0, 9, 0], [1, 1, 11, 0], [2, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[1, 11], [[0, 0, 9, 0], [1, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[1, 11], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 1, 11, 0], [0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0], [1, 1, 11, 0]], 0, 0, 0, 0, 0, 0], [[1, 11], [[0, 0, 9, 0], [1, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0], [[0, 9], [[0, 0, 9, 0]], 0, 0, 0, 0, 0, 0]];""")

			




	
	
	
		
 

			




	
	
	
		
 
#        response.mustcontain(

			




	
	
	
		
 
#            """<div id="changed_total_5e204e7583b9c8e7b93a020bd036564b1e731dae" """

			




	
	
	
		
 
#            """style="float:right;" class="changed_total tooltip" """

			




	
	
	
		
 
#            """title="Affected number of files, click to show """

			




	
	
	
		
 
#            """more details">3</div>"""

			




	
	
	
		
 
#        )

			




	
	
		
 
@@ -95,25 +95,25 @@ class TestChangelogController(TestContro

			




	
	
	
		
 
        response = self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    repo_name=GIT_REPO), {'page': 6, 'size': 20})

			




	
	
	
		
 

			




	
	
	
		
 
        # Test response after pagination...

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<input class="changeset_range" """

			




	
	
	
		
 
            """id="636ed213f2f11ef91071b9c24f2d5e6bd01a6ed5" """

			




	
	
	
		
 
            """name="636ed213f2f11ef91071b9c24f2d5e6bd01a6ed5" """

			




	
	
	
		
 
            """type="checkbox" value="1" />"""

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
            """<span class="changeset_hash">r515:636ed213f2f1</span>"""

			




	
	
	
		
 
            """<a class="changeset_hash" href="/vcs_test_git/changeset/636ed213f2f11ef91071b9c24f2d5e6bd01a6ed5">r515:636ed213f2f1</a>"""

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_hg_with_filenode(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='changelog', action='index',

			




	
	
	
		
 
                                    revision='tip', f_path='/vcs/exceptions.py',

			




	
	
	
		
 
                                    repo_name=HG_REPO))

			




	
	
	
		
 
        #history commits messages

			




	
	
	
		
 
        response.mustcontain('Added exceptions module, this time for real')

			




	
	
	
		
 
        response.mustcontain('Added not implemented hg backend test case')

			




	
	
	
		
 
        response.mustcontain('Added BaseChangeset class')

			




	
	
	
		
 
        # Test response...

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
                                    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_div(cs1.raw_id, 'commit2'))

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        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-small" 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',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 
        self.r1_id = repo1.repo_id

			




	
	
	
		
 
        #commit something !

			




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

			




	
	
	
		
 
                                    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_div(cs1.raw_id, 'commit2'))

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        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-small" 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',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    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_div(cs1.raw_id, 'commit2'))

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        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-small" 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',

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    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_div(cs1.raw_id, 'commit2'))

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        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-small" 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:

			




	
	
	
		
 
#            cs1:

			




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

			




	
	
	
		
 
#            cs0:

			




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

			




	
	
	
		
 
                                    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_div(cs2.raw_id, 'commit3'))

			




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

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        response.mustcontain("""<a 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">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

			




	
	
	
		
 
#            cs0:

			




	
	
	
		
 
#            cs1:

			




	
	
	
		
 
#            cs2:

			




	
	
	
		
 
#            cs3: x

			




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

			




	
	
	
		
 
                                    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_div(cs3.raw_id, 'commit4'))

			




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

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.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))

			




	
	
	
		
 
        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):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo2 = fixture.create_fork(HG_REPO, HG_FORK)

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




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

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=HG_FORK,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (HG_REPO, rev1))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (HG_FORK, rev2))

			




	
	
	
		
 
        ## outgoing changesets between those revisions

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_FORK, rev2))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_FORK, rev2))

			




	
	
	
		
 

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>""")

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--41b41c1f2796">vcs/backends/__init__.py</a>""")

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--2f574d260608">vcs/backends/base.py</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_remote_branches_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo2 = fixture.create_fork(GIT_REPO, GIT_FORK)

			




	
	
	
		
 
        self.r2_id = repo2.repo_id

			




	
	
	
		
 
        rev1 = '102607b09cdd60e2793929c4f90478be29f85a17'

			




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

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=GIT_FORK,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (GIT_REPO, rev1))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (GIT_FORK, rev2))

			




	
	
	
		
 
        ## outgoing changesets between those revisions

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/49d3fd156b6f7db46313fac355dca1a0b94a0017">r4:49d3fd156b6f</a>""" % (GIT_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/2d1028c054665b962fa3d307adfc923ddd528038">r5:2d1028c05466</a>""" % (GIT_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/d7e0d30fbcae12c90680eb095a4f5f02505ce501">r6:%s</a>""" % (GIT_FORK, rev2[:12]))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/49d3fd156b6f7db46313fac355dca1a0b94a0017">r4:49d3fd156b6f</a>""" % (GIT_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/2d1028c054665b962fa3d307adfc923ddd528038">r5:2d1028c05466</a>""" % (GIT_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/d7e0d30fbcae12c90680eb095a4f5f02505ce501">r6:%s</a>""" % (GIT_FORK, rev2[:12]))

			




	
	
	
		
 

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>""")

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--41b41c1f2796">vcs/backends/__init__.py</a>""")

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--2f574d260608">vcs/backends/base.py</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_org_repo_new_commits_after_forking_simple_diff_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_description='diff-test',

			




	
	
	
		
 
                                    cur_user=TEST_USER_ADMIN_LOGIN)

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare_local.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9,31 +9,31 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        tag2 = 'v0.1.3'

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref_name=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    other_ref_name=tag2,

			




	
	
	
		
 
                                    ), status=200)

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (HG_REPO, tag1))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (HG_REPO, tag2))

			




	
	
	
		
 

			




	
	
	
		
 
        ## outgoing changesets between tags

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/41fda979f02fda216374bf8edac4e83f69e7581c">r117:41fda979f02f</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/bb1a3ab98cc45cb934a77dcabf87a5a598b59e97">r118:bb1a3ab98cc4</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/36e0fc9d2808c5022a24f49d6658330383ed8666">r119:36e0fc9d2808</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">r120:17544fbfcd33</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/41fda979f02fda216374bf8edac4e83f69e7581c">r117:41fda979f02f</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/bb1a3ab98cc45cb934a77dcabf87a5a598b59e97">r118:bb1a3ab98cc4</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/36e0fc9d2808c5022a24f49d6658330383ed8666">r119:36e0fc9d2808</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">r120:17544fbfcd33</a>''' % HG_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('11 files changed with 94 insertions and 64 deletions')

			




	
	
	
		
 

			




	
	
	
		
 
        ## files diff

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-A"></i>

			




	
	
	
		
 
                             <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-A"></i>

			




	
	
	
		
 
                             <a href="#C--e3305437df55">test_and_report.sh</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
		
 
@@ -69,31 +69,31 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        tag2 = 'v0.1.3'

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref_name=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    other_ref_name=tag2,

			




	
	
	
		
 
                                    ), status=200)

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (GIT_REPO, tag1))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (GIT_REPO, tag2))

			




	
	
	
		
 

			




	
	
	
		
 
        ## outgoing changesets between tags

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/e36d8c5025329bdd4212bd53d4ed8a70ff44985f">r115:e36d8c502532</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/5c9ff4f6d7508db0e72b1d2991c357d0d8e07af2">r116:5c9ff4f6d750</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/b7187fa2b8c1d773ec35e9dee12f01f74808c879">r117:b7187fa2b8c1</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/5f3b74262014a8de2dc7dade1152de9fd0c8efef">r118:5f3b74262014</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/17438a11f72b93f56d0e08e7d1fa79a378578a82">r119:17438a11f72b</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a href="/%s/changeset/5a3a8fb005554692b16e21dee62bf02667d8dc3e">r120:5a3a8fb00555</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/e36d8c5025329bdd4212bd53d4ed8a70ff44985f">r115:e36d8c502532</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/5c9ff4f6d7508db0e72b1d2991c357d0d8e07af2">r116:5c9ff4f6d750</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/b7187fa2b8c1d773ec35e9dee12f01f74808c879">r117:b7187fa2b8c1</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/5f3b74262014a8de2dc7dade1152de9fd0c8efef">r118:5f3b74262014</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/17438a11f72b93f56d0e08e7d1fa79a378578a82">r119:17438a11f72b</a>''' % GIT_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/5a3a8fb005554692b16e21dee62bf02667d8dc3e">r120:5a3a8fb00555</a>''' % GIT_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('11 files changed with 94 insertions and 64 deletions')

			




	
	
	
		
 

			




	
	
	
		
 
        #files

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--e3305437df55">test_and_report.sh</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--c8e92ef85cd1">.hgignore</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--6e08b694d687">.hgtags</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--2c14b00f3393">docs/api/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')

			




	
	
		
 
@@ -140,80 +140,80 @@ class TestCompareController(TestControll

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (HG_REPO, rev1))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (HG_REPO, rev2))

			




	
	
	
		
 

			




	
	
	
		
 
        ## outgoing changesets between those revisions

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('1 file changed with 7 insertions and 0 deletions')

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--c8e92ef85cd1">.hgignore</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_revisions_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3'

			




	
	
	
		
 
        rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (GIT_REPO, rev1))

			




	
	
	
		
 
        response.mustcontain('%s@%s' % (GIT_REPO, rev2))

			




	
	
	
		
 

			




	
	
	
		
 
        ## outgoing changesets between those revisions

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))

			




	
	
	
		
 
        response.mustcontain('1 file changed with 7 insertions and 0 deletions')

			




	
	
	
		
 

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="#C--c8e92ef85cd1">.hgignore</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_revisions_hg_as_form(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev1 = 'b986218ba1c9'

			




	
	
	
		
 
        rev2 = '3d8f361e72ab'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    as_form=True,

			




	
	
	
		
 
                                    ),

			




	
	
	
		
 
                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)

			




	
	
	
		
 

			




	
	
	
		
 
        ## outgoing changesets between those revisions

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('Common ancestor')

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/b986218ba1c9b0d6a259fac9b050b1724ed8e545">%s</a>""" % (HG_REPO, rev1))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/b986218ba1c9b0d6a259fac9b050b1724ed8e545">%s</a>""" % (HG_REPO, rev1))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_revisions_git_as_form(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3'

			




	
	
	
		
 
        rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    as_form=True,

			




	
	
	
		
 
                                    ),

			




	
	
	
		
 
                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)

			




	
	
	
		
 
        ## outgoing changesets between those revisions

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('Common ancestor')

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/changeset/c1214f7e79e02fc37156ff215cd71275450cffc3">%s</a>""" % (GIT_REPO, rev1[:12]))

			




	
	
	
		
 
        response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/c1214f7e79e02fc37156ff215cd71275450cffc3">%s</a>""" % (GIT_REPO, rev1[:12]))

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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