Changeset - 2053053e0882
Parent rev.
Child rev.
[Not reviewed]
beta
0 8 0
Mads Kiilerich - 13 years ago 2013-03-05 11:55:01
madski@unity3d.com
Grafted from: bbc672bf2cbb
compare/pullrequest: introduce merge parameter

This is more correct and flexible than the old way of looking on same/different
repo.
8 files changed with 66 insertions and 33 deletions:
rhodecode/controllers/compare.py
19
8
rhodecode/controllers/pullrequests.py
3
6
rhodecode/model/forms.py
3
rhodecode/model/pull_request.py
14
8
rhodecode/templates/changelog/changelog.html
1
1
rhodecode/templates/compare/compare_cs.html
11
3
rhodecode/templates/pullrequests/pullrequest.html
1
rhodecode/tests/functional/test_compare.py
14
7
0 comments (0 inline, 0 general)
rhodecode/controllers/compare.py
➞
Show inline comments
 
@@ -86,24 +86,34 @@ class CompareController(BaseRepoControll
 
        # org_ref will be evaluated in org_repo
 
        org_repo = c.rhodecode_db_repo.repo_name
 
        org_ref = (org_ref_type, org_ref)
 
        # other_ref will be evaluated in other_repo
 
        other_ref = (other_ref_type, other_ref)
 
        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.
 
        # If merge is False:
 
        #   Make a raw diff from org to other, no matter if related or not.
 
        #   Changesets in one and not in the other will be ignored
 
        merge = bool(request.GET.get('merge'))
 
        # fulldiff disables cut_off_limit
 
        c.fulldiff = request.GET.get('fulldiff')
 
        # partial uses compare_cs.html template directly
 
        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],
 
            other_repo=org_repo,
 
            other_ref_type=org_ref[0], other_ref=org_ref[1])
 
            other_ref_type=org_ref[0], other_ref=org_ref[1],
 
            merge=merge or '')
 

			




	
	
	
		
 
        org_repo = Repository.get_by_repo_name(org_repo)

			




	
	
	
		
 
        other_repo = Repository.get_by_repo_name(other_repo)

			




	
	
	
		
 

			




	
	
	
		
 
        self.__get_cs_or_redirect(rev=org_ref, repo=org_repo, partial=partial)

			




	
	
	
		
 
        self.__get_cs_or_redirect(rev=other_ref, repo=other_repo, partial=partial)

			




	
	
		
 
@@ -127,28 +137,29 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        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.cs_ranges, ancestor = PullRequestModel().get_compare_data(

			




	
	
	
		
 
            org_repo, org_ref, other_repo, other_ref)

			




	
	
	
		
 
        c.cs_ranges, c.ancestor = PullRequestModel().get_compare_data(

			




	
	
	
		
 
            org_repo, org_ref, other_repo, other_ref, merge)

			




	
	
	
		
 

			




	
	
	
		
 
        c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in

			




	
	
	
		
 
                                                   c.cs_ranges])

			




	
	
	
		
 
        if partial:

			




	
	
	
		
 
            assert c.ancestor

			




	
	
	
		
 
            return render('compare/compare_cs.html')

			




	
	
	
		
 

			




	
	
	
		
 
        if ancestor and org_repo != other_repo:

			




	
	
	
		
 
        if c.ancestor:

			




	
	
	
		
 
            assert merge

			




	
	
	
		
 
            # case we want a simple diff without incoming changesets,

			




	
	
	
		
 
            # previewing what will be merged.

			




	
	
	
		
 
            # Make the diff on the forked repo, with

			




	
	
	
		
 
            # revision that is common ancestor

			




	
	
	
		
 
            # 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'

			




	
	
	
		
 
                      % (ancestor, org_ref))

			




	
	
	
		
 
            org_ref = ('rev', ancestor)

			




	
	
	
		
 
                      % (c.ancestor, org_ref))

			




	
	
	
		
 
            org_ref = ('rev', c.ancestor)

			




	
	
	
		
 
            org_repo = other_repo

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -193,15 +193,15 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                msg = _('error during creation of pull request')

			




	
	
	
		
 

			




	
	
	
		
 
            h.flash(msg, 'error')

			




	
	
	
		
 
            return redirect(url('pullrequest_home', repo_name=repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        org_repo = _form['org_repo']

			




	
	
	
		
 
        org_ref = _form['org_ref']

			




	
	
	
		
 
        org_ref = 'rev:merge:%s' % _form['merge_rev']

			




	
	
	
		
 
        other_repo = _form['other_repo']

			




	
	
	
		
 
        other_ref = _form['other_ref']

			




	
	
	
		
 
        other_ref = 'rev:ancestor:%s' % _form['ancestor_rev']

			




	
	
	
		
 
        revisions = _form['revisions']

			




	
	
	
		
 
        reviewers = _form['review_members']

			




	
	
	
		
 

			




	
	
	
		
 
        title = _form['pullrequest_title']

			




	
	
	
		
 
        description = _form['pullrequest_desc']

			




	
	
	
		
 

			




	
	
		
 
@@ -278,16 +278,12 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        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]

			




	
	
	
		
 

			




	
	
	
		
 
        other_ref = ('rev', getattr(c.cs_ranges[0].parents[0]

			




	
	
	
		
 
                                  if c.cs_ranges[0].parents

			




	
	
	
		
 
                                  else EmptyChangeset(), 'raw_id'))

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        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]

			




	
	
		
 
@@ -382,12 +378,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
            c.current_changeset_status = cs_model.calculate_status(

			




	
	
	
		
 
                                            c.pull_request_reviewers,

			




	
	
	
		
 
                                         )

			




	
	
	
		
 
        c.changeset_statuses = ChangesetStatus.STATUSES

			




	
	
	
		
 

			




	
	
	
		
 
        c.as_form = False

			




	
	
	
		
 
        c.ancestor = None # there is one - but right here we don't know which

			




	
	
	
		
 
        return render('/pullrequests/pullrequest_show.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def comment(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




        

    


    
    

    

        

                

                    rhodecode/model/forms.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -392,7 +392,10 @@ def PullRequestForm(repo_id):

			




	
	
	
		
 
                        v.UniqueList(not_empty=True))

			




	
	
	
		
 
        review_members = v.UniqueList(not_empty=True)

			




	
	
	
		
 

			




	
	
	
		
 
        pullrequest_title = v.UnicodeString(strip=True, required=True, min=3)

			




	
	
	
		
 
        pullrequest_desc = v.UnicodeString(strip=True, required=False)

			




	
	
	
		
 

			




	
	
	
		
 
        ancestor_rev = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        merge_rev = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 

			




	
	
	
		
 
    return _PullRequestForm

			




        

    


    
    

    

        

                

                    rhodecode/model/pull_request.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -158,13 +158,13 @@ class PullRequestModel(BaseModel):

			




	
	
	
		
 
    def close_pull_request(self, pull_request):

			




	
	
	
		
 
        pull_request = self.__get_pull_request(pull_request)

			




	
	
	
		
 
        pull_request.status = PullRequest.STATUS_CLOSED

			




	
	
	
		
 
        pull_request.updated_on = datetime.datetime.now()

			




	
	
	
		
 
        Session().add(pull_request)

			




	
	
	
		
 

			




	
	
	
		
 
    def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref):

			




	
	
	
		
 
    def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref, merge):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns a list of changesets that can be merged from org_repo@org_ref

			




	
	
	
		
 
        to other_repo@other_ref ... and the ancestor that would be used for merge

			




	
	
	
		
 

			




	
	
	
		
 
        :param org_repo:

			




	
	
	
		
 
        :param org_ref:

			




	
	
		
 
@@ -208,35 +208,40 @@ class PullRequestModel(BaseModel):

			




	
	
	
		
 
                # so rev numbers from hgrepo can be used in other_repo

			




	
	
	
		
 

			




	
	
	
		
 
            #no remote compare do it on the same repository

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                hgrepo = other_repo._repo

			




	
	
	
		
 

			




	
	
	
		
 
            revs = ["ancestors(id('%s')) and not ancestors(id('%s'))" %

			




	
	
	
		
 
                    (other_rev, org_rev)]

			




	
	
	
		
 
            changesets = [other_repo.get_changeset(cs)

			




	
	
	
		
 
                          for cs in scmutil.revrange(hgrepo, revs)]

			




	
	
	
		
 
            if merge:

			




	
	
	
		
 
                revs = ["ancestors(id('%s')) and not ancestors(id('%s')) and not id('%s')" %

			




	
	
	
		
 
                        (other_rev, org_rev, org_rev)]

			




	
	
	
		
 

			




	
	
	
		
 
            if org_repo != other_repo:

			




	
	
	
		
 
                ancestors = scmutil.revrange(hgrepo,

			




	
	
	
		
 
                     ["ancestor(id('%s'), id('%s'))" % (org_rev, other_rev)])

			




	
	
	
		
 
                if len(ancestors) == 1:

			




	
	
	
		
 
                    ancestor = hgrepo[ancestors[0]].hex()

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                # TODO: have both + and - changesets

			




	
	
	
		
 
                revs = ["id('%s') :: id('%s') - id('%s')" %

			




	
	
	
		
 
                        (org_rev, other_rev, org_rev)]

			




	
	
	
		
 

			




	
	
	
		
 
            changesets = [other_repo.get_changeset(cs)

			




	
	
	
		
 
                          for cs in scmutil.revrange(hgrepo, revs)]

			




	
	
	
		
 

			




	
	
	
		
 
        elif alias == 'git':

			




	
	
	
		
 
            assert org_repo == other_repo, (org_repo, other_repo) # no git support for different repos

			




	
	
	
		
 
            so, se = org_repo.run_git_command(

			




	
	
	
		
 
                'log --reverse --pretty="format: %%H" -s -p %s..%s' % (org_ref[1],

			




	
	
	
		
 
                                                                       other_ref[1])

			




	
	
	
		
 
            )

			




	
	
	
		
 
            changesets = [org_repo.get_changeset(cs)

			




	
	
	
		
 
                          for cs in re.findall(r'[0-9a-fA-F]{40}', so)]

			




	
	
	
		
 

			




	
	
	
		
 
        return changesets, ancestor

			




	
	
	
		
 

			




	
	
	
		
 
    def get_compare_data(self, org_repo, org_ref, other_repo, other_ref):

			




	
	
	
		
 
    def get_compare_data(self, org_repo, org_ref, other_repo, other_ref, merge):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns incoming changesets for mercurial repositories

			




	
	
	
		
 

			




	
	
	
		
 
        :param org_repo:

			




	
	
	
		
 
        :param org_ref:

			




	
	
	
		
 
        :param other_repo:

			




	
	
		
 
@@ -248,8 +253,9 @@ class PullRequestModel(BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        if len(other_ref) != 2 or not isinstance(org_ref, (list, tuple)):

			




	
	
	
		
 
            raise Exception('other_ref must be a two element list/tuple')

			




	
	
	
		
 

			




	
	
	
		
 
        cs_ranges, ancestor = self._get_changesets(org_repo.scm_instance.alias,

			




	
	
	
		
 
                                                   org_repo.scm_instance, org_ref,

			




	
	
	
		
 
                                                   other_repo.scm_instance, other_ref)

			




	
	
	
		
 
                                                   other_repo.scm_instance, other_ref,

			




	
	
	
		
 
                                                   merge)

			




	
	
	
		
 
        return cs_ranges, ancestor

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -34,13 +34,13 @@ ${_('%s Changelog') % c.repo_name} - ${c

			




	
	
	
		
 
                <div id="graph_content">

			




	
	
	
		
 
                    <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
                    %if c.rhodecode_db_repo.fork:

			




	
	
	
		
 
                        <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default')}" class="ui-btn small">${_('Compare fork with parent')}</a>

			




	
	
	
		
 
                        <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default',merge=1)}" class="ui-btn small">${_('Compare fork with parent')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    %if h.is_hg(c.rhodecode_repo):

			




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

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="container_header">

			




        

    


    
    

    

        

                

                    rhodecode/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  <table class="compare_view_commits noborder">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




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

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




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

			




	
	
	
		
 
        <tr>

			




	
	
	
		
 
        <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
            <div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div>

			




	
	
		
 
@@ -19,10 +19,18 @@

			




	
	
	
		
 
        </td>

			




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

			




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

			




	
	
	
		
 
        <td><div class="message tooltip" title="${h.tooltip(cs.message)}" style="white-space:normal">${h.urlify_commit(h.shorter(cs.message, 60),c.repo_name)}</div></td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 

			




	
	
	
		
 
    </table>

			




	
	
	
		
 
    %if c.ancestor:

			




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

			




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

			




	
	
	
		
 
    </span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.as_form:

			




	
	
	
		
 
      ${h.hidden('ancestor_rev',c.ancestor)}

			




	
	
	
		
 
      ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  </table>

			




	
	
	
		
 
</div>

			




        

    


    
    

    

        

                

                    rhodecode/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -130,12 +130,13 @@

			




	
	
	
		
 
                         org_ref_type='__other_ref_type__',

			




	
	
	
		
 
                         org_ref='__other_ref__',

			




	
	
	
		
 
                         other_repo='__org_repo__',

			




	
	
	
		
 
                         other_ref_type='__org_ref_type__',

			




	
	
	
		
 
                         other_ref='__org_ref__',

			




	
	
	
		
 
                         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(':');

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -103,27 +103,28 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev1,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1))

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")

			




	
	
	
		
 
        response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',

			




	
	
	
		
 
                                        description='diff-test',

			




	
	
		
 
@@ -157,26 +158,27 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev2,

			




	
	
	
		
 
                                    other_repo=repo2.repo_name,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev1,

			




	
	
	
		
 
                                    merge='x',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (repo1.repo_name, rev2, repo2.repo_name, rev1))

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="message tooltip" title="commit2" style="white-space:normal">commit2</div>""")

			




	
	
	
		
 
        response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=x#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))

			




	
	
	
		
 
        #swap

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True">[swap]</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_cherry_pick_changesets_from_bottom(self):

			




	
	
	
		
 

			




	
	
	
		
 
#        repo1:

			




	
	
	
		
 
#            cs0:

			




	
	
	
		
 
#            cs1:

			




	
	
		
 
@@ -219,12 +221,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=repo2.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




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

			




	
	
	
		
 
                                    other_repo=repo1.repo_name,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=cs4.short_id,

			




	
	
	
		
 
                                    merge='True',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (repo2.repo_name, cs1.short_id, repo1.repo_name, cs4.short_id))

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="message tooltip" title="commit3" style="white-space:normal">commit3</div>""")

			




	
	
		
 
@@ -278,12 +281,13 @@ class TestCompareController(TestControll

			




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

			




	
	
	
		
 
                                    repo_name=repo1.repo_name,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




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

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=cs5.short_id,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (repo1.repo_name, cs2.short_id, repo1.repo_name, cs5.short_id))

			




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

			




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

			




	
	
	
		
 

			




	
	
		
 
@@ -316,24 +320,25 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    org_ref_type="rev",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    other_ref_type="rev",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_repo=HG_FORK,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (HG_REPO, rev1, 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))

			




	
	
	
		
 

			




	
	
	
		
 
        ## files

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))

			




	
	
	
		
 
        response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))

			




	
	
	
		
 

			




	
	
	
		
 
    def test_org_repo_new_commits_after_forking_simple_diff(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        repo1 = RepoModel().create_repo(repo_name='one', repo_type='hg',

			




	
	
	
		
 
                                        description='diff-test',

			




	
	
		
 
@@ -398,12 +403,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=r2_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_repo=r1_name,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))

			




	
	
	
		
 
        response.mustcontain('No files')

			




	
	
	
		
 
        response.mustcontain('No changesets')

			




	
	
	
		
 

			




	
	
	
		
 
        #add new commit into parent !

			




	
	
		
 
@@ -422,12 +428,13 @@ class TestCompareController(TestControll

			




	
	
	
		
 
                                    repo_name=r2_name,

			




	
	
	
		
 
                                    org_ref_type="branch",

			




	
	
	
		
 
                                    org_ref=rev1,

			




	
	
	
		
 
                                    other_ref_type="branch",

			




	
	
	
		
 
                                    other_ref=rev2,

			




	
	
	
		
 
                                    other_repo=r1_name,

			




	
	
	
		
 
                                    merge='1',

			




	
	
	
		
 
                                    ))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('%s@%s -&gt; %s@%s' % (r2_name, rev1, r1_name, rev2))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""commit2-parent""")

			




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

			




        

    



    


    



    



      

      





    
    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.