Changeset - c2e3923eebe4
Parent rev.
Child rev.
[Not reviewed]
default
0 16 0
Mads Kiilerich - 12 years ago 2013-06-28 11:50:13
madski@unity3d.com
compare: consistent naming: _ref is a tuple, _ref_type is the type, _ref_name is symbolic name, _rev is the revision
16 files changed with 97 insertions and 111 deletions:
kallithea/config/routing.py
1
1
kallithea/controllers/compare.py
22
20
kallithea/controllers/pullrequests.py
14
28
kallithea/templates/base/base.html
1
1
kallithea/templates/bookmarks/bookmarks.html
1
1
kallithea/templates/branches/branches.html
1
1
kallithea/templates/changelog/changelog.html
1
1
kallithea/templates/changeset/changeset_range.html
1
1
kallithea/templates/changeset/diff_block.html
3
3
kallithea/templates/compare/compare_diff.html
4
4
kallithea/templates/forks/forks_data.html
1
1
kallithea/templates/pullrequests/pullrequest.html
9
11
kallithea/templates/pullrequests/pullrequest_show.html
1
1
kallithea/templates/tags/tags.html
1
1
kallithea/tests/functional/test_compare.py
24
24
kallithea/tests/functional/test_compare_local.py
12
12
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -672,13 +672,13 @@ def make_map(config):
 
    rmap.connect('compare_home',
 
                 '/{repo_name:.*?}/compare',
 
                 controller='compare', action='index',
 
                 conditions=dict(function=check_repo))
 

			




	
	
	
		
 
    rmap.connect('compare_url',

			




	
	
	
		
 
                 '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref:.*?}...{other_ref_type}@{other_ref:.*?}',

			




	
	
	
		
 
                 '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref_name:.*?}...{other_ref_type}@{other_ref_name:.*?}',

			




	
	
	
		
 
                 controller='compare', action='compare',

			




	
	
	
		
 
                 conditions=dict(function=check_repo),

			




	
	
	
		
 
                 requirements=dict(

			




	
	
	
		
 
                            org_ref_type='(branch|book|tag|rev|__other_ref_type__)',

			




	
	
	
		
 
                            other_ref_type='(branch|book|tag|rev|__org_ref_type__)')

			




	
	
	
		
 
                 )

			




        

    


    
    

    

        

                

                    kallithea/controllers/compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -188,24 +188,24 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
    def index(self, repo_name):

			




	
	
	
		
 
        c.compare_home = True

			




	
	
	
		
 
        org_repo = c.db_repo.repo_name

			




	
	
	
		
 
        other_repo = request.GET.get('other_repo', org_repo)

			




	
	
	
		
 
        c.org_repo = Repository.get_by_repo_name(org_repo)

			




	
	
	
		
 
        c.other_repo = Repository.get_by_repo_name(other_repo)

			




	
	
	
		
 
        c.org_ref = c.other_ref = _('Select changeset')

			




	
	
	
		
 
        c.org_ref_name = c.other_ref_name = _('Select changeset')

			




	
	
	
		
 
        return render('compare/compare_diff.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def compare(self, repo_name, org_ref_type, org_ref, other_ref_type, other_ref):

			




	
	
	
		
 
    def compare(self, repo_name, org_ref_type, org_ref_name, other_ref_type, other_ref_name):

			




	
	
	
		
 
        # org_ref will be evaluated in org_repo

			




	
	
	
		
 
        org_repo = c.db_repo.repo_name

			




	
	
	
		
 
        org_ref = (org_ref_type, org_ref)

			




	
	
	
		
 
        org_ref = (org_ref_type, org_ref_name)

			




	
	
	
		
 
        # other_ref will be evaluated in other_repo

			




	
	
	
		
 
        other_ref = (other_ref_type, other_ref)

			




	
	
	
		
 
        other_ref = (other_ref_type, other_ref_name)

			




	
	
	
		
 
        other_repo = request.GET.get('other_repo', org_repo)

			




	
	
	
		
 
        # If merge is True:

			




	
	
	
		
 
        #   Show what org would get if merged with other:

			




	
	
	
		
 
        #   List changesets that are ancestors of other but not of org.

			




	
	
	
		
 
        #   New changesets in org is thus ignored.

			




	
	
	
		
 
        #   Diff will be from common ancestor, and merges of org to other will thus be ignored.

			




	
	
		
 
@@ -219,15 +219,15 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        partial = request.environ.get('HTTP_X_PARTIAL_XHR')

			




	
	
	
		
 
        # as_form puts hidden input field with changeset revisions

			




	
	
	
		
 
        c.as_form = partial and request.GET.get('as_form')

			




	
	
	
		
 
        # swap url for compare_diff page - never partial and never as_form

			




	
	
	
		
 
        c.swap_url = h.url('compare_url',

			




	
	
	
		
 
            repo_name=other_repo,

			




	
	
	
		
 
            org_ref_type=other_ref[0], org_ref=other_ref[1],

			




	
	
	
		
 
            org_ref_type=other_ref_type, org_ref_name=other_ref_name,

			




	
	
	
		
 
            other_repo=org_repo,

			




	
	
	
		
 
            other_ref_type=org_ref[0], other_ref=org_ref[1],

			




	
	
	
		
 
            other_ref_type=org_ref_type, other_ref_name=org_ref_name,

			




	
	
	
		
 
            merge=merge or '')

			




	
	
	
		
 

			




	
	
	
		
 
        org_repo = Repository.get_by_repo_name(org_repo)

			




	
	
	
		
 
        other_repo = Repository.get_by_repo_name(other_repo)

			




	
	
	
		
 

			




	
	
	
		
 
        if org_repo is None:

			




	
	
		
 
@@ -245,50 +245,52 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        if org_repo.scm_instance.alias != other_repo.scm_instance.alias:

			




	
	
	
		
 
            msg = 'compare of two different kind of remote repos not available'

			




	
	
	
		
 
            log.error(msg)

			




	
	
	
		
 
            h.flash(msg, category='error')

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        org_rev = self.__get_rev_or_redirect(ref=org_ref, repo=org_repo, partial=partial)

			




	
	
	
		
 
        other_rev = self.__get_rev_or_redirect(ref=other_ref, repo=other_repo, partial=partial)

			




	
	
	
		
 
        c.org_rev = self.__get_rev_or_redirect(ref=org_ref, repo=org_repo, partial=partial)

			




	
	
	
		
 
        c.other_rev = self.__get_rev_or_redirect(ref=other_ref, repo=other_repo, partial=partial)

			




	
	
	
		
 

			




	
	
	
		
 
        c.compare_home = False

			




	
	
	
		
 
        c.org_repo = org_repo

			




	
	
	
		
 
        c.other_repo = other_repo

			




	
	
	
		
 
        c.org_ref = org_ref[1]

			




	
	
	
		
 
        c.other_ref = other_ref[1]

			




	
	
	
		
 
        c.org_ref_type = org_ref[0]

			




	
	
	
		
 
        c.other_ref_type = other_ref[0]

			




	
	
	
		
 
        c.org_ref_name = org_ref_name

			




	
	
	
		
 
        c.other_ref_name = other_ref_name

			




	
	
	
		
 
        c.org_ref_type = org_ref_type

			




	
	
	
		
 
        c.other_ref_type = other_ref_type

			




	
	
	
		
 

			




	
	
	
		
 
        c.cs_ranges, c.ancestor = self._get_changesets(

			




	
	
	
		
 
            org_repo.scm_instance.alias, org_repo.scm_instance, org_rev,

			




	
	
	
		
 
            other_repo.scm_instance, other_rev, merge)

			




	
	
	
		
 
            org_repo.scm_instance.alias, org_repo.scm_instance, c.org_rev,

			




	
	
	
		
 
            other_repo.scm_instance, c.other_rev, merge)

			




	
	
	
		
 
        c.statuses = c.db_repo.statuses(

			




	
	
	
		
 
            [x.raw_id for x in c.cs_ranges])

			




	
	
	
		
 

			




	
	
	
		
 
        if merge and not c.ancestor:

			




	
	
	
		
 
            log.error('Unable to find ancestor revision')

			




	
	
	
		
 

			




	
	
	
		
 
        if partial:

			




	
	
	
		
 
            return render('compare/compare_cs.html')

			




	
	
	
		
 
        if c.ancestor:

			




	
	
	
		
 
            assert merge

			




	
	
	
		
 
            # case we want a simple diff without incoming changesets,

			




	
	
	
		
 
            # previewing what will be merged.

			




	
	
	
		
 
            # Make the diff on the other repo (which is known to have other_ref)

			




	
	
	
		
 
            log.debug('Using ancestor %s as org_ref instead of %s'

			




	
	
	
		
 
                      % (c.ancestor, org_ref))

			




	
	
	
		
 
            org_rev = c.ancestor

			




	
	
	
		
 
            # Make the diff on the other repo (which is known to have other_rev)

			




	
	
	
		
 
            log.debug('Using ancestor %s as rev1 instead of %s'

			




	
	
	
		
 
                      % (c.ancestor, c.org_rev))

			




	
	
	
		
 
            rev1 = c.ancestor

			




	
	
	
		
 
            org_repo = other_repo

			




	
	
	
		
 
        else: # comparing tips, not necessarily linearly related

			




	
	
	
		
 
            rev1 = c.org_rev

			




	
	
	
		
 

			




	
	
	
		
 
        diff_limit = self.cut_off_limit if not c.fulldiff else None

			




	
	
	
		
 

			




	
	
	
		
 
        log.debug('running diff between %s and %s in %s'

			




	
	
	
		
 
                  % (org_rev, other_rev, org_repo.scm_instance.path))

			




	
	
	
		
 
                  % (rev1, c.other_rev, org_repo.scm_instance.path))

			




	
	
	
		
 
        txtdiff = org_repo.scm_instance.get_diff(rev1=rev1, rev2=c.other_rev)

			




	
	
	
		
 

			




	
	
	
		
 
        txtdiff = org_repo.scm_instance.get_diff(rev1=org_rev, rev2=other_rev)

			




	
	
	
		
 
        diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',

			




	
	
	
		
 
                                             diff_limit=diff_limit)

			




	
	
	
		
 
        _parsed = diff_processor.prepare()

			




	
	
	
		
 

			




	
	
	
		
 
        c.limited_diff = False

			




	
	
	
		
 
        if isinstance(_parsed, LimitedDiffContainer):

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -176,47 +176,33 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
    def _load_compare_data(self, pull_request, enable_comments=True):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Load context data needed for generating compare diff

			




	
	
	
		
 

			




	
	
	
		
 
        :param pull_request:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        org_repo = pull_request.org_repo

			




	
	
	
		
 
        (org_ref_type,

			




	
	
	
		
 
         org_ref_name,

			




	
	
	
		
 
         org_ref_rev) = pull_request.org_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
        other_repo = org_repo

			




	
	
	
		
 
        (other_ref_type,

			




	
	
	
		
 
         other_ref_name,

			




	
	
	
		
 
         other_ref_rev) = pull_request.other_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
        # despite opening revisions for bookmarks/branches/tags, we always

			




	
	
	
		
 
        # convert this to rev to prevent changes after bookmark or branch change

			




	
	
	
		
 
        org_ref = ('rev', org_ref_rev)

			




	
	
	
		
 
        other_ref = ('rev', other_ref_rev)

			




	
	
	
		
 
        c.org_repo = pull_request.org_repo

			




	
	
	
		
 
        (c.org_ref_type,

			




	
	
	
		
 
         c.org_ref_name,

			




	
	
	
		
 
         c.org_rev) = pull_request.org_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
        c.org_repo = org_repo

			




	
	
	
		
 
        c.other_repo = other_repo

			




	
	
	
		
 

			




	
	
	
		
 
        c.fulldiff = fulldiff = request.GET.get('fulldiff')

			




	
	
	
		
 

			




	
	
	
		
 
        c.cs_ranges = [org_repo.get_changeset(x) for x in pull_request.revisions]

			




	
	
	
		
 
        c.other_repo = c.org_repo

			




	
	
	
		
 
        (c.other_ref_type,

			




	
	
	
		
 
         c.other_ref_name,

			




	
	
	
		
 
         c.other_rev) = pull_request.other_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
        c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])

			




	
	
	
		
 
        c.cs_ranges = [c.org_repo.get_changeset(x) for x in pull_request.revisions]

			




	
	
	
		
 

			




	
	
	
		
 
        c.org_ref = org_ref[1]

			




	
	
	
		
 
        c.org_ref_type = org_ref[0]

			




	
	
	
		
 
        c.other_ref = other_ref[1]

			




	
	
	
		
 
        c.other_ref_type = other_ref[0]

			




	
	
	
		
 
        c.statuses = c.org_repo.statuses([x.raw_id for x in c.cs_ranges])

			




	
	
	
		
 

			




	
	
	
		
 
        diff_limit = self.cut_off_limit if not fulldiff else None

			




	
	
	
		
 
        c.fulldiff = request.GET.get('fulldiff')

			




	
	
	
		
 
        diff_limit = self.cut_off_limit if not c.fulldiff else None

			




	
	
	
		
 

			




	
	
	
		
 
        # we swap org/other ref since we run a simple diff on one repo

			




	
	
	
		
 
        log.debug('running diff between %s and %s in %s'

			




	
	
	
		
 
                  % (other_ref, org_ref, org_repo.scm_instance.path))

			




	
	
	
		
 
        txtdiff = org_repo.scm_instance.get_diff(rev1=safe_str(other_ref[1]), rev2=safe_str(org_ref[1]))

			




	
	
	
		
 
                  % (c.other_rev, c.org_rev, c.org_repo.scm_instance.path))

			




	
	
	
		
 
        txtdiff = c.org_repo.scm_instance.get_diff(rev1=safe_str(c.other_rev), rev2=safe_str(c.org_rev))

			




	
	
	
		
 

			




	
	
	
		
 
        diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff',

			




	
	
	
		
 
                                             diff_limit=diff_limit)

			




	
	
	
		
 
        _parsed = diff_processor.prepare()

			




	
	
	
		
 

			




	
	
	
		
 
        c.limited_diff = False

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -164,13 +164,13 @@

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
          <ul>

			




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

			




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

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
              %if c.db_repo.fork:

			




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

			




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

			




	
	
	
		
 
                   <i class="icon-loop"></i> ${_('Compare fork')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></i> ${_('Compare')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/bookmarks/bookmarks.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -37,13 +37,13 @@ ${self.repo_context_bar('switch-to')}

			




	
	
	
		
 
YUE.on('compare_bookmarks','click',function(e){

			




	
	
	
		
 
    YUE.preventDefault(e);

			




	
	
	
		
 
    var org = YUQ('input[name=compare_org]:checked')[0];

			




	
	
	
		
 
    var other = YUQ('input[name=compare_other]:checked')[0];

			




	
	
	
		
 

			




	
	
	
		
 
    if(org && other){

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='book',org_ref='__ORG__',other_ref_type='book',other_ref='__OTHER__')}";

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='book',org_ref_name='__ORG__',other_ref_type='book',other_ref_name='__OTHER__')}";

			




	
	
	
		
 
        var u = compare_url.replace('__ORG__',org.value)

			




	
	
	
		
 
                           .replace('__OTHER__',other.value);

			




	
	
	
		
 
        window.location=u;

			




	
	
	
		
 
    }

			




	
	
	
		
 
});

			




	
	
	
		
 
// main table sorting

			




        

    


    
    

    

        

                

                    kallithea/templates/branches/branches.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,13 +36,13 @@ ${self.repo_context_bar('switch-to')}

			




	
	
	
		
 
YUE.on('compare_branches','click',function(e){

			




	
	
	
		
 
    YUE.preventDefault(e);

			




	
	
	
		
 
    var org = YUQ('input[name=compare_org]:checked')[0];

			




	
	
	
		
 
    var other = YUQ('input[name=compare_other]:checked')[0];

			




	
	
	
		
 

			




	
	
	
		
 
    if(org && other){

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='__ORG__',other_ref_type='branch',other_ref='__OTHER__')}";

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref_name='__ORG__',other_ref_type='branch',other_ref_name='__OTHER__')}";

			




	
	
	
		
 
        var u = compare_url.replace('__ORG__',org.value)

			




	
	
	
		
 
                           .replace('__OTHER__',other.value);

			




	
	
	
		
 
        window.location=u;

			




	
	
	
		
 
    }

			




	
	
	
		
 
});

			




	
	
	
		
 
// main table sorting

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -49,13 +49,13 @@ ${self.repo_context_bar('changelog', c.f

			




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

			




	
	
	
		
 
                                </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            %if c.db_repo.fork:

			




	
	
	
		
 
                                <a id="compare_fork"

			




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

			




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

			




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

			




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

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            ## text and href of open_new_pr is controlled from javascript

			




	
	
	
		
 
                            <a id="open_new_pr" class="btn btn-mini"></a>

			




	
	
	
		
 
                       </div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,13 +30,13 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}

			




	
	
	
		
 
                    <i class="icon-arrow-right"></i>

			




	
	
	
		
 
                    r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>

			




	
	
	
		
 
                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
            <table class="compare_view_commits noborder">

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -56,19 +56,19 @@

			




	
	
	
		
 
    <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>

			




	
	
	
		
 
    <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">

			




	
	
	
		
 
      <div class="code-header">

			




	
	
	
		
 
          <div class="changeset_header">

			




	
	
	
		
 
              <div class="changeset_file">

			




	
	
	
		
 
                  ${h.safe_unicode(filenode_path)} |

			




	
	
	
		
 
                  <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a>

			




	
	
	
		
 
                  <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_rev)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref_name) if c.org_ref_type=='rev' else c.org_ref_name}</a>

			




	
	
	
		
 
                  <i class="icon-arrow-right" style="font-size: 12px;color:#577632"></i>

			




	
	
	
		
 
                  <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>

			




	
	
	
		
 
                  <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_rev)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref_name) if c.other_ref_type=='rev' else c.other_ref_name}</a>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
               <div class="diff-actions">

			




	
	
	
		
 
                %if c.other_repo.repo_name == c.repo_name:

			




	
	
	
		
 
                  <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode_path),diff2=c.other_ref,diff1=c.org_ref,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}">

			




	
	
	
		
 
                  <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode_path),diff2=c.other_rev,diff1=c.org_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}">

			




	
	
	
		
 
                      <img class="icon" src="${h.url('/images/icons/application_double.png')}"/>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,13 +2,13 @@

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name}

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} &gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref_name)} &gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref_name)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
		
 
@@ -90,13 +90,13 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
</div>

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
   $(document).ready(function(){

			




	
	
	
		
 
    var cache = {}

			




	
	
	
		
 
    $("#compare_org").select2({

			




	
	
	
		
 
        placeholder: "${'%s@%s' % (c.org_repo.repo_name, c.org_ref)}",

			




	
	
	
		
 
        placeholder: "${'%s@%s' % (c.org_repo.repo_name, c.org_ref_name)}",

			




	
	
	
		
 
        formatSelection: function(obj){

			




	
	
	
		
 
            return '{0}@{1}'.format("${c.org_repo.repo_name}", obj.text)

			




	
	
	
		
 
        },

			




	
	
	
		
 
        dropdownAutoWidth: true,

			




	
	
	
		
 
        query: function(query){

			




	
	
	
		
 
          var key = 'cache';

			




	
	
		
 
@@ -130,13 +130,13 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                }

			




	
	
	
		
 
              })

			




	
	
	
		
 
          }

			




	
	
	
		
 
        },

			




	
	
	
		
 
    });

			




	
	
	
		
 
    $("#compare_other").select2({

			




	
	
	
		
 
        placeholder: "${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}",

			




	
	
	
		
 
        placeholder: "${'%s@%s' % (c.other_repo.repo_name, c.other_ref_name)}",

			




	
	
	
		
 
        dropdownAutoWidth: true,

			




	
	
	
		
 
        formatSelection: function(obj){

			




	
	
	
		
 
            return '{0}@{1}'.format("${c.other_repo.repo_name}", obj.text)

			




	
	
	
		
 
        },

			




	
	
	
		
 
        query: function(query){

			




	
	
	
		
 
          var key = 'cache2';

			




	
	
		
 
@@ -174,13 +174,13 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
    $('#compare_revs').on('click', function(e){

			




	
	
	
		
 
        var org = $('#compare_org').select2('data');

			




	
	
	
		
 
        var other = $('#compare_other').select2('data');

			




	
	
	
		
 

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='__other_ref_type__',org_ref='__org__',other_ref_type='__org_ref_type__',other_ref='__other__', other_repo=c.other_repo.repo_name)}";

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='__other_ref_type__',org_ref_name='__org__',other_ref_type='__org_ref_type__',other_ref_name='__other__', other_repo=c.other_repo.repo_name)}";

			




	
	
	
		
 
        var u = compare_url.replace('__other_ref_type__',org.type)

			




	
	
	
		
 
                           .replace('__org__',org.text)

			




	
	
	
		
 
                           .replace('__org_ref_type__',other.type)

			




	
	
	
		
 
                           .replace('__other__',other.text);

			




	
	
	
		
 
        window.location=u;

			




	
	
	
		
 
    })

			




        

    


    
    

    

        

                

                    kallithea/templates/forks/forks_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,13 +14,13 @@

			




	
	
	
		
 
                <div style="padding:5px 3px 3px 42px;">${f.description}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
            <div class="follower_date">${_('Forked')} -

			




	
	
	
		
 
                <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>

			




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

			




	
	
	
		
 
                   href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref=c.db_repo.landing_rev[1], merge=1)}"

			




	
	
	
		
 
                   href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"

			




	
	
	
		
 
                   class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork')}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    % endfor

			




	
	
	
		
 
  <div class="pagination-wh pagination-left">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -168,38 +168,36 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
  }

			




	
	
	
		
 

			




	
	
	
		
 
  var loadPreview = function(){

			




	
	
	
		
 
      //url template

			




	
	
	
		
 
      var url = "${h.url('compare_url',

			




	
	
	
		
 
                         repo_name='__other_repo__',

			




	
	
	
		
 
                         org_ref_type='__other_ref_type__',

			




	
	
	
		
 
                         org_ref='__other_ref__',

			




	
	
	
		
 
                         org_ref_type='rev',

			




	
	
	
		
 
                         org_ref_name='__other_ref_name__',

			




	
	
	
		
 
                         other_repo='__org_repo__',

			




	
	
	
		
 
                         other_ref_type='__org_ref_type__',

			




	
	
	
		
 
                         other_ref='__org_ref__',

			




	
	
	
		
 
                         other_ref_type='rev',

			




	
	
	
		
 
                         other_ref_name='__org_ref_name__',

			




	
	
	
		
 
                         as_form=True,

			




	
	
	
		
 
                         merge=True,

			




	
	
	
		
 
                         )}";

			




	
	
	
		
 
      var org_repo = YUQ('#pull_request_form #org_repo')[0].value;

			




	
	
	
		
 
      var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');

			




	
	
	
		
 

			




	
	
	
		
 
      var other_repo = YUQ('#pull_request_form #other_repo')[0].value;

			




	
	
	
		
 
      var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');

			




	
	
	
		
 

			




	
	
	
		
 
      var select_refs = YUQ('#pull_request_form select.refs')

			




	
	
	
		
 
      var rev_data = {

			




	
	
	
		
 
          'org_repo': org_repo,

			




	
	
	
		
 
          'org_ref': org_ref[2],

			




	
	
	
		
 
          'org_ref_type': 'rev',

			




	
	
	
		
 
          'other_repo': other_repo,

			




	
	
	
		
 
          'other_ref': other_ref[2],

			




	
	
	
		
 
          'other_ref_type': 'rev',

			




	
	
	
		
 
          '__org_repo__': org_repo,

			




	
	
	
		
 
          '__org_ref_name__': org_ref[2],

			




	
	
	
		
 
          '__other_repo__': other_repo,

			




	
	
	
		
 
          '__other_ref_name__': other_ref[2],

			




	
	
	
		
 
      }; // gather the org/other ref and repo here

			




	
	
	
		
 

			




	
	
	
		
 
      for (k in rev_data){

			




	
	
	
		
 
          url = url.replace('__'+k+'__',rev_data[k]);

			




	
	
	
		
 
          url = url.replace(k,rev_data[k]);

			




	
	
	
		
 
      }

			




	
	
	
		
 

			




	
	
	
		
 
      YUD.get('pull_request_overview').innerHTML = "${_('Loading ...')}";

			




	
	
	
		
 
      ypjax(url,'pull_request_overview');

			




	
	
	
		
 

			




	
	
	
		
 
      YUD.get('pull_request_overview_url').href = url; // shouldn't have as_form ... but ...

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -69,13 +69,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
              <span><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>

			




	
	
	
		
 

			




	
	
	
		
 
              ## branch link is only valid if it is a branch

			




	
	
	
		
 
              <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name, anchor=c.pull_request.org_ref_parts[1])}">${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]}</a></span>

			




	
	
	
		
 
              <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name, anchor=c.org_ref_name)}">${c.org_ref_type}: ${c.org_ref_name}</a></span>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Pull changes')}:</label>

			




        

    


    
    

    

        

                

                    kallithea/templates/tags/tags.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,13 +36,13 @@ ${self.repo_context_bar('switch-to')}

			




	
	
	
		
 
YUE.on('compare_tags','click',function(e){

			




	
	
	
		
 
    YUE.preventDefault(e);

			




	
	
	
		
 
    var org = YUQ('input[name=compare_org]:checked')[0];

			




	
	
	
		
 
    var other = YUQ('input[name=compare_other]:checked')[0];

			




	
	
	
		
 

			




	
	
	
		
 
    if(org && other){

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='tag',org_ref='__ORG__',other_ref_type='tag',other_ref='__OTHER__')}";

			




	
	
	
		
 
        var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='tag',org_ref_name='__ORG__',other_ref_type='tag',other_ref_name='__OTHER__')}";

			




	
	
	
		
 
        var u = compare_url.replace('__ORG__',org.value)

			




	
	
	
		
 
                           .replace('__OTHER__',other.value);

			




	
	
	
		
 
        window.location=u;

			




	
	
	
		
 
    }

			




	
	
	
		
 
});

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -83,16 +83,16 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'default'

			




	
	
	
		
 
        rev2 = 'default'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev2,

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev1,

			




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

			




	
	
		
 
@@ -131,16 +131,16 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'master'

			




	
	
	
		
 
        rev2 = 'master'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev2,

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev1,

			




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

			




	
	
		
 
@@ -186,16 +186,16 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'default'

			




	
	
	
		
 
        rev2 = 'default'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev2,

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev1,

			




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

			




	
	
		
 
@@ -241,16 +241,16 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'master'

			




	
	
	
		
 
        rev2 = 'master'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev2,

			




	
	
	
		
 
                                    org_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev1,

			




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

			




	
	
		
 
@@ -304,16 +304,16 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',

			




	
	
	
		
 
                             message='commit6', vcs_type='hg', parent=cs4)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=repo2.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




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

			




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

			




	
	
	
		
 
                                    other_repo=repo1.repo_name,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=cs4.short_id,

			




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

			




	
	
		
 
@@ -366,15 +366,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',

			




	
	
	
		
 
                             message='commit6', vcs_type='hg', parent=cs4)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




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

			




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

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=cs5.short_id,

			




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

			




	
	
		
 
@@ -401,15 +401,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = '56349e29c2af'

			




	
	
	
		
 
        rev2 = '7d4bc8ec6be5'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    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

			




	
	
		
 
@@ -431,15 +431,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = '102607b09cdd60e2793929c4f90478be29f85a17'

			




	
	
	
		
 
        rev2 = 'd7e0d30fbcae12c90680eb095a4f5f02505ce501'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    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

			




	
	
		
 
@@ -497,15 +497,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'default'

			




	
	
	
		
 
        rev2 = 'default'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=r2_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=r1_name,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        response.mustcontain('No files')

			




	
	
		
 
@@ -518,15 +518,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        #compare !

			




	
	
	
		
 
        rev1 = 'default'

			




	
	
	
		
 
        rev2 = 'default'

			




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

			




	
	
	
		
 
                                    repo_name=r2_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=r1_name,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




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

			




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

			




	
	
		
 
@@ -579,15 +579,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'master'

			




	
	
	
		
 
        rev2 = 'master'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=r2_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=r1_name,

			




	
	
	
		
 
                                    merge='1',))

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
        response.mustcontain('No files')

			




	
	
		
 
@@ -600,15 +600,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        #compare !

			




	
	
	
		
 
        rev1 = 'master'

			




	
	
	
		
 
        rev2 = 'master'

			




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

			




	
	
	
		
 
                                    repo_name=r2_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_ref_name=rev2,

			




	
	
	
		
 
                                    other_repo=r1_name,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




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

			




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

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare_local.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,15 +7,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        tag1 = 'v0.1.2'

			




	
	
	
		
 
        tag2 = 'v0.1.3'

			




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

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref=tag1,

			




	
	
	
		
 
                                    org_ref_name=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    other_ref=tag2,

			




	
	
	
		
 
                                    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)

			




	
	
		
 
@@ -45,15 +45,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        tag1 = 'v0.1.2'

			




	
	
	
		
 
        tag2 = 'v0.1.3'

			




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

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref=tag1,

			




	
	
	
		
 
                                    org_ref_name=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    other_ref=tag2,

			




	
	
	
		
 
                                    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)

			




	
	
		
 
@@ -81,15 +81,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_branch_hg(self):

			




	
	
	
		
 
        self.log_user()

			




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

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref='default',

			




	
	
	
		
 
                                    org_ref_name='default',

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref='default',

			




	
	
	
		
 
                                    other_ref_name='default',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@default' % (HG_REPO))

			




	
	
	
		
 
        response.mustcontain('%s@default' % (HG_REPO))

			




	
	
	
		
 
        # branch are equal

			




	
	
	
		
 
        response.mustcontain('<span class="empty_data">No files</span>')

			




	
	
		
 
@@ -97,15 +97,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_branch_git(self):

			




	
	
	
		
 
        self.log_user()

			




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

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref='master',

			




	
	
	
		
 
                                    org_ref_name='master',

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref='master',

			




	
	
	
		
 
                                    other_ref_name='master',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@master' % (GIT_REPO))

			




	
	
	
		
 
        response.mustcontain('%s@master' % (GIT_REPO))

			




	
	
	
		
 
        # branch are equal

			




	
	
	
		
 
        response.mustcontain('<span class="empty_data">No files</span>')

			




	
	
		
 
@@ -116,15 +116,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'b986218ba1c9'

			




	
	
	
		
 
        rev2 = '3d8f361e72ab'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=rev2,

			




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

			




	
	
		
 
@@ -138,15 +138,15 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3'

			




	
	
	
		
 
        rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    org_ref_name=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=rev2,

			




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

			




        

    



    


    



    



      

      





    
    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.