Changeset - 23def9978ec3
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 11 years ago 2014-08-21 23:46:55
madski@unity3d.com
pull requests: inline _load_compare_data - it is modifying state and serve no purpose as separate method
1 file changed with 90 insertions and 98 deletions:
kallithea/controllers/pullrequests.py
90
98
0 comments (0 inline, 0 general)
kallithea/controllers/pullrequests.py
➞
Show inline comments
 
@@ -183,121 +183,24 @@ class PullrequestsController(BaseRepoCon
 
                  ]
 
        return [g for g in groups if g[0]], selected
 

			




	
	
	
		
 
    def _get_is_allowed_change_status(self, pull_request):

			




	
	
	
		
 
        if pull_request.is_closed():

			




	
	
	
		
 
            return False

			




	
	
	
		
 

			




	
	
	
		
 
        owner = self.authuser.user_id == pull_request.user_id

			




	
	
	
		
 
        reviewer = self.authuser.user_id in [x.user_id for x in

			




	
	
	
		
 
                                                   pull_request.reviewers]

			




	
	
	
		
 
        return self.authuser.admin or owner or reviewer

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Load context data needed for generating compare diff

			




	
	
	
		
 

			




	
	
	
		
 
        :param pull_request:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        c.org_repo = pull_request.org_repo

			




	
	
	
		
 
        (c.org_ref_type,

			




	
	
	
		
 
         c.org_ref_name,

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        c.other_repo = pull_request.other_repo

			




	
	
	
		
 
        (c.other_ref_type,

			




	
	
	
		
 
         c.other_ref_name,

			




	
	
	
		
 
         c.other_rev) = pull_request.other_ref.split(':') # other_rev is ancestor

			




	
	
	
		
 

			




	
	
	
		
 
        org_scm_instance = c.org_repo.scm_instance # property with expensive cache invalidation check!!!

			




	
	
	
		
 
        c.cs_repo = c.org_repo

			




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

			




	
	
	
		
 
        c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...

			




	
	
	
		
 
        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

			




	
	
	
		
 
        c.jsdata = json.dumps(graph_data(org_scm_instance, revs))

			




	
	
	
		
 

			




	
	
	
		
 
        c.available = []

			




	
	
	
		
 
        c.org_branch_name = c.org_ref_name

			




	
	
	
		
 
        other_scm_instance = c.other_repo.scm_instance

			




	
	
	
		
 
        if org_scm_instance.alias == 'hg' and c.other_ref_name != 'ancestor':

			




	
	
	
		
 
            if c.org_ref_type != 'branch':

			




	
	
	
		
 
                c.org_branch_name = org_scm_instance.get_changeset(c.org_ref_name).branch # use ref_type ?

			




	
	
	
		
 
            other_branch_name = c.other_ref_name

			




	
	
	
		
 
            if c.other_ref_type != 'branch':

			




	
	
	
		
 
                other_branch_name = other_scm_instance.get_changeset(c.other_ref_name).branch # use ref_type ?

			




	
	
	
		
 
            # candidates: descendants of old head that are on the right branch

			




	
	
	
		
 
            #             and not are the old head itself ...

			




	
	
	
		
 
            #             and nothing at all if old head is a descendent of target ref name

			




	
	
	
		
 
            if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, other_branch_name):

			




	
	
	
		
 
                c.update_msg = _('This pull request has already been merged to %s.') % other_branch_name

			




	
	
	
		
 
            else: # look for children of PR head on source branch in org repo

			




	
	
	
		
 
                arevs = org_scm_instance._repo.revs('%s:: & branch(%s) - %s',

			




	
	
	
		
 
                                                    revs[0], c.org_branch_name, revs[0])

			




	
	
	
		
 
                if arevs:

			




	
	
	
		
 
                    if c.pull_request.is_closed():

			




	
	
	
		
 
                        c.update_msg = _('This pull request has been closed and can not be updated with descendent changes on %s:') % c.org_branch_name

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        c.update_msg = _('This pull request can be updated with descendent changes on %s:') % c.org_branch_name

			




	
	
	
		
 
                    c.available = [org_scm_instance.get_changeset(x) for x in arevs]

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    c.update_msg = _('No changesets found for updating this pull request.')

			




	
	
	
		
 

			




	
	
	
		
 
            revs = org_scm_instance._repo.revs('head() & not (%s::) & branch(%s) & !closed()', revs[0], c.org_branch_name)

			




	
	
	
		
 
            if revs:

			




	
	
	
		
 
                c.update_msg_other = _('Note: Branch %s also contains unrelated changes, such as %s.') % (c.org_branch_name,

			




	
	
	
		
 
                    h.short_id(org_scm_instance.get_changeset((max(revs))).raw_id))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.update_msg_other = _('Branch %s does not contain other changes.') % c.org_branch_name

			




	
	
	
		
 

			




	
	
	
		
 
        raw_ids = [x.raw_id for x in c.cs_ranges]

			




	
	
	
		
 
        c.cs_comments = c.org_repo.get_comments(raw_ids)

			




	
	
	
		
 
        c.statuses = c.org_repo.statuses(raw_ids)

			




	
	
	
		
 

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = request.GET.get('context', 3)

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 
        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'

			




	
	
	
		
 
                  % (c.other_rev, c.org_rev, org_scm_instance.path))

			




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

			




	
	
	
		
 
                                      ignore_whitespace=ignore_whitespace,

			




	
	
	
		
 
                                      context=line_context)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                             diff_limit=diff_limit)

			




	
	
	
		
 
        _parsed = diff_processor.prepare()

			




	
	
	
		
 

			




	
	
	
		
 
        c.limited_diff = False

			




	
	
	
		
 
        if isinstance(_parsed, LimitedDiffContainer):

			




	
	
	
		
 
            c.limited_diff = True

			




	
	
	
		
 

			




	
	
	
		
 
        c.files = []

			




	
	
	
		
 
        c.changes = {}

			




	
	
	
		
 
        c.lines_added = 0

			




	
	
	
		
 
        c.lines_deleted = 0

			




	
	
	
		
 

			




	
	
	
		
 
        for f in _parsed:

			




	
	
	
		
 
            st = f['stats']

			




	
	
	
		
 
            c.lines_added += st['added']

			




	
	
	
		
 
            c.lines_deleted += st['deleted']

			




	
	
	
		
 
            fid = h.FID('', f['filename'])

			




	
	
	
		
 
            c.files.append([fid, f['operation'], f['filename'], f['stats']])

			




	
	
	
		
 
            htmldiff = diff_processor.as_html(enable_comments=enable_comments,

			




	
	
	
		
 
                                              parsed_lines=[f])

			




	
	
	
		
 
            c.changes[fid] = [f['operation'], f['filename'], htmldiff]

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def show_all(self, repo_name):

			




	
	
	
		
 
        c.from_ = request.GET.get('from_') or ''

			




	
	
	
		
 
        c.closed = request.GET.get('closed') or ''

			




	
	
	
		
 
        c.pull_requests = PullRequestModel().get_all(repo_name, from_=c.from_, closed=c.closed)

			




	
	
	
		
 
        c.repo_name = repo_name

			




	
	
	
		
 
        p = safe_int(request.GET.get('page', 1), 1)

			




	
	
	
		
 

			




	
	
	
		
 
        c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10)

			




	
	
	
		
 

			




	
	
		
 
@@ -641,25 +544,114 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        c.user_groups_array = repo_model.get_user_groups_js()

			




	
	
	
		
 
        c.pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)

			




	
	
	
		
 
        cc_model = ChangesetCommentsModel()

			




	
	
	
		
 
        cs_model = ChangesetStatusModel()

			




	
	
	
		
 

			




	
	
	
		
 
        # pull_requests repo_name we opened it against

			




	
	
	
		
 
        # ie. other_repo must match

			




	
	
	
		
 
        if repo_name != c.pull_request.other_repo.repo_name:

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
        # load compare data into template context

			




	
	
	
		
 
        self._load_compare_data(c.pull_request, enable_comments=True)

			




	
	
	
		
 
        c.org_repo = c.pull_request.org_repo

			




	
	
	
		
 
        (c.org_ref_type,

			




	
	
	
		
 
         c.org_ref_name,

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        c.other_repo = c.pull_request.other_repo

			




	
	
	
		
 
        (c.other_ref_type,

			




	
	
	
		
 
         c.other_ref_name,

			




	
	
	
		
 
         c.other_rev) = c.pull_request.other_ref.split(':') # other_rev is ancestor

			




	
	
	
		
 

			




	
	
	
		
 
        org_scm_instance = c.org_repo.scm_instance # property with expensive cache invalidation check!!!

			




	
	
	
		
 
        c.cs_repo = c.org_repo

			




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

			




	
	
	
		
 
        c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...

			




	
	
	
		
 
        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]

			




	
	
	
		
 
        c.jsdata = json.dumps(graph_data(org_scm_instance, revs))

			




	
	
	
		
 

			




	
	
	
		
 
        c.available = []

			




	
	
	
		
 
        c.org_branch_name = c.org_ref_name

			




	
	
	
		
 
        other_scm_instance = c.other_repo.scm_instance

			




	
	
	
		
 
        if org_scm_instance.alias == 'hg' and c.other_ref_name != 'ancestor':

			




	
	
	
		
 
            if c.org_ref_type != 'branch':

			




	
	
	
		
 
                c.org_branch_name = org_scm_instance.get_changeset(c.org_ref_name).branch # use ref_type ?

			




	
	
	
		
 
            other_branch_name = c.other_ref_name

			




	
	
	
		
 
            if c.other_ref_type != 'branch':

			




	
	
	
		
 
                other_branch_name = other_scm_instance.get_changeset(c.other_ref_name).branch # use ref_type ?

			




	
	
	
		
 
            # candidates: descendants of old head that are on the right branch

			




	
	
	
		
 
            #             and not are the old head itself ...

			




	
	
	
		
 
            #             and nothing at all if old head is a descendent of target ref name

			




	
	
	
		
 
            if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, other_branch_name):

			




	
	
	
		
 
                c.update_msg = _('This pull request has already been merged to %s.') % other_branch_name

			




	
	
	
		
 
            else: # look for children of PR head on source branch in org repo

			




	
	
	
		
 
                arevs = org_scm_instance._repo.revs('%s:: & branch(%s) - %s',

			




	
	
	
		
 
                                                    revs[0], c.org_branch_name, revs[0])

			




	
	
	
		
 
                if arevs:

			




	
	
	
		
 
                    if c.pull_request.is_closed():

			




	
	
	
		
 
                        c.update_msg = _('This pull request has been closed and can not be updated with descendent changes on %s:') % c.org_branch_name

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        c.update_msg = _('This pull request can be updated with descendent changes on %s:') % c.org_branch_name

			




	
	
	
		
 
                    c.available = [org_scm_instance.get_changeset(x) for x in arevs]

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    c.update_msg = _('No changesets found for updating this pull request.')

			




	
	
	
		
 

			




	
	
	
		
 
            revs = org_scm_instance._repo.revs('head() & not (%s::) & branch(%s) & !closed()', revs[0], c.org_branch_name)

			




	
	
	
		
 
            if revs:

			




	
	
	
		
 
                c.update_msg_other = _('Note: Branch %s also contains unrelated changes, such as %s.') % (c.org_branch_name,

			




	
	
	
		
 
                    h.short_id(org_scm_instance.get_changeset((max(revs))).raw_id))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.update_msg_other = _('Branch %s does not contain other changes.') % c.org_branch_name

			




	
	
	
		
 

			




	
	
	
		
 
        raw_ids = [x.raw_id for x in c.cs_ranges]

			




	
	
	
		
 
        c.cs_comments = c.org_repo.get_comments(raw_ids)

			




	
	
	
		
 
        c.statuses = c.org_repo.statuses(raw_ids)

			




	
	
	
		
 

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = request.GET.get('context', 3)

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 
        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'

			




	
	
	
		
 
                  % (c.other_rev, c.org_rev, org_scm_instance.path))

			




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

			




	
	
	
		
 
                                      ignore_whitespace=ignore_whitespace,

			




	
	
	
		
 
                                      context=line_context)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                             diff_limit=diff_limit)

			




	
	
	
		
 
        _parsed = diff_processor.prepare()

			




	
	
	
		
 

			




	
	
	
		
 
        c.limited_diff = False

			




	
	
	
		
 
        if isinstance(_parsed, LimitedDiffContainer):

			




	
	
	
		
 
            c.limited_diff = True

			




	
	
	
		
 

			




	
	
	
		
 
        c.files = []

			




	
	
	
		
 
        c.changes = {}

			




	
	
	
		
 
        c.lines_added = 0

			




	
	
	
		
 
        c.lines_deleted = 0

			




	
	
	
		
 

			




	
	
	
		
 
        for f in _parsed:

			




	
	
	
		
 
            st = f['stats']

			




	
	
	
		
 
            c.lines_added += st['added']

			




	
	
	
		
 
            c.lines_deleted += st['deleted']

			




	
	
	
		
 
            fid = h.FID('', f['filename'])

			




	
	
	
		
 
            c.files.append([fid, f['operation'], f['filename'], f['stats']])

			




	
	
	
		
 
            htmldiff = diff_processor.as_html(enable_comments=True,

			




	
	
	
		
 
                                              parsed_lines=[f])

			




	
	
	
		
 
            c.changes[fid] = [f['operation'], f['filename'], htmldiff]

			




	
	
	
		
 

			




	
	
	
		
 
        # inline comments

			




	
	
	
		
 
        c.inline_cnt = 0

			




	
	
	
		
 
        c.inline_comments = cc_model.get_inline_comments(

			




	
	
	
		
 
                                c.db_repo.repo_id,

			




	
	
	
		
 
                                pull_request=pull_request_id)

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for __, lines in c.inline_comments:

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 
        # comments

			




	
	
	
		
 
        c.comments = cc_model.get_comments(c.db_repo.repo_id,

			




        

    



    


    



    



      

      





    
    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.